2001-11-26 Chip Salzenberg <chip@pobox.com>

	* utils/showmount/showmount.c (main): Don't assume that strings
	starting with digits are IP addresses.
	* utils/nfsd/nfsd.c (main): Close all fds and reopen 0,1,2 on
	/dev/null before nfssvc().  Use syslog to report nfssvc errors.
	* support/misc/tcpwrapper.c, utils/mountd/mountd.man,
	utils/rquotad/rquotad.man, utils/statd/statd.man: Fix comments and
	man pages: We check host names *and* addresses with tcpwrappers.

diff --git a/ChangeLog b/ChangeLog
index d2555a500c79b0630a9636549c0202df21e85336..8ef1761f496dbac8d0fb324c6ff8e220ff52549e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-26  Chip Salzenberg  <chip@pobox.com>
+
+       * utils/showmount/showmount.c (main): Don't assume that strings
+       starting with digits are IP addresses.
+       * utils/nfsd/nfsd.c (main): Close all fds and reopen 0,1,2 on
+       /dev/null before nfssvc().  Use syslog to report nfssvc errors.
+       * support/misc/tcpwrapper.c, utils/mountd/mountd.man,
+       utils/rquotad/rquotad.man, utils/statd/statd.man: Fix comments and
+       man pages: We check host names *and* addresses with tcpwrappers.
+
 2001-11-21  Chip Salzenberg  <chip@pobox.com>
 
        * support/nfs/clients.c (cfname): Added: current clients file name.

diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c
index 8743a7b420ca7c9a172932b13574060e7b8a4cf8..d8a742f49da0af6c9fec8a0262bcf89c8f28606f 100644 (file)
--- a/support/misc/tcpwrapper.c
+++ b/support/misc/tcpwrapper.c
@@ -25,9 +25,7 @@
   * authorized by the /etc/hosts.{allow,deny} files. The local system is
   * always treated as an authorized host. The access control tables are never
   * consulted for requests from the local system, and are always consulted
-  * for requests from other hosts. Access control is based on IP addresses
-  * only; attempts to map an address to a host name might cause the
-  * portmapper to hang.
+  * for requests from other hosts.
   * 
   * Author: Wietse Venema (wietse@wzv.win.tue.nl), dept. of Mathematics and
   * Computing Science, Eindhoven University of Technology, The Netherlands.

diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man
index 71560abc5535d014617a289d4d8a4556d625e4cc..f529ec1ad30a3e7e2f91bc32375eadd85f110c93 100644 (file)
--- a/utils/mountd/mountd.man
+++ b/utils/mountd/mountd.man
@@ -125,9 +125,7 @@ mountd: .bar.com
 
 You have to use the daemon name 
 .B mountd
-for the daemon name (even if the binary has a different name). For the
-client names you can only use the keyword ALL or IP addresses (NOT
-host or domain names).
+for the daemon name (even if the binary has a different name).
 
 For further information please have a look at the
 .BR tcpd (8),

diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index c1cb56fe46db0e8e276bccecdbb3532a42cf5fbc..772f72df54693751550eac1c9fbe978d427720b9 100644 (file)
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -12,9 +12,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <getopt.h>
+#include <syslog.h>
 #include "nfslib.h"
 
 static void    usage(const char *);
@@ -22,7 +24,7 @@ static void   usage(const char *);
 int
 main(int argc, char **argv)
 {
-       int     count = 1, c, error, port;
+       int     count = 1, c, error, port, fd;
 
        port = 2049;
 
@@ -62,8 +64,28 @@ main(int argc, char **argv)
                }
        }
 
-       if ((error = nfssvc(port, count)) < 0)
-               perror("nfssvc");
+       /* KLUDGE ALERT:
+          Some kernels let nfsd kernel threads inherit open files
+          from the program that spawns them (i.e. us).  So close
+          everything before spawning kernel threads.  --Chip */
+       fd = open("/dev/null", O_RDWR);
+       if (fd == -1)
+               perror("/dev/null");
+       else {
+               (void) dup2(fd, 0);
+               (void) dup2(fd, 1);
+               (void) dup2(fd, 2);
+       }
+       fd = sysconf(_SC_OPEN_MAX);
+       while (--fd > 2)
+               (void) close(fd);
+
+       if ((error = nfssvc(port, count)) < 0) {
+               int e = errno;
+               openlog("nfsd", LOG_PID, LOG_DAEMON);
+               syslog(LOG_ERR, "nfssvc: %s", strerror(e));
+               closelog();
+       }
 
        return (error != 0);
 }

diff --git a/utils/rquotad/rquotad.man b/utils/rquotad/rquotad.man
index f4d5d6f094583b68b1fb02102298bb15939d5679..89774f20c432a0e21adef86fcaf29e67c78553df 100644 (file)
--- a/utils/rquotad/rquotad.man
+++ b/utils/rquotad/rquotad.man
@@ -64,9 +64,7 @@ mountd: .bar.com
 
 You have to use the daemon name 
 .BR rquotad
-for the daemon name (even if the binary has a different name). For the
-client names you can only use the keyword ALL or IP addresses (NOT
-host or domain names).
+for the daemon name (even if the binary has a different name).
 
 For further information please have a look at the
 .BR tcpd (8),

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 47b58255a285a2af1338c59f2d6f8ea5bd54f3b5..1ff3fa11c620ab5e1d9016331a32df50e961ef2d 100644 (file)
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -154,9 +154,8 @@ char **argv;
                break;
        }
 
-       if (hostname[0] >= '0' && hostname[0] <= '9') {
+       if (inet_aton(hostname, &server_addr.sin_addr.s_addr)) {
                server_addr.sin_family = AF_INET;
-               server_addr.sin_addr.s_addr = inet_addr(hostname);
        }
        else {
                if ((hp = gethostbyname(hostname)) == NULL) {

diff --git a/utils/statd/statd.man b/utils/statd/statd.man
index 9f861b29023be57044843e7b52b48cfc04badb75..b8467fee1542153b6f52761c55556359b9341e44 100644 (file)
--- a/utils/statd/statd.man
+++ b/utils/statd/statd.man
@@ -115,9 +115,7 @@ statd: .bar.com
 
 You have to use the daemon name 
 .B statd
-for the daemon name (even if the binary has a different name). For the
-client names you can only use the keyword ALL or IP addresses (NOT
-host or domain names).
+for the daemon name (even if the binary has a different name).
 
 For further information please have a look at the
 .BR tcpd (8),