* locate_kdc.c (get_port): Skip service name lookup, just use the supplied

numbers.
(add_host_to_list): If a second port number is supplied, look up AF_INET
addresses only, and only for SOCK_DGRAM type entries.  Ignore errors in the
second address lookup.
(krb5_locate_srv_conf_1) [TEST]: More debugging code.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14843 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 44 insertions, 8 deletions

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 32ddaef68..993ef66b9 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* locate_kdc.c (get_port): Skip service name lookup, just use the
+	supplied numbers.
+	(add_host_to_list): If a second port number is supplied, look up
+	AF_INET addresses only, and only for SOCK_DGRAM type entries.
+	Ignore errors in the second address lookup.
+	(krb5_locate_srv_conf_1) [TEST]: More debugging code.
+
 2002-09-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* accessor.c, an_to_ln.c, c_ustime.c, ccdefname.c, changepw.c,
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index bcf20912a..ea42bbc66 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -102,6 +102,10 @@ _krb5_use_dns_realm(krb5_context context)
 
 static int get_port (const char *service, int stream, int defalt)
 {
+#if 0 /* Only used for "kerberos" and "kerberos-sec", and we want the
+	 right port numbers even on the OSes that botch the entries in
+	 /etc/services.  So don't bother with the lookup, except maybe
+	 to produce a warning.  */
     struct addrinfo hints = { 0 };
     struct addrinfo *ai;
     int err;
@@ -117,6 +121,7 @@ static int get_port (const char *service, int stream, int defalt)
 	}
 	freeaddrinfo (ai);
     }
+#endif
     /* Any error - don't complain, just use default.  */
     return htons (defalt);
 }
@@ -265,9 +270,19 @@ add_host_to_list (struct addrlist *lp, const char *hostname,
     }
     if (err || secport == 0)
 	goto egress;
+    if (socktype == 0)
+	socktype = SOCK_DGRAM;
+    else if (socktype != SOCK_DGRAM)
+	goto egress;
+    hint.ai_family = AF_INET;
     err = getaddrinfo (hostname, secportbuf, &hint, &addrs);
-    if (err)
+    if (err) {
+#if 0
 	return translate_ai_error (err);
+#else
+	goto egress;
+#endif
+    }
     for (a = addrs; a != 0 && err == 0; a = anext) {
 	anext = a->ai_next;
 	err = add_addrinfo_to_list (lp, a);
@@ -318,8 +333,12 @@ krb5_locate_srv_conf_1(krb5_context context, const krb5_data *realm,
     code = profile_get_values(context->profile, realm_srv_names, &hostlist);
 
     if (code) {
+#ifdef TEST
+	fprintf (stderr, "config file lookup failed: %s\n",
+		 error_message(code));
+#endif
         if (code == PROF_NO_SECTION || code == PROF_NO_RELATION)
-            code = KRB5_REALM_UNKNOWN;
+	    code = KRB5_REALM_UNKNOWN;
  	krb5_xfree(host);
   	return code;
      }
@@ -327,6 +346,9 @@ krb5_locate_srv_conf_1(krb5_context context, const krb5_data *realm,
     count = 0;
     while (hostlist && hostlist[count])
 	    count++;
+#ifdef TEST
+    fprintf (stderr, "found %d entries under 'kdc'\n", count);
+#endif
     
     if (count == 0) {
         profile_free_list(hostlist);
@@ -381,6 +403,9 @@ krb5_locate_srv_conf_1(krb5_context context, const krb5_data *realm,
 	int p1, p2;
 
 	host = hostlist[i];
+#ifdef TEST
+	fprintf (stderr, "entry %d is '%s'\n", i, host);
+#endif
 	/*
 	 * Strip off excess whitespace
 	 */
@@ -459,7 +484,9 @@ krb5_locate_srv_conf_1(krb5_context context, const krb5_data *realm,
 
 #ifdef TEST
 static krb5_error_code
-krb5_locate_srv_conf(krb5_context context, const krb5_data *realm, const char *name, struct addrlist *al, int get_masters, int udpport, int sec_udpport)
+krb5_locate_srv_conf(krb5_context context, const krb5_data *realm,
+		     const char *name, struct addrlist *al, int get_masters,
+		     int udpport, int sec_udpport)
 {
     krb5_error_code ret;
 
@@ -819,9 +846,9 @@ krb5_locate_kdc(krb5_context context, const krb5_data *realm,
 	    sec_udpport = 0;
     }
 
-    return krb5int_locate_server (context, realm, addrlist, get_masters, "kdc",
-				  (get_masters
-				   ? "_kerberos-master"
-				   : "_kerberos"),
-				  socktype, udpport, sec_udpport);
+    return krb5int_locate_server(context, realm, addrlist, get_masters, "kdc",
+				 (get_masters
+				  ? "_kerberos-master"
+				  : "_kerberos"),
+				 socktype, udpport, sec_udpport);
 }