Assorted changes from Steve Dickson

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 7325b259dc1754b18ddeae920fdef6db8fa92d09..a9ec1c7b0ae7f91c24a2d53331a6373d3123b924 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -104,10 +104,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 +158,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 +171,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;
 }
 
@@ -557,11 +561,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)