X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fgssd.c;h=a362974a92438ad09ba92bca2d2d41fb2a183a89;hp=8031d487d93795cdd4b50ee0e770b09bfd2cf645;hb=6e18539119224c930760ab801c24efe92b809a1e;hpb=651b5d3cf5428cbf1d2cd3ae572453af249bef1e

diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index 8031d48..a362974 100644
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -55,6 +55,8 @@
 
 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)
@@ -76,7 +78,7 @@ sig_hup(int signal)
 static void
 usage(char *progname)
 {
-	fprintf(stderr, "usage: %s [-f] [-v] [-r] [-p pipefsdir] [-k keytab]\n",
+	fprintf(stderr, "usage: %s [-f] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir]\n",
 		progname);
 	exit(1);
 }
@@ -91,7 +93,7 @@ main(int argc, char *argv[])
 	extern char *optarg;
 	char *progname;
 
-	while ((opt = getopt(argc, argv, "fvrmp:k:")) != -1) {
+	while ((opt = getopt(argc, argv, "fvrmMp:k:d:")) != -1) {
 		switch (opt) {
 			case 'f':
 				fg = 1;
@@ -99,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;
@@ -115,6 +120,11 @@ main(int argc, char *argv[])
 				if (keytabfile[sizeof(keytabfile)-1] != '\0')
 					errx(1, "keytab path name too long");
 				break;
+			case 'd':
+				strncpy(ccachedir, optarg, sizeof(ccachedir));
+				if (ccachedir[sizeof(ccachedir-1)] != '\0')
+					errx(1, "ccachedir path name too long");
+				break;
 			default:
 				usage(argv[0]);
 				break;
@@ -139,6 +149,9 @@ main(int argc, char *argv[])
 			    "support setting debug level\n");
 #endif
 
+	if (gssd_check_mechs() != 0)
+		errx(1, "Problem with gssapi library");
+
 	if (!fg && daemon(0, 0) < 0)
 		errx(1, "fork");