statd: Replace note() with xlog() in rpc.statd

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

diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index f6949db72e10333571b78309684e0b8a8ef3c649..bd37a5f48d89f7d57a799ba833c7cfb78d7511bd 100644 (file)
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -56,7 +56,6 @@
 #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 *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1];
@@ -159,11 +158,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 +165,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)