Imported Debian patch 1.0.6-3.1

diff --git a/debian/changelog b/debian/changelog
index 9ca0e7a69298f17ab11e309bcf038598992d89de..c7fe13b5f85aa09ff39379e323de9ecca421fa6d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.0.6-3.1) unstable; urgency=HIGH
+
+  * NMU
+  * Ignore SIGPIPE to avoid statd dying when peers close their
+    TCP connection while we're trying to reply to them. 
+    (CAN-2004-1014) Closes: #284971
+
+ -- Joey Hess <joeyh@debian.org>  Wed,  5 Jan 2005 07:39:41 -0500
+
 nfs-utils (1:1.0.6-3) unstable; urgency=medium
 
   * Remove obsolete debconf-related files in debian/rules, because source

diff --git a/debian/nfs-common.config b/debian/nfs-common.config
new file mode 100644 (file)
index 0000000..5edd12c
--- /dev/null
+++ b/debian/nfs-common.config
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if egrep -q 'ALL|[0-9]\.' /etc/hosts.deny
+then
+    db_input high nfs-common/tcpwrappers-statd || true
+fi
+
+db_go

diff --git a/debian/nfs-common.templates b/debian/nfs-common.templates
new file mode 100644 (file)
index 0000000..91f67f7
--- /dev/null
+++ b/debian/nfs-common.templates
@@ -0,0 +1,5 @@
+Template: nfs-common/tcpwrappers-statd
+Type: note
+_Description: statd uses tcpwrappers
+ The statd daemon uses tcpwrappers to control access.  To configure it, use
+ program name "statd" in /etc/hosts.allow and /etc/hosts.deny.

diff --git a/debian/nfs-kernel-server.config b/debian/nfs-kernel-server.config
new file mode 100644 (file)
index 0000000..de5df58
--- /dev/null
+++ b/debian/nfs-kernel-server.config
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if grep -s '^/' /etc/exports | grep -vq sync
+then
+    db_input high nfs-kernel-server/sync-default || true
+fi
+
+if fgrep -q 'rpc' /etc/hosts.allow /etc/hosts.deny
+then
+    db_input high nfs-kernel-server/tcpwrappers-mountd || true
+fi
+
+db_go

diff --git a/debian/nfs-kernel-server.templates b/debian/nfs-kernel-server.templates
new file mode 100644 (file)
index 0000000..85d86e4
--- /dev/null
+++ b/debian/nfs-kernel-server.templates
@@ -0,0 +1,17 @@
+Template: nfs-kernel-server/sync-default
+Type: note
+_Description: NFS server defaults to synchronous writes
+ To comply with standards and increase data safety, the Linux NFS server
+ now defaults to synchronous writes.  Since this is a major change, it is
+ not silent: All exports should be explicitly marked as either "sync" or
+ "async".  Exports not so marked will elicit warnings.
+
+Template: nfs-kernel-server/tcpwrappers-mountd
+Type: note
+_Description: in /etc/hosts.{allow,deny}, replace "rpc.mountd" with "mountd"
+ The mount daemon uses tcpwrappers to control access.  To configure it, use
+ program name "mountd" in /etc/hosts.allow and /etc/hosts.deny.
+ .
+ Older versions of nfs-kernel-server included a mount daemon that called
+ itself "rpc.mountd".  Therefore, you should replace all occurrences of
+ "rpc.mountd" with "mountd" in /etc/hosts.allow and /etc/hosts.deny.

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index b57f71bb0091bf1bc46096e5dbb996d88cc33107..cf30fe46d0a17c3da481346b85f3955dd1165d9f 100644 (file)
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -399,6 +399,11 @@ int main (int argc, char **argv)
        signal (SIGTERM, killer);
        /* WARNING: the following works on Linux and SysV, but not BSD! */
        signal(SIGCHLD, SIG_IGN);
+       /*
+        * Ignore SIGPIPE to avoid statd dying when peers close their
+        * TCP connection while we're trying to reply to them.
+        */
+       signal(SIGPIPE, SIG_IGN);
 
        /* initialize out_port */
        statd_get_socket(out_port);