Imported upstream 1.2.8

[nfs-utils.git] / utils / gssd / gssd.c

diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index f6949db72e10333571b78309684e0b8a8ef3c649..8ee478bc0bccb0aedee7bd3557e0f194ad69ab30 100644 (file)
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -56,9 +56,8 @@
 #include "krb5_util.h"
 
 char pipefs_dir[PATH_MAX] = GSSD_PIPEFS_DIR;
-char pipefs_nfsdir[PATH_MAX] = GSSD_PIPEFS_DIR;
 char keytabfile[PATH_MAX] = GSSD_DEFAULT_KEYTAB_FILE;
-char ccachedir[PATH_MAX] = GSSD_DEFAULT_CRED_DIR;
+char ccachedir[PATH_MAX] = GSSD_DEFAULT_CRED_DIR ":" GSSD_USER_CRED_DIR;
 char *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1];
 int  use_memcache = 0;
 int  root_uses_machine_creds = 1;
@@ -72,21 +71,21 @@ sig_die(int signal)
        if (root_uses_machine_creds)
                gssd_destroy_krb5_machine_creds();
        printerr(1, "exiting on signal %d\n", signal);
-       exit(1);
+       exit(0);
 }
 
 void
 sig_hup(int signal)
 {
        /* don't exit on SIGHUP */
-       printerr(1, "Received SIGHUP... Ignoring.\n");
+       printerr(1, "Received SIGHUP(%d)... Ignoring.\n", signal);
        return;
 }
 
 static void
 usage(char *progname)
 {
-       fprintf(stderr, "usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n",
+       fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm] [-D]\n",
                progname);
        exit(1);
 }
@@ -103,7 +102,7 @@ main(int argc, char *argv[])
        char *progname;
 
        memset(ccachesearch, 0, sizeof(ccachesearch));
-       while ((opt = getopt(argc, argv, "fvrmnMp:k:d:t:R:")) != -1) {
+       while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:R:")) != -1) {
                switch (opt) {
                        case 'f':
                                fg = 1;
@@ -144,6 +143,16 @@ main(int argc, char *argv[])
                        case 'R':
                                preferred_realm = strdup(optarg);
                                break;
+                       case 'l':
+#ifdef HAVE_SET_ALLOWABLE_ENCTYPES
+                               limit_to_legacy_enctypes = 1;
+#else 
+                               errx(1, "Encryption type limits not supported by Kerberos libraries.");
+#endif
+                               break;
+                       case 'D':
+                               avoid_dns = 0;
+                               break;
                        default:
                                usage(argv[0]);
                                break;
@@ -159,11 +168,6 @@ main(int argc, char *argv[])
        if (preferred_realm == NULL)
                gssd_k5_get_default_realm(&preferred_realm);
 
-       snprintf(pipefs_nfsdir, sizeof(pipefs_nfsdir), "%s/%s",
-                pipefs_dir, GSSD_SERVICE_NAME);
-       if (pipefs_nfsdir[sizeof(pipefs_nfsdir)-1] != '\0')
-               errx(1, "pipefs_nfsdir path name too long");
-
        if ((progname = strrchr(argv[0], '/')))
                progname++;
        else
@@ -171,6 +175,8 @@ main(int argc, char *argv[])
 
        initerr(progname, verbosity, fg);
 #ifdef HAVE_AUTHGSS_SET_DEBUG_LEVEL
+       if (verbosity && rpc_verbosity == 0)
+               rpc_verbosity = verbosity;
        authgss_set_debug_level(rpc_verbosity);
 #else
         if (rpc_verbosity > 0)