2001-05-28 H.J. Lu <hjl@lucon.org>

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 7f54be6e263ba7f37d6e3386f292bb15d2558827..14f5fa26f9691238f3a15ec3577d41f4f1e8b72e 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -14,6 +14,7 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <getopt.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -36,6 +37,7 @@ static struct option longopts[] =
        { "no-nfs-version", 1, 0, 'N' },
        { "version", 0, 0, 'v' },
        { "port", 1, 0, 'p' },
+       { "no-tcp", 0, 0, 'n' },
        { NULL, 0, 0, 0 }
 };
 
@@ -76,8 +78,10 @@ mount_mnt_1_svc(struct svc_req *rqstp, dirpath *path, fhstatus *res)
 bool_t
 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(svc_getcaller(rqstp->rq_xprt)->sin_addr));
+               inet_ntoa(addr->sin_addr));
 
        *res = mountlist_list();
        return 1;
@@ -86,7 +90,8 @@ mount_dump_1_svc(struct svc_req *rqstp, void *argp, mountlist *res)
 bool_t
 mount_umnt_1_svc(struct svc_req *rqstp, dirpath *argp, void *resp)
 {
-       struct sockaddr_in *sin = svc_getcaller(rqstp->rq_xprt);
+       struct sockaddr_in *sin
+               = (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
        nfs_export      *exp;
        char            *p = *argp;
        char            rpath[MAXPATHLEN+1];
@@ -113,15 +118,17 @@ mount_umntall_1_svc(struct svc_req *rqstp, void *argp, void *resp)
        /* Reload /etc/xtab if necessary */
        auth_reload();
 
-       mountlist_del_all(svc_getcaller(rqstp->rq_xprt));
+       mountlist_del_all((struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt));
        return 1;
 }
 
 bool_t
 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(svc_getcaller(rqstp->rq_xprt)->sin_addr));
+               inet_ntoa(addr->sin_addr));
        *resp = get_exportlist();
        return 1;
 }
@@ -129,8 +136,10 @@ mount_export_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
 bool_t
 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(svc_getcaller(rqstp->rq_xprt)->sin_addr));
+               inet_ntoa(addr->sin_addr));
        *resp = get_exportlist();
        return 1;
 }
@@ -149,7 +158,8 @@ mount_exportall_1_svc(struct svc_req *rqstp, void *argp, exports *resp)
 bool_t
 mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res)
 {
-       struct sockaddr_in *sin = svc_getcaller(rqstp->rq_xprt);
+       struct sockaddr_in *sin
+               = (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
        struct stat     stb;
        nfs_export      *exp;
        char            rpath[MAXPATHLEN+1];
@@ -220,7 +230,8 @@ mount_mnt_3_svc(struct svc_req *rqstp, dirpath *path, mountres3 *res)
 static struct nfs_fh_len *
 get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
 {
-       struct sockaddr_in *sin = svc_getcaller(rqstp->rq_xprt);
+       struct sockaddr_in *sin =
+               (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
        struct stat     stb;
        nfs_export      *exp;
        char            rpath[MAXPATHLEN+1];
@@ -254,7 +265,7 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
        } else {
                struct nfs_fh_len  *fh;
 
-               if (!exp->m_exported)
+               if (exp->m_exported<1)
                        export_export(exp);
                if (!exp->m_xtabent)
                        xtab_append(exp);
@@ -410,6 +421,9 @@ main(int argc, char **argv)
                case 'N':
                        nfs_version &= ~(1 << (atoi (optarg) - 1));
                        break;
+               case 'n':
+                       _rpcfdtype = SOCK_DGRAM;
+                       break;
                case 'V':
                        nfs_version |= 1 << (atoi (optarg) - 1);
                        break;
@@ -427,6 +441,12 @@ main(int argc, char **argv)
        if (optind != argc || !(nfs_version & 0x7))
                usage(argv [0], 1);
 
+       if (chdir(NFS_STATEDIR)) {
+               fprintf(stderr, "%s: chdir(%s) failed: %s\n",
+                       argv [0], NFS_STATEDIR, strerror(errno));
+               exit(1);
+       }
+
        /* Initialize logging. */
 /*     xlog_open("mountd"); */
 
@@ -436,16 +456,18 @@ main(int argc, char **argv)
        sigaction(SIGHUP, &sa, NULL);
        sigaction(SIGINT, &sa, NULL);
        sigaction(SIGTERM, &sa, NULL);
+       /* WARNING: the following works on Linux and SysV, but not BSD! */
+       sigaction(SIGCHLD, &sa, NULL);
 
        if (nfs_version & 0x1)
                rpc_init("mountd", MOUNTPROG, MOUNTVERS,
-                        mount_dispatch, port, 0);
+                        mount_dispatch, port);
        if (nfs_version & (0x1 << 1))
                rpc_init("mountd", MOUNTPROG, MOUNTVERS_POSIX,
-                        mount_dispatch, port, 0);
+                        mount_dispatch, port);
        if (nfs_version & (0x1 << 2))
                rpc_init("mountd", MOUNTPROG, MOUNTVERS_NFSV3,
-                        mount_dispatch, port, 0);
+                        mount_dispatch, port);
 
        sa.sa_handler = killer;
        sigaction(SIGHUP, &sa, NULL);
@@ -488,6 +510,6 @@ usage(const char *prog, int n)
 "Usage: %s [-Fhnv] [-d kind] [-f exports-file] [-V version]\n"
 "      [-N version] [--debug kind] [-p|--port port] [--help] [--version]\n"
 "      [--exports-file=file] [--nfs-version version]\n"
-"      [--no-nfs-version version]\n", prog);
+"      [--no-nfs-version version] [--no-tcp]\n", prog);
        exit(n);
 }