From: Steinar H. Gunderson <sesse@debian.org>
Date: Sat, 26 Aug 2006 01:29:09 +0000 (+0200)
Subject: Imported Debian patch 1.0.9-10
X-Git-Tag: debian/1%1.0.9-10^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4294add55dac1324509356e6bd571716899e5544;p=nfs-utils.git

Imported Debian patch 1.0.9-10
---

diff --git a/debian/changelog b/debian/changelog
index 600b004..b0e9f46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.0.9-10) unstable; urgency=low
+
+  * The -n option (short option for --no-tcp) to rpc.mountd was set
+    to take a parameter, even though --no-tcp doesn't take any, the
+    parameter is never used and the help doesn't mention any. Remove
+    the colon after 'n' in the getopt string to fix it.
+  * Add a versioned dependency from nfs-common to libnfsidmap1 (>= 0.16-3)
+    temporarily, to work around #384688.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 26 Aug 2006 03:29:09 +0200
+
 nfs-utils (1:1.0.9-9) unstable; urgency=medium
 
   * Patched svc_socket.c to define __bzero only on ia64.
diff --git a/debian/control b/debian/control
index 7430755..b25ecd7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: Kernel NFS server support
 
 Package: nfs-common
 Architecture: any
-Depends: portmap, sysvinit (>= 2.80-1), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
+Depends: portmap, sysvinit (>= 2.80-1), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libnfsidmap1 (>= 0.16-3)
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index c1d18d4..f40d367 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -558,7 +558,7 @@ main(int argc, char **argv)
 
 	/* Parse the command line options and arguments. */
 	opterr = 0;
-	while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hH:N:V:vs:t:", longopts, NULL)) != EOF)
+	while ((c = getopt_long(argc, argv, "o:nFd:f:p:P:hH:N:V:vs:t:", longopts, NULL)) != EOF)
 		switch (c) {
 		case 'o':
 			descriptors = atoi(optarg);