* def_realm.c: Move prototype for krb5_try_realm_txt_rr() to

        os-proto.h.

        * init_os_ctx.c: Include os-proto.h

        * changepw.c, locate_kdc.c: Do not shadow sin() with local
        variable name.

        * os-proto.h: Add prototypes for krb5_try_realm_txt_rr() and the
        obsolete krb5_secure_config_files().

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

6 files changed, 30 insertions, 11 deletions

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index c086048a70..8647ce0b82 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-10  Ezra Peisach  <epeisach@mit.edu>
+
+	* def_realm.c: Move prototype for krb5_try_realm_txt_rr() to
+	os-proto.h.
+
+	* init_os_ctx.c: Include os-proto.h
+
+	* changepw.c, locate_kdc.c: Do not shadow sin() with local
+	variable name.
+
+	* os-proto.h: Add prototypes for krb5_try_realm_txt_rr() and the
+	obsolete krb5_secure_config_files().
+
 2001-03-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* localaddr.c (krb5_os_localaddr): Don't look for -1 return value
diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index 3d3ea25a74..61cfea01ff 100644
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -76,8 +76,8 @@ krb5_locate_kpasswd(context, realm, addr_pp, naddrs)
             /* success with admin_server but now we need to change the port */
             /* number to use DEFAULT_KPASSWD_PORT.                          */
             for ( i=0;i<*naddrs;i++ ) {
-                struct sockaddr_in *sin = (struct sockaddr_in *) addr_pp[i];
-                sin->sin_port = htons(DEFAULT_KPASSWD_PORT);
+                struct sockaddr_in *sockin = (struct sockaddr_in *) addr_pp[i];
+                sockin->sin_port = htons(DEFAULT_KPASSWD_PORT);
             }
         }
     }
@@ -97,8 +97,8 @@ krb5_locate_kpasswd(context, realm, addr_pp, naddrs)
                     /* success with admin_server but now we need to change the port */
                     /* number to use DEFAULT_KPASSWD_PORT.                          */
                     for ( i=0;i<*naddrs;i++ ) {
-                        struct sockaddr_in *sin = (struct sockaddr_in *) addr_pp[i];
-                        sin->sin_port = htons(DEFAULT_KPASSWD_PORT);
+                        struct sockaddr_in *sockin = (struct sockaddr_in *) addr_pp[i];
+                        sockin->sin_port = htons(DEFAULT_KPASSWD_PORT);
                     }
                 }
             }
diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c
index 01fd465178..65e3902cd0 100644
--- a/src/lib/krb5/os/def_realm.c
+++ b/src/lib/krb5/os/def_realm.c
@@ -52,7 +52,6 @@
 
 #define MAX_DNS_NAMELEN (15*(MAXHOSTNAMELEN + 1)+1)
 
-extern int krb5_try_realm_txt_rr(char *,char *, char **);
 #endif /* KRB5_DNS_LOOKUP */
 
 /*
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 676c46d29a..1f430610fe 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -28,6 +28,7 @@
 
 #define NEED_WINDOWS
 #include "k5-int.h"
+#include "os-proto.h"
 
 #ifdef macintosh
 #include <PreferencesLib.h>
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 91e12b19d0..48a0147700 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -348,7 +348,7 @@ krb5_locate_srv_dns(realm, service, protocol, addr_pp, naddrs)
     unsigned char *p=NULL;
     char host[MAX_DNS_NAMELEN], *h;
     struct sockaddr *addr = NULL;
-    struct sockaddr_in *sin = NULL;
+    struct sockaddr_in *sin_p = NULL;
     struct hostent *hp = NULL;
     int type, class;
     int priority, weight, size, len, numanswers, numqueries, rdlen;
@@ -553,11 +553,11 @@ krb5_locate_srv_dns(realm, service, protocol, addr_pp, naddrs)
 #ifdef HAVE_NETINET_IN_H
             case AF_INET:
 		for (j=0; hp->h_addr_list[j]; j++) {
-		    sin = (struct sockaddr_in *) &addr[out++];
-		    memset ((char *) sin, 0, sizeof (struct sockaddr));
-		    sin->sin_family = hp->h_addrtype;
-		    sin->sin_port = htons(entry->port);
-		    memcpy((char *) &sin->sin_addr,
+		    sin_p = (struct sockaddr_in *) &addr[out++];
+		    memset ((char *) sin_p, 0, sizeof (struct sockaddr));
+		    sin_p->sin_family = hp->h_addrtype;
+		    sin_p->sin_port = htons(entry->port);
+		    memcpy((char *) &sin_p->sin_addr,
 			   (char *) hp->h_addr_list[j],
 			   sizeof(struct in_addr));
 		    if (out + 1 >= count) {
diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index 37782df7d3..12e2afb481 100644
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -55,6 +55,12 @@ krb5_error_code krb5_make_full_ipaddr
 
 #endif /* HAVE_NETINET_IN_H */
 
+krb5_error_code krb5_try_realm_txt_rr(const char *, const char *, 
+				      char **realm);
+
+/* Obsolete interface - leave prototype here until code removed */
+krb5_error_code krb5_secure_config_files(krb5_context ctx);
+
 int _krb5_use_dns_realm KRB5_PROTOTYPE((krb5_context));
 int _krb5_use_dns_kdc KRB5_PROTOTYPE((krb5_context));
 int _krb5_conf_boolean KRB5_PROTOTYPE((const char *));