[patch 6/6] Allow gssd ccaches in MEMORY: rather than FILE:

[kwc at citi.umich.edu]

From: Kevin Coffman <kwc at citi.umich.edu>

Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>

Add option to store gssd ccaches in a MEMORY: cache rather
than the default FILE: cache.  In response to suggestion
from Steve Dickson <steved at redhat.com> and
Nalin Dahyabhai <nalin at redhat.com>.


---

 nfs-utils-1.0.10-kwc/utils/gssd/gssd.c      |    6 +++++-
 nfs-utils-1.0.10-kwc/utils/gssd/gssd.h      |    1 +
 nfs-utils-1.0.10-kwc/utils/gssd/krb5_util.c |    8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff -puN utils/gssd/gssd.c~gssd_add_memcache_option utils/gssd/gssd.c
--- nfs-utils-1.0.10/utils/gssd/gssd.c~gssd_add_memcache_option	2006-10-13 14:28:57.838335000 -0400
+++ nfs-utils-1.0.10-kwc/utils/gssd/gssd.c	2006-10-13 14:28:58.646059000 -0400
@@ -56,6 +56,7 @@
 char pipefsdir[PATH_MAX] = GSSD_PIPEFS_DIR;
 char keytabfile[PATH_MAX] = GSSD_DEFAULT_KEYTAB_FILE;
 char ccachedir[PATH_MAX] = GSSD_DEFAULT_CRED_DIR;
+int  use_memcache = 0;
 
 void
 sig_die(int signal)
@@ -92,7 +93,7 @@ main(int argc, char *argv[])
 	extern char *optarg;
 	char *progname;
 
-	while ((opt = getopt(argc, argv, "fvrmp:k:d:")) != -1) {
+	while ((opt = getopt(argc, argv, "fvrmMp:k:d:")) != -1) {
 		switch (opt) {
 			case 'f':
 				fg = 1;
@@ -100,6 +101,9 @@ main(int argc, char *argv[])
 			case 'm':
 				/* Accept but ignore this. Now the default. */
 				break;
+			case 'M':
+				use_memcache = 1;
+				break;
 			case 'v':
 				verbosity++;
 				break;
diff -puN utils/gssd/gssd.h~gssd_add_memcache_option utils/gssd/gssd.h
--- nfs-utils-1.0.10/utils/gssd/gssd.h~gssd_add_memcache_option	2006-10-13 14:28:57.865335000 -0400
+++ nfs-utils-1.0.10-kwc/utils/gssd/gssd.h	2006-10-13 14:28:58.708996000 -0400
@@ -61,6 +61,7 @@ enum {AUTHTYPE_KRB5, AUTHTYPE_SPKM3, AUT
 extern char			pipefsdir[PATH_MAX];
 extern char			keytabfile[PATH_MAX];
 extern char			ccachedir[PATH_MAX];
+extern int			use_memcache;
 
 TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;
 
diff -puN utils/gssd/krb5_util.c~gssd_add_memcache_option utils/gssd/krb5_util.c
--- nfs-utils-1.0.10/utils/gssd/krb5_util.c~gssd_add_memcache_option	2006-10-13 14:28:57.926335000 -0400
+++ nfs-utils-1.0.10-kwc/utils/gssd/krb5_util.c	2006-10-13 14:28:59.517736000 -0400
@@ -334,6 +334,7 @@ gssd_get_single_krb5_cred(krb5_context c
 	char cc_name[BUFSIZ];
 	int code;
 	time_t now = time(0);
+	char *cache_type;
 
 	memset(&my_creds, 0, sizeof(my_creds));
 
@@ -380,7 +381,12 @@ gssd_get_single_krb5_cred(krb5_context c
 	 * Initialize cache file which we're going to be using
 	 */
 
-	snprintf(cc_name, sizeof(cc_name), "FILE:%s/%s%s_%s",
+	if (use_memcache)
+	    cache_type = "MEMORY";
+	else
+	    cache_type = "FILE";
+	snprintf(cc_name, sizeof(cc_name), "%s:%s/%s%s_%s",
+		cache_type,
 		GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX,
 		GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm);
 	ple->endtime = my_creds.times.endtime;

_