From: Bian Naimeng <biannm@cn.fujitsu.com>
Date: Thu, 16 Sep 2010 11:12:47 +0000 (-0400)
Subject: rpc.idmapd: Type of idmap client should be defined by ic_id not ic_clid.
X-Git-Tag: nfs-utils-1-2-3-rc6~15
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=64bf8db367fd43e80dd135b460afc157808647fa;p=nfs-utils.git

rpc.idmapd: Type of idmap client should be defined by ic_id not ic_clid.

The type of idmap_client is defined by idmap_client.ic_id for nfs,
so nfsd should have the same style.

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 9ecab66..b76607a 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -119,8 +119,8 @@ struct idmap_client {
 static struct idmap_client nfsd_ic[2] = {
 {
 	.ic_which = IC_IDNAME, 
-	.ic_clid = "Server", 
-	.ic_id = "", 
+	.ic_clid = "", 
+	.ic_id = "Server", 
 	.ic_path = IC_IDNAME_CHAN, 
 	.ic_fd = -1, 
 	.ic_dirfd = -1, 
@@ -128,8 +128,8 @@ static struct idmap_client nfsd_ic[2] = {
 },
 {
 	.ic_which = IC_NAMEID, 
-	.ic_clid = "Server", 
-	.ic_id = "", 
+	.ic_clid = "", 
+	.ic_id = "Server", 
 	.ic_path = IC_NAMEID_CHAN, 
 	.ic_fd = -1, 
 	.ic_dirfd = -1,