2002-09-15 Chip Salzenberg <chip@pobox.com>

	* support/nfs/rpcmisc.c (rpc_init): Allow stdin to be a non-INET
	socket, as occurs when run from sshd.
	* debian/changelog: Version 1.0.2-1.

diff --git a/ChangeLog b/ChangeLog
index 3efb0fce2fbcff71efb89ba1b48532619f22396b..092ce27928b7f53c50bae6349dd298991a3e7453 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-15  Chip Salzenberg  <chip@pobox.com>
+
+       * support/nfs/rpcmisc.c (rpc_init): Allow stdin to be a non-INET
+       socket, as occurs when run from sshd.
+       * debian/changelog: Version 1.0.2-1.
+
 2002-09-12  H.J. Lu <hjl@lucon.org>
 
        * support/nfs/svc_socket.c: Remove HAVE_SVCTCP_SOCKET and

diff --git a/debian/changelog b/debian/changelog
index 1954f304ed3d312c606d01cdcc099ab8f345174c..3a7eae2931c7d0d17a8552732659f435838446b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-nfs-utils (1:1.0.2-1) unstable; urgency=low
+nfs-utils (1:1.0.2-1) unstable; urgency=high
 
   * New upstream version:
     > Allow program stdin to be a non-INET socket.  (closes: #142557)
   * Start nfs-common after nfs-kernel-server so that the server is running
-    when statd restarts.  In postinst, remove bad rc.d links from old
-    packages.  From Philippe Troin <phil@fifi.org>.  (closes: #160800)
+    when statd restarts; without this change, a rebooting server may make
+    clients lose mounts.  (This postinst removes bad rc.d links from old
+    packages.)  From Philippe Troin <phil@fifi.org>.  (closes: #160800)
   * Make init scripts exit with non-zero status when daemons don't start.
   * Add titles to templates where I forgot them.  (closes: #158489)
   * Add /etc/default/{nfs-common,nfs-kernel-server} so setting random
@@ -14,7 +15,7 @@ nfs-utils (1:1.0.2-1) unstable; urgency=low
   * Use invoke-rc.d to avoid premature daemon starts.  (closes: 158574)
   * Change priority of nfs-kernel-server to 'optional'.
 
- --
+ -- Chip Salzenberg <chip@debian.org>  Sun, 15 Sep 2002 22:00:27 -0400
 
 nfs-utils (1:1.0.1-1) unstable; urgency=low
 

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 832de5fe28c89e06999301da968054a656a953d8..7a100c2eff618f089c1c9c0b7712bc1fde250992 100644 (file)
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -50,11 +50,10 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
 
        asize = sizeof(saddr);
        sock = 0;
-       if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0) {
+       if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0
+           && saddr.sin_family == AF_INET) {
                int ssize = sizeof (int);
                _rpcfdtype = 0;
-               if (saddr.sin_family != AF_INET)
-                       xlog(L_FATAL, "init: stdin is bound to non-inet addr");
                if (getsockopt(0, SOL_SOCKET, SO_TYPE,
                                (char *)&_rpcfdtype, &ssize) == -1)
                        xlog(L_FATAL, "getsockopt failed: %s", strerror(errno));