summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-02-09 04:59:38 +0000
committerGreg Hudson <ghudson@mit.edu>2011-02-09 04:59:38 +0000
commit009b13f993e9aa56f275365f21158cfa636b5906 (patch)
tree471cd8d73010a8dcfd1120437f49452c0405f055
parent940bf2436d5c31c97d006a58d1f259dc4bc53ec2 (diff)
downloadkrb5-009b13f993e9aa56f275365f21158cfa636b5906.tar.gz
krb5-009b13f993e9aa56f275365f21158cfa636b5906.tar.xz
krb5-009b13f993e9aa56f275365f21158cfa636b5906.zip
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
-rw-r--r--src/kadmin/server/schpw.c2
-rw-r--r--src/lib/krb5/os/localaddr.c2
2 files changed, 4 insertions, 0 deletions
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;
}