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 36bb0270be99f13e1ab8d53d6cf1eb20a84c6224..b83742c2ef22d7142bcc7ad1684d498605bccd70 100644 (file)
--- 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 78919b8ea9532bfc094fd8478adaab36a0a39ecd..f2907c90c870943b89170adab9d49f772b2ea496 100644 (file)
--- 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));