nfsidmap not setting key timeouts

These should fix up nfsidmap being unable to set key timeouts.

Benjamin Coddington (2):
nfsidmap: set the correct DEFAULT_KEYRING string
nfsidmap: Correct a failure to set key timeout values

 utils/nfsidmap/nfsidmap.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

---
 utils/nfsidmap/nfsidmap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 96149cc..4da7f5c 100644
@@ -25,7 +25,7 @@ char *usage="Usage: %s [-v] [-c || [-u|-g|-r key] || [-t timeout] key desc]";
 
 #define PROCKEYS "/proc/keys"
 #ifndef DEFAULT_KEYRING
-#define DEFAULT_KEYRING "id_resolver"
+#define DEFAULT_KEYRING ".id_resolver"
 #endif
 
 #ifndef PATH_IDMAPDCONF

1.7.1

The caller must be a possesor of the key to set the attributes, so link the destination keyring to the current thread's keyring before instantiation so that after instantiation the timeout can be set.

---
 utils/nfsidmap/nfsidmap.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index 4da7f5c..b141f9e 100644
@@ -329,6 +329,9 @@ int main(int argc, char **argv)
 			key, type, value, timeout);
 	}
 
+	/* become a possesor of the to-be-instantiated key to set the key's timeout */
+	request_key("keyring", DEFAULT_KEYRING, NULL, KEY_SPEC_THREAD_KEYRING);
+
 	if (strcmp(type, "uid") == 0)
 		rc = id_lookup(value, key, USER);
 	else if (strcmp(type, "gid") == 0)

1.7.1

This fixed the timeout problem for me with a 3.18-rc3 kernel.

However, I still need to apply the “no state check” fix I posted last Thursday, or the keys simply expire after 10 minutes and the kernel never renews them.

http://marc.info/?l=linux-nfs&m=141469121406791&w=2

--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com

Both committed...

steved.