From: neilbrown <neilbrown>
Date: Mon, 19 Dec 2005 23:49:30 +0000 (+0000)
Subject: 	utils/gssd/gssd_proc.c(create_auth_rpc_client): Use service
X-Git-Tag: nfs-utils-1-0-8-rc1a~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=ff0c801ad905b863b8c175ccee460791a78b875d

	utils/gssd/gssd_proc.c(create_auth_rpc_client): Use service
	  portion of clp->servicename rather than hard-coding "nfs".
---

diff --git a/ChangeLog b/ChangeLog
index 36bb027..b83742c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-20 Kevin Coffman <kwc@citi.umich.edu>
+	utils/gssd/gssd_proc.c(create_auth_rpc_client): Use service
+	  portion of clp->servicename rather than hard-coding "nfs". 
+
+2005-12-16 NeilBrown <neilb@suse.de>
+	1.0.8-rc1 released
+
 2005-12-16 Kevin Coffman <kwc@citi.umich.edu>
 	svcgssd needs -lnfs when using new function closeall().
 	
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 78919b8..f2907c9 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -436,6 +436,8 @@ int create_auth_rpc_client(struct clnt_info *clp,
 	int			sockp = RPC_ANYSOCK;
 	int			sendsz = 32768, recvsz = 32768;
 	struct addrinfo		ai_hints, *a = NULL;
+	char			service[64];
+	char			*at_sign;
 
 	sec.qop = GSS_C_QOP_DEFAULT;
 	sec.svc = RPCSEC_GSS_SVC_NONE;
@@ -505,8 +507,21 @@ int create_auth_rpc_client(struct clnt_info *clp,
 		goto out_fail;
 	}
 
-	errcode = getaddrinfo(clp->servername, "nfs",
-			      &ai_hints, &a);
+	/* extract the service name from clp->servicename */
+	if ((at_sign = strchr(clp->servicename, '@')) == NULL) {
+		printerr(0, "WARNING: servicename (%s) not formatted as "
+			"expected with service@host", clp->servicename);
+		goto out_fail;
+	}
+	if ((at_sign - clp->servicename) >= sizeof(service)) {
+		printerr(0, "WARNING: service portion of servicename (%s) "
+			"is too long!", clp->servicename);
+		goto out_fail;
+	}
+	strncpy(service, clp->servicename, at_sign - clp->servicename);
+	service[at_sign - clp->servicename] = '\0';
+
+	errcode = getaddrinfo(clp->servername, service, &ai_hints, &a);
 	if (errcode) {
 		printerr(0, "WARNING: Error from getaddrinfo for server "
 			 "'%s': %s", clp->servername, gai_strerror(errcode));