2005-08-26 Kevin Coffman <kwc@citi.umich.edu>

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 7cc1b1bf0e506c5593be3125744bef98d2daaf9a..7325b259dc1754b18ddeae920fdef6db8fa92d09 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -74,6 +74,14 @@ killer (int sig)
   xlog (L_FATAL, "Caught signal %d, un-registering and exiting.", sig);
 }
 
+static void
+sig_hup (int sig)
+{
+  /* don't exit on SIGHUP */
+  xlog (L_NOTICE, "Received SIGHUP... Ignoring.\n", sig);
+  return;
+}
+
 bool_t
 mount_null_1_svc(struct svc_req *rqstp, void *argp, void *resp)
 {
@@ -234,7 +242,10 @@ mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res)
 bool_t
 mount_mnt_3_svc(struct svc_req *rqstp, dirpath *path, mountres3 *res)
 {
-       static int      flavors[] = { AUTH_NULL, AUTH_UNIX };
+#define AUTH_GSS_KRB5 390003
+#define AUTH_GSS_KRB5I 390004
+#define AUTH_GSS_KRB5P 390005
+       static int      flavors[] = { AUTH_NULL, AUTH_UNIX, AUTH_GSS_KRB5, AUTH_GSS_KRB5I, AUTH_GSS_KRB5P};
        struct nfs_fh_len *fh;
 
        xlog(D_CALL, "MNT3(%s) called", *path);
@@ -243,7 +254,8 @@ mount_mnt_3_svc(struct svc_req *rqstp, dirpath *path, mountres3 *res)
 
                ok->fhandle.fhandle3_len = fh->fh_size;
                ok->fhandle.fhandle3_val = fh->fh_handle;
-               ok->auth_flavors.auth_flavors_len = 2;
+               ok->auth_flavors.auth_flavors_len
+                       = sizeof(flavors)/sizeof(flavors[0]);
                ok->auth_flavors.auth_flavors_val = flavors;
        }
        return 1;
@@ -531,7 +543,8 @@ main(int argc, char **argv)
                }
        }
        /* Initialize logging. */
-/*     xlog_open("mountd"); */
+       if (!foreground) xlog_stderr(0);
+       xlog_open("mountd");
 
        sa.sa_handler = SIG_IGN;
        sa.sa_flags = 0;
@@ -565,9 +578,10 @@ main(int argc, char **argv)
                         mount_dispatch, port);
 
        sa.sa_handler = killer;
-       sigaction(SIGHUP, &sa, NULL);
        sigaction(SIGINT, &sa, NULL);
        sigaction(SIGTERM, &sa, NULL);
+       sa.sa_handler = sig_hup;
+       sigaction(SIGHUP, &sa, NULL);
 
        auth_init(export_file);
 
@@ -589,7 +603,6 @@ main(int argc, char **argv)
                        if (fd > 2) (void) close(fd);
                }
                setsid();
-               xlog_background();
        }
 
        my_svc_run();