From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 11 Jul 2007 23:40:18 +0000 (+0200)
Subject: Imported Debian patch 1.1.0-7
X-Git-Tag: debian/1%1.1.0-7^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=32078903299012c3ddee8a55ef54eac359fa0516;p=nfs-utils.git

Imported Debian patch 1.1.0-7
---

diff --git a/debian/changelog b/debian/changelog
index 8887d4f..e179219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.1.0-7) unstable; urgency=low
+
+  * Add postinst fragment to make /sbin/mount setuid root, which should fix
+    problems with non-root mounting. (Closes: #432581)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 12 Jul 2007 01:40:18 +0200
+
 nfs-utils (1:1.1.0-6) unstable; urgency=low
 
   * Enable {mount,umount}.{nfs,nfs4}, in line with util-linux 2.13 no longer
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 2b83861..7671c15 100644
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -27,6 +27,10 @@ case "$1" in
 	        chown statd /var/lib/nfs/state
             fi
 	fi
+
+	if ! dpkg-statoverride --list /sbin/mount.nfs >/dev/null 2>&1; then
+	    dpkg-statoverride --update --add root root 4755 /sbin/mount.nfs
+	fi
     ;;
 esac
 
diff --git a/debian/nfs-common.postrm b/debian/nfs-common.postrm
index 267bb7a..c7af643 100644
--- a/debian/nfs-common.postrm
+++ b/debian/nfs-common.postrm
@@ -20,5 +20,7 @@ case "$1" in
 	rm -f /var/lib/nfs/state    \
 	      /var/lib/nfs/sm/*     \
 	      /var/lib/nfs/sm.bak/*
+	    
+	dpkg-statoverride --remove /sbin/mount.nfs
 	;;
 esac