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/slave | |
| parent | 7c08c875b8617f2df0fd98510eb0ad3ce12bcc86 (diff) | |
| download | krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.zip krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.gz krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.bz2 | |
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/slave')
| -rw-r--r-- | src/slave/kpropd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index 73e8da9..14304c4 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -248,12 +248,10 @@ get_wildcard_addr(struct addrinfo **res) memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; -#ifdef KRB5_USE_INET6 hints.ai_family = AF_INET6; error = getaddrinfo(NULL, port, &hints, res); if (error == 0) return 0; -#endif hints.ai_family = AF_INET; return getaddrinfo(NULL, port, &hints, res); } @@ -288,7 +286,7 @@ retry: if (setsockopt(finet, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) com_err(progname, errno, _("while setting SO_REUSEADDR option")); -#if defined(KRB5_USE_INET6) && defined(IPV6_V6ONLY) +#if defined(IPV6_V6ONLY) /* Make sure dual-stack support is enabled on IPv6 listener sockets if * possible. */ val = 0; |