rpms/nfs-utils/devel nfs-utils-1.0.7-idmap-reopen.patch, NONE, 1.1 nfs-utils.spec, 1.54, 1.55

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31804

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.7-idmap-reopen.patch 
Log Message:
Fixed subscripting problem in idmapd (bz 158188)


nfs-utils-1.0.7-idmap-reopen.patch:
 idmapd.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE nfs-utils-1.0.7-idmap-reopen.patch ---
--- nfs-utils-1.0.7/utils/idmapd/idmapd.c.orig	2005-05-26 14:50:08.164704000 -0400
+++ nfs-utils-1.0.7/utils/idmapd/idmapd.c	2005-05-26 20:40:19.688208000 -0400
@@ -92,8 +92,8 @@
 		(w) = p;			\
 } while (0)
 
-#define IC_IDNAME 1
-#define IC_NAMEID 2
+#define IC_IDNAME 0
+#define IC_NAMEID 1
 struct idmap_client {
 	int                        ic_fd;
 	int                        ic_dirfd;
@@ -590,8 +590,8 @@ nfsdreopen()
 static int
 nfsdopen(char *path)
 {
-	return ((nfsdopenone(&nfsd_ic[0], IC_NAMEID, path) == 0 &&
-		    nfsdopenone(&nfsd_ic[1], IC_IDNAME, path) == 0) ? 0 : -1);
+	return ((nfsdopenone(&nfsd_ic[IC_NAMEID], IC_NAMEID, path) == 0 &&
+		    nfsdopenone(&nfsd_ic[IC_IDNAME], IC_IDNAME, path) == 0) ? 0 : -1);
 }
 
 static int


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- nfs-utils.spec	19 May 2005 12:37:01 -0000	1.54
+++ nfs-utils.spec	27 May 2005 01:37:18 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.7
-Release: 7
+Release: 8
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -41,6 +41,7 @@
 Patch60: nfs-utils-1.0.7-rpcsecgss-debug.patch
 Patch61: nfs-utils-1.0.7-xlog-loginfo.patch
 Patch62: nfs-utils-1.0.7-svcgssd-bufover.patch
+Patch63: nfs-utils-1.0.7-idmap-reopen.patch
 
 Patch100: nfs-utils-1.0.7-compile.patch
 Patch150: nfs-utils-1.0.6-pie.patch
@@ -96,6 +97,7 @@
 %patch60 -p1 -b .rpcsecgss
 %patch61 -p1 -b .xlog
 %patch62 -p1 -b .overflow
+%patch63 -p1 -b .rename
 
 
 # Do the magic to get things to compile
@@ -246,6 +248,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Thu May 26 2005 Steve Dickson <SteveD at RedHat.com> 1.0.7-8
+- Fixed subscripting problem in idmapd (bz 158188)
+
 * Thu May 19 2005 Steve Dickson <SteveD at RedHat.com> 1.0.7-7
 - Fixed buffer overflow in rpc.svcgssd (bz 114288)