Blame SOURCES/nfs-utils-1.3.0-nfsidmap-timeout.patch
|
 |
e19a30 |
diff -up nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c.save nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c
|
|
|
e19a30 |
--- nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c.save 2015-11-24 09:29:53.332040370 -0500
|
|
|
e19a30 |
+++ nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c 2015-11-24 09:30:06.579249849 -0500
|
|
|
e19a30 |
@@ -24,7 +24,7 @@ char *usage="Usage: %s [-v] [-c || [-u|-
|
|
|
e19a30 |
|
|
|
e19a30 |
#define PROCKEYS "/proc/keys"
|
|
|
e19a30 |
#ifndef DEFAULT_KEYRING
|
|
|
e19a30 |
-#define DEFAULT_KEYRING "id_resolver"
|
|
|
e19a30 |
+#define DEFAULT_KEYRING ".id_resolver"
|
|
|
e19a30 |
#endif
|
|
|
e19a30 |
|
|
|
e19a30 |
#ifndef PATH_IDMAPDCONF
|
|
|
e19a30 |
@@ -315,6 +315,9 @@ int main(int argc, char **argv)
|
|
|
e19a30 |
key, type, value, timeout);
|
|
|
e19a30 |
}
|
|
|
e19a30 |
|
|
|
e19a30 |
+ /* Become a possesor of the to-be-instantiated key to set the key's timeout */
|
|
|
e19a30 |
+ request_key("keyring", DEFAULT_KEYRING, NULL, KEY_SPEC_THREAD_KEYRING);
|
|
|
e19a30 |
+
|
|
|
e19a30 |
if (strcmp(type, "uid") == 0)
|
|
|
e19a30 |
rc = id_lookup(value, key, USER);
|
|
|
e19a30 |
else if (strcmp(type, "gid") == 0)
|