ticket: 5393

version_fixed: 1.6.1

pull up r19070 from trunk

 r19070@cathode-dark-space:  jaltman | 2007-01-18 10:28:07 -0500
 ticket: 5393
 tags: pullup
 
 	In addition to setting the kpasswd port after
 	searching for kadmind host addresses we must also
 	set the socket type according to the request.
 
 



git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19112 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/krb5/os/changepw.c

@@ -70,12 +70,14 @@ krb5_locate_kpasswd(krb5_context context, const krb5_data *realm,
 				      locate_service_kadmin, SOCK_STREAM, 0);
 	if (!code) {
 	    /* Success with admin_server but now we need to change the
-	       port number to use DEFAULT_KPASSWD_PORT.  */
+	       port number to use DEFAULT_KPASSWD_PORT and the socktype.  */
 	    int i;
 	    for (i=0; i<addrlist->naddrs; i++) {
 		struct addrinfo *a = addrlist->addrs[i].ai;
 		if (a->ai_family == AF_INET)
 		    sa2sin (a->ai_addr)->sin_port = htons(DEFAULT_KPASSWD_PORT);
+		if (sockType != SOCK_STREAM)
+		    a->ai_socktype = sockType;
 	    }
 	}
     }