[PATCH] nfs-utils 6 of 10 - Fixed subscripting problem in idmapd

[Steve Dickson <SteveD@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: nfs-utils-1.0.7-idmap-reopen.patch --]
[-- Type: text/x-patch, Size: 1057 bytes --]

Fixed subscripting problem in idmapd (bz 158188)
This fixes the following problem:
rpc.idmapd: nfsdreopen: Opening '' failed: errno 2 (No such file or directory)

Details can be found in:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158188

Signed-off-by: Steve Dickson <steved@redhat.com>
---------
--- 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