From: Steinar H. Gunderson <sesse@debian.org>
Date: Thu, 4 Jan 2007 19:40:49 +0000 (+0100)
Subject: Imported Debian patch 1.0.10-6~quilt.7
X-Git-Tag: debian/1%1.0.10-6_quilt.7^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f8ae60eeb064ade1bf6302c2ed529c24603b1b3e;p=nfs-utils.git

Imported Debian patch 1.0.10-6~quilt.7
---

diff --git a/debian/changelog b/debian/changelog
index 98c0e05..cf3099c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.0.10-6~quilt.7) experimental; urgency=low
+
+  * 10-ccachedir-off-by-one.patch: Fixes an off-by-one in the parsing of the
+    -d option to rpc.gssd; patch from Liam Bedford, extracted from the Ubuntu
+    BTS.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu,  4 Jan 2007 20:40:49 +0100
+
 nfs-utils (1:1.0.10-6~quilt.6) experimental; urgency=low
 
   * Make build depend on "patch build-stamp", not "build-stamp patch", which
diff --git a/debian/patches/10-ccachedir-off-by-one.patch b/debian/patches/10-ccachedir-off-by-one.patch
new file mode 100644
index 0000000..02d36a4
--- /dev/null
+++ b/debian/patches/10-ccachedir-off-by-one.patch
@@ -0,0 +1,13 @@
+Index: nfs-utils-1.0.10/utils/gssd/gssd.c
+===================================================================
+--- nfs-utils-1.0.10.orig/utils/gssd/gssd.c
++++ nfs-utils-1.0.10/utils/gssd/gssd.c
+@@ -118,7 +118,7 @@ main(int argc, char *argv[])
+ 				break;
+ 			case 'd':
+ 				strncpy(ccachedir, optarg, sizeof(ccachedir));
+-				if (ccachedir[sizeof(ccachedir-1)] != '\0')
++				if (ccachedir[sizeof(ccachedir)-1] != '\0')
+ 					errx(1, "ccachedir path name too long");
+ 				break;
+ 			default:
diff --git a/debian/patches/series b/debian/patches/series
index 88e5ebe..1c8afec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07-exports-default-options.patch
 08-dont-build-getkversion.patch
 09-manpage-paths-fixup.patch 
+10-ccachedir-off-by-one.patch