This commit was manufactured by cvs2svn to create tag

[krb5.git] / src / lib / krb5 / os / sendto_kdc.c

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 01b797e701baff7cee91a8144604f140c4dee45c..47f2408b3157602bac60acccb9e9c9aec1988fac 100644 (file)
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -60,16 +60,16 @@ extern int krb5_skdc_timeout_shift;
 extern int krb5_skdc_timeout_1;
 
 krb5_error_code
-krb5_sendto_kdc (context, message, realm, reply, master)
+krb5_sendto_kdc (context, message, realm, reply, use_master)
     krb5_context context;
     const krb5_data * message;
     const krb5_data * realm;
     krb5_data * reply;
-    int *master;
+    int use_master;
 {
     register int timeout, host, i;
     struct sockaddr *addr;
-    int naddr, master_index, nmasters;
+    int naddr;
     int sent, nready;
     krb5_error_code retval;
     SOCKET *socklist;
@@ -81,14 +81,10 @@ krb5_sendto_kdc (context, message, realm, reply, master)
      * find KDC location(s) for realm
      */
 
-    if (retval = krb5_locate_kdc (context, realm, &addr, &naddr,
-                                 master?&master_index:NULL,
-                                 master?&nmasters:NULL))
+    if (retval = krb5_locate_kdc (context, realm, &addr, &naddr, use_master))
        return retval;
     if (naddr == 0)
-       return KRB5_REALM_UNKNOWN;
-    if (master && (*master == 1) && (nmasters == 0))
-       return KRB5_KDC_UNREACH;
+       return (use_master ? KRB5_KDC_UNREACH : KRB5_REALM_UNKNOWN);
 
     socklist = (SOCKET *)malloc(naddr * sizeof(SOCKET));
     if (socklist == NULL) {
@@ -128,12 +124,6 @@ krb5_sendto_kdc (context, message, realm, reply, master)
         timeout <<= krb5_skdc_timeout_shift) {
        sent = 0;
        for (host = 0; host < naddr; host++) {
-           /* if a master kdc is required, skip the non-master kdc's */
-
-           if (master && (*master == 1) &&
-               ((host < master_index) || (host >= (master_index+nmasters))))
-               continue;
-
            /* send to the host, wait timeout seconds for a response,
               then move on. */
            /* cache some sockets for each host */
@@ -211,12 +201,6 @@ krb5_sendto_kdc (context, message, realm, reply, master)
                reply->length = cc;
                retval = 0;
 
-               /* if the caller asked to be informed if it
-                  got a master kdc, tell it */
-               if (master)
-                   *master = ((host >= master_index) &&
-                              (host < (master_index+nmasters)));
-
                goto out;
            } else if (nready == 0) {
                /* timeout */