Imported Debian patch 1.0.7-8

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 0d4ddb43970a762e4a5547ec0f6f61d2cd825cb4..a2ecb98c55b320642ecec42f2cf865608d124203 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -36,6 +36,11 @@ static struct nfs_fh_len *get_rootfh(struct svc_req *, dirpath *, int *, int v3)
 
 int new_cache = 0;
 
 
 int new_cache = 0;
 

+/* PRC: a high-availability callout program can be specified with -H
+ * When this is done, the program will receive callouts whenever clients
+ * send mount or unmount requests -- the callout is not needed for 2.6 kernel */
+char *ha_callout_prog = NULL;
+

 static struct option longopts[] =
 {
        { "foreground", 0, 0, 'F' },
 static struct option longopts[] =
 {
        { "foreground", 0, 0, 'F' },


@@ -48,6 +53,8 @@ static struct option longopts[] =
        { "version", 0, 0, 'v' },
        { "port", 1, 0, 'p' },
        { "no-tcp", 0, 0, 'n' },
        { "version", 0, 0, 'v' },
        { "port", 1, 0, 'p' },
        { "no-tcp", 0, 0, 'n' },

+       { "ha-callout", 1, 0, 'H' },
+       { "state-directory-path", 1, 0, 's' },

        { NULL, 0, 0, 0 }
 };
 
        { NULL, 0, 0, 0 }
 };
 


@@ -435,6 +442,7 @@ int
 main(int argc, char **argv)
 {
        char    *export_file = _PATH_EXPORTS;
 main(int argc, char **argv)
 {
        char    *export_file = _PATH_EXPORTS;

+       char    *state_dir = NFS_STATEDIR;

        int     foreground = 0;
        int     port = 0;
        int     descriptors = 0;
        int     foreground = 0;
        int     port = 0;
        int     descriptors = 0;


@@ -444,7 +452,7 @@ main(int argc, char **argv)
 
        /* Parse the command line options and arguments. */
        opterr = 0;
 
        /* Parse the command line options and arguments. */
        opterr = 0;

-       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
+       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hH:N:V:v", longopts, NULL)) != EOF)

                switch (c) {
                case 'o':
                        descriptors = atoi(optarg);
                switch (c) {
                case 'o':
                        descriptors = atoi(optarg);


@@ -463,6 +471,9 @@ main(int argc, char **argv)
                case 'f':
                        export_file = optarg;
                        break;
                case 'f':
                        export_file = optarg;
                        break;

+               case 'H': /* PRC: specify a high-availability callout program */
+                       ha_callout_prog = optarg;
+                       break;

                case 'h':
                        usage(argv [0], 0);
                        break;
                case 'h':
                        usage(argv [0], 0);
                        break;


@@ -481,6 +492,13 @@ main(int argc, char **argv)
                case 'n':
                        _rpcfdtype = SOCK_DGRAM;
                        break;
                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;
                case 'V':
                        nfs_version |= 1 << (atoi (optarg) - 1);
                        break;


@@ -498,9 +516,9 @@ main(int argc, char **argv)
        if (optind != argc || !(nfs_version & 0x7))
                usage(argv [0], 1);
 
        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",
                fprintf(stderr, "%s: chdir(%s) failed: %s\n",

-                       argv [0], NFS_STATEDIR, strerror(errno));
+                       argv [0], state_dir, strerror(errno));

                exit(1);
        }
 
                exit(1);
        }
 


@@ -509,10 +527,10 @@ main(int argc, char **argv)
                                argv [0], strerror(errno));
        else {
                /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */
                                argv [0], strerror(errno));
        else {
                /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */

-               if (descriptors == 0 && rlim.rlim_cur > FD_SETSIZE)
+               if ((descriptors == 0 && rlim.rlim_cur > FD_SETSIZE) ||
+                   descriptors > FD_SETSIZE)

                        descriptors = FD_SETSIZE;
                if (descriptors) {
                        descriptors = FD_SETSIZE;
                if (descriptors) {

-

                        rlim.rlim_cur = descriptors;
                        if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
                                fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
                        rlim.rlim_cur = descriptors;
                        if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
                                fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",


@@ -522,7 +540,8 @@ main(int argc, char **argv)
                }
        }
        /* Initialize logging. */
                }
        }
        /* Initialize logging. */

-/*     xlog_open("mountd"); */
+       if (!foreground) xlog_stderr(0);
+       xlog_open("mountd");

 
        sa.sa_handler = SIG_IGN;
        sa.sa_flags = 0;
 
        sa.sa_handler = SIG_IGN;
        sa.sa_flags = 0;


@@ -580,7 +599,6 @@ main(int argc, char **argv)
                        if (fd > 2) (void) close(fd);
                }
                setsid();
                        if (fd > 2) (void) close(fd);
                }
                setsid();

-               xlog_background();

        }
 
        my_svc_run();
        }
 
        my_svc_run();


@@ -596,6 +614,7 @@ usage(const char *prog, int n)
 "Usage: %s [-F|--foreground] [-h|--help] [-v|--version] [-d kind|--debug kind]\n"
 "      [-o num|--descriptors num] [-f exports-file|--exports-file=file]\n"
 "      [-p|--port port] [-V version|--nfs-version version]\n"
 "Usage: %s [-F|--foreground] [-h|--help] [-v|--version] [-d kind|--debug kind]\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", prog);
+"      [-N version|--no-nfs-version version] [-n|--no-tcp]\n"
+"      [-H ha-callout-prog] [-s|--state-directory-path path]\n", prog);

        exit(n);
 }
        exit(n);
 }