svn rev #24620: trunk/src/ kadmin/server/ lib/krb5/os/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24620
Commit By: ghudson
Log Message:
ticket: 6857

Add missing KRB5_USE_INET6 ifdefs around some bits of IPv6 code which
didn't have them.  From aberry at likewise.com.



Changed Files:
U   trunk/src/kadmin/server/schpw.c
U   trunk/src/lib/krb5/os/localaddr.c
Modified: trunk/src/kadmin/server/schpw.c
===================================================================
--- trunk/src/kadmin/server/schpw.c	2011-02-09 04:46:46 UTC (rev 24619)
+++ trunk/src/kadmin/server/schpw.c	2011-02-09 04:59:38 UTC (rev 24620)
@@ -271,6 +271,7 @@
         salen = sizeof(*sin);
         break;
     }
+#ifdef KRB5_USE_INET6
     case ADDRTYPE_INET6: {
         struct sockaddr_in6 *sin6 = ss2sin6(&ss);
 
@@ -280,6 +281,7 @@
         salen = sizeof(*sin6);
         break;
     }
+#endif
     default: {
         struct sockaddr *sa = ss2sa(&ss);
 

Modified: trunk/src/lib/krb5/os/localaddr.c
===================================================================
--- trunk/src/lib/krb5/os/localaddr.c	2011-02-09 04:46:46 UTC (rev 24619)
+++ trunk/src/lib/krb5/os/localaddr.c	2011-02-09 04:59:38 UTC (rev 24620)
@@ -183,10 +183,12 @@
         struct sockaddr_in *s4 = (struct sockaddr_in *)sa;
         return s4->sin_addr.s_addr == htonl(INADDR_LOOPBACK);
     }
+#ifdef KRB5_USE_INET6
     case AF_INET6: {
         struct sockaddr_in6 *s6 = (struct sockaddr_in6 *)sa;
         return IN6_IS_ADDR_LOOPBACK(&s6->sin6_addr);
     }
+#endif
     default:
         return 0;
     }