diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2012-02-28 16:15:56 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2012-02-28 16:15:56 +0000 |
| commit | 666d801d3b1a288f59dc458ea1fb438dc4f4329a (patch) | |
| tree | 91607b94c04d76786167c769d86aad6793b76d69 /src/util/support | |
| parent | 7c08c875b8617f2df0fd98510eb0ad3ce12bcc86 (diff) | |
| download | krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.gz krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.xz krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.zip | |
Require IPv6 support
The configure-time options to enable and disable IPv6 support have
been deprecated for some time, but the checks for OS support were
kept. This removes those checks, and unconditionally compiles in the
IPv6 support.
There was a configure-time test to see if the macro INET6 needed to be
defined in order to enable (visibility of) OS support for IPv6, which
was needed on an IRIX system we tested with. That check is retained,
but the revised code is untested on IRIX.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25719 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/support')
| -rw-r--r-- | src/util/support/fake-addrinfo.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/util/support/fake-addrinfo.c b/src/util/support/fake-addrinfo.c index 64d84e5ca..4efecd540 100644 --- a/src/util/support/fake-addrinfo.c +++ b/src/util/support/fake-addrinfo.c @@ -552,9 +552,7 @@ static inline int fai_add_entry (struct addrinfo **result, void *addr, if (n == 0) return EAI_MEMORY; if (template->ai_family != AF_INET -#ifdef KRB5_USE_INET6 && template->ai_family != AF_INET6 -#endif ) return EAI_FAMILY; *n = *template; @@ -572,7 +570,6 @@ static inline int fai_add_entry (struct addrinfo **result, void *addr, sin4->sin_len = sizeof (struct sockaddr_in); #endif } -#ifdef KRB5_USE_INET6 if (template->ai_family == AF_INET6) { struct sockaddr_in6 *sin6; sin6 = malloc (sizeof (struct sockaddr_in6)); @@ -587,7 +584,6 @@ static inline int fai_add_entry (struct addrinfo **result, void *addr, sin6->sin6_len = sizeof (struct sockaddr_in6); #endif } -#endif n->ai_next = *result; *result = n; return 0; @@ -1355,15 +1351,8 @@ static int krb5int_unlock_fac (void) } #endif -#if defined(KRB5_USE_INET6) /* Some systems don't define in6addr_any. */ const struct in6_addr krb5int_in6addr_any = IN6ADDR_ANY_INIT; -#else -/* Are any of the systems without IPv6 support among those where - we cross-check the actual exported symbols against the export - list? Not sure, play it safe. */ -const char krb5int_in6addr_any = 0; -#endif int krb5int_getaddrinfo (const char *node, const char *service, const struct addrinfo *hints, |