mountd: Unregister mountd if my_svc_run() returns

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 982b06ea143facc7937cbbd7489a25934aad09c1..9c7caf96e388fa433b1e3f299a4e25afa4977a8c 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -71,17 +71,40 @@ static struct option longopts[] =
        { NULL, 0, 0, 0 }
 };
 
-static int nfs_version = -1;
+#define NFSVERSBIT(vers)       (0x1 << (vers - 1))
+#define NFSVERSBIT_ALL         (NFSVERSBIT(2) | NFSVERSBIT(3) | NFSVERSBIT(4))
+
+static int nfs_version = NFSVERSBIT_ALL;
+
+static int version2(void)
+{
+       return nfs_version & NFSVERSBIT(2);
+}
+
+static int version3(void)
+{
+       return nfs_version & NFSVERSBIT(3);
+}
+
+static int version23(void)
+{
+       return nfs_version & (NFSVERSBIT(2) | NFSVERSBIT(3));
+}
+
+static int version_any(void)
+{
+       return nfs_version & NFSVERSBIT_ALL;
+}
 
 static void
 unregister_services (void)
 {
-       if (nfs_version & (0x1 << 1)) {
-               pmap_unset (MOUNTPROG, MOUNTVERS);
-               pmap_unset (MOUNTPROG, MOUNTVERS_POSIX);
+       if (version2()) {
+               nfs_svc_unregister(MOUNTPROG, MOUNTVERS);
+               nfs_svc_unregister(MOUNTPROG, MOUNTVERS_POSIX);
        }
-       if (nfs_version & (0x1 << 2))
-               pmap_unset (MOUNTPROG, MOUNTVERS_NFSV3);
+       if (version3())
+               nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3);
 }
 
 static void
@@ -669,10 +692,12 @@ main(int argc, char **argv)
 {
        char    *export_file = _PATH_EXPORTS;
        char    *state_dir = NFS_STATEDIR;
+       unsigned int listeners = 0;
        int     foreground = 0;
        int     port = 0;
        int     descriptors = 0;
        int     c;
+       int     vers;
        struct sigaction sa;
        struct rlimit rlim;
 
@@ -716,7 +741,13 @@ main(int argc, char **argv)
                        }
                        break;
                case 'N':
-                       nfs_version &= ~(1 << (atoi (optarg) - 1));
+                       vers = atoi(optarg);
+                       if (vers < 2 || vers > 4) {
+                               fprintf(stderr, "%s: bad version number: %s\n",
+                                       argv[0], optarg);
+                               usage(argv[0], 1);
+                       }
+                       nfs_version &= ~NFSVERSBIT(vers);
                        break;
                case 'n':
                        _rpcfdtype = SOCK_DGRAM;
@@ -735,7 +766,13 @@ main(int argc, char **argv)
                        num_threads = atoi (optarg);
                        break;
                case 'V':
-                       nfs_version |= 1 << (atoi (optarg) - 1);
+                       vers = atoi(optarg);
+                       if (vers < 2 || vers > 4) {
+                               fprintf(stderr, "%s: bad version number: %s\n",
+                                       argv[0], optarg);
+                               usage(argv[0], 1);
+                       }
+                       nfs_version |= NFSVERSBIT(vers);
                        break;
                case 'v':
                        printf("kmountd %s\n", VERSION);
@@ -750,7 +787,7 @@ main(int argc, char **argv)
        /* No more arguments allowed.
         * Require at least one valid version (2, 3, or 4)
         */
-       if (optind != argc || !(nfs_version & 0xE))
+       if (optind != argc || !version_any())
                usage(argv [0], 1);
 
        if (chdir(state_dir)) {
@@ -798,15 +835,17 @@ main(int argc, char **argv)
        if (new_cache)
                cache_open();
 
-       if (nfs_version & (0x1 << 1)) {
-               rpc_init("mountd", MOUNTPROG, MOUNTVERS,
-                        mount_dispatch, port);
-               rpc_init("mountd", MOUNTPROG, MOUNTVERS_POSIX,
-                        mount_dispatch, port);
+       if (version2()) {
+               listeners += nfs_svc_create("mountd", MOUNTPROG,
+                                       MOUNTVERS, mount_dispatch, port);
+               listeners += nfs_svc_create("mountd", MOUNTPROG,
+                                       MOUNTVERS_POSIX, mount_dispatch, port);
        }
-       if (nfs_version & (0x1 << 2))
-               rpc_init("mountd", MOUNTPROG, MOUNTVERS_NFSV3,
-                        mount_dispatch, port);
+       if (version3())
+               listeners += nfs_svc_create("mountd", MOUNTPROG,
+                                       MOUNTVERS_NFSV3, mount_dispatch, port);
+       if (version23() && listeners == 0)
+               xlog(L_FATAL, "mountd: could not create listeners\n");
 
        sa.sa_handler = killer;
        sigaction(SIGINT, &sa, NULL);
@@ -849,7 +888,8 @@ main(int argc, char **argv)
 
        my_svc_run();
 
-       xlog(L_ERROR, "Ack! Gack! svc_run returned!\n");
+       xlog(L_ERROR, "RPC service loop terminated unexpectedly. Exiting...\n");
+       unregister_services();
        exit(1);
 }