From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 9 Feb 2011 04:59:38 +0000 (+0000)
Subject: Add missing KRB5_USE_INET6 ifdefs around some bits of IPv6 code which
X-Git-Tag: krb5-1.10-alpha1~598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=009b13f993e9aa56f275365f21158cfa636b5906;p=thirdparty%2Fkrb5.git

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

ticket: 6857

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

diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index 1124445b4f..802584e75f 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -271,6 +271,7 @@ process_chpw_request(context, server_handle, realm, keytab,
         salen = sizeof(*sin);
         break;
     }
+#ifdef KRB5_USE_INET6
     case ADDRTYPE_INET6: {
         struct sockaddr_in6 *sin6 = ss2sin6(&ss);
 
@@ -280,6 +281,7 @@ process_chpw_request(context, server_handle, realm, keytab,
         salen = sizeof(*sin6);
         break;
     }
+#endif
     default: {
         struct sockaddr *sa = ss2sa(&ss);
 
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 8b3c3ef947..61d01a97bd 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -183,10 +183,12 @@ is_loopback_address(struct sockaddr *sa)
         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;
     }