From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 24 Dec 2011 20:16:12 +0000 (-0500)
Subject: Windows: kauth search for kerberos iv port first
X-Git-Tag: upstream/1.6.1.pre4^2~22
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=97e5b174b30d0987730bf983c5ba3504aea69aa2;p=packages%2Fo%2Fopenafs.git

Windows: kauth search for kerberos iv port first

Modify src/kauth/user_nt.c to match the service name search
order of the Unix code:

 kerberos4
 kerberos-iv
 kerberos

The standard Windows SERVICES file includes "kerberos-iv" as
port 750.

FIXES 127907

Reviewed-on: http://gerrit.openafs.org/6430
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit 2cdd59d8f318193d0ef7937910466531caf1c963)

Change-Id: I936c35bbd45395f26ad6c523b72398584d1384f9
Reviewed-on: http://gerrit.openafs.org/6819
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c
index 8ad01f248..98fcd4c38 100644
--- a/src/kauth/user_nt.c
+++ b/src/kauth/user_nt.c
@@ -126,7 +126,11 @@ ka_UserAuthenticateGeneral2(afs_int32 flags, char *name, char *instance,
     des_string_to_key(password, &key2);
 
     /* set port number */
-    sp = getservbyname("kerberos", "udp");
+    sp = getservbyname("kerberos4", "udp");
+    if (!sp)
+    sp = getservbyname("kerberos-iv", "udp");
+    if (!sp)
+        sp = getservbyname("kerberos", "udp");
     if (sp)
 	krb_set_port(ntohs(sp->s_port));