mountd state directory

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 7325b259dc1754b18ddeae920fdef6db8fa92d09..43606dd39350c6e50abdb8206c5ace4a6d1e657f 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -6,7 +6,9 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <signal.h>
 #include <sys/stat.h>
@@ -54,6 +56,7 @@ static struct option longopts[] =
        { "port", 1, 0, 'p' },
        { "no-tcp", 0, 0, 'n' },
        { "ha-callout", 1, 0, 'H' },
+       { "state-directory-path", 1, 0, 's' },
        { NULL, 0, 0, 0 }
 };
 
@@ -104,10 +107,11 @@ mount_dump_1_svc(struct svc_req *rqstp, void *argp, mountlist *res)
 {
        struct sockaddr_in *addr =
                (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
-       xlog(L_NOTICE, "dump request from %s",
-               inet_ntoa(addr->sin_addr));
 
-       *res = mountlist_list();
+       if ((*res = mountlist_list()) == NULL)
+               xlog(L_WARNING, "dump request from %s failed.",
+                       inet_ntoa(addr->sin_addr));
+
        return 1;
 }
 
@@ -157,9 +161,11 @@ mount_export_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
 {
        struct sockaddr_in *addr =
                (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
-       xlog(L_NOTICE, "export request from %s",
-               inet_ntoa(addr->sin_addr));
-       *resp = get_exportlist();
+
+       if ((*resp = get_exportlist()) == NULL)
+               xlog(L_WARNING, "export request from %s failed.",
+                       inet_ntoa(addr->sin_addr));
+               
        return 1;
 }
 
@@ -168,9 +174,10 @@ mount_exportall_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
 {
        struct sockaddr_in *addr =
                (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
-       xlog(L_NOTICE, "exportall request from %s",
-               inet_ntoa(addr->sin_addr));
-       *resp = get_exportlist();
+
+       if ((*resp = get_exportlist()) == NULL)
+               xlog(L_WARNING, "exportall request from %s failed.",
+                       inet_ntoa(addr->sin_addr));
        return 1;
 }
 
@@ -421,11 +428,9 @@ get_exportlist(void)
                                xfree(c->gr_name);
                                xfree(c);
                                xfree (hp);
-                               if ((c = *cp) == NULL)
-                                 break;
+                               continue;
                              }
-                             else
-                               xfree (hp);
+                             xfree (hp);
                            }
                            cp = &(c->gr_next);
                          }
@@ -453,6 +458,7 @@ int
 main(int argc, char **argv)
 {
        char    *export_file = _PATH_EXPORTS;
+       char    *state_dir = NFS_STATEDIR;
        int     foreground = 0;
        int     port = 0;
        int     descriptors = 0;
@@ -462,7 +468,7 @@ main(int argc, char **argv)
 
        /* Parse the command line options and arguments. */
        opterr = 0;
-       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hH:N:V:v", longopts, NULL)) != EOF)
+       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hH:N:V:vs:", longopts, NULL)) != EOF)
                switch (c) {
                case 'o':
                        descriptors = atoi(optarg);
@@ -502,6 +508,13 @@ main(int argc, char **argv)
                case 'n':
                        _rpcfdtype = SOCK_DGRAM;
                        break;
+               case 's':
+                       if ((state_dir = xstrdup(optarg)) == NULL) {
+                               fprintf(stderr, "%s: xstrdup(%s) failed!\n",
+                                       argv[0], optarg);
+                               exit(1);
+                       }
+                       break;
                case 'V':
                        nfs_version |= 1 << (atoi (optarg) - 1);
                        break;
@@ -519,9 +532,9 @@ main(int argc, char **argv)
        if (optind != argc || !(nfs_version & 0x7))
                usage(argv [0], 1);
 
-       if (chdir(NFS_STATEDIR)) {
+       if (chdir(state_dir)) {
                fprintf(stderr, "%s: chdir(%s) failed: %s\n",
-                       argv [0], NFS_STATEDIR, strerror(errno));
+                       argv [0], state_dir, strerror(errno));
                exit(1);
        }
 
@@ -557,11 +570,8 @@ main(int argc, char **argv)
        sigaction(SIGCHLD, &sa, NULL);
 
        /* Daemons should close all extra filehandles ... *before* RPC init. */
-       if (!foreground) {
-               int fd = sysconf (_SC_OPEN_MAX);
-               while (--fd > 2)
-                       (void) close(fd);
-       }
+       if (!foreground)
+               closeall(3);
 
        new_cache = check_new_cache();
        if (new_cache)
@@ -619,6 +629,6 @@ usage(const char *prog, int n)
 "      [-o num|--descriptors num] [-f exports-file|--exports-file=file]\n"
 "      [-p|--port port] [-V version|--nfs-version version]\n"
 "      [-N version|--no-nfs-version version] [-n|--no-tcp]\n"
-"      [-H ha-callout-prog]\n", prog);
+"      [-H ha-callout-prog] [-s|--state-directory-path path]\n", prog);
        exit(n);
 }