From 666d801d3b1a288f59dc458ea1fb438dc4f4329a Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 28 Feb 2012 16:15:56 +0000
Subject: 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
---
 src/include/fake-addrinfo.h |  2 +-
 src/include/socket-utils.h  | 12 ++----------
 src/include/win-mac.h       |  1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/include')

diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
index 5063ae800..03666a0aa 100644
--- a/src/include/fake-addrinfo.h
+++ b/src/include/fake-addrinfo.h
@@ -203,7 +203,7 @@ struct addrinfo {
 # define AI_DEFAULT (AI_ADDRCONFIG|AI_V4MAPPED)
 #endif
 
-#if defined(KRB5_USE_INET6) && defined(NEED_INSIXADDR_ANY)
+#if defined(NEED_INSIXADDR_ANY)
 /* If compiling with IPv6 support and C library does not define in6addr_any */
 extern const struct in6_addr krb5int_in6addr_any;
 #undef in6addr_any
diff --git a/src/include/socket-utils.h b/src/include/socket-utils.h
index 19145c85f..484e294f8 100644
--- a/src/include/socket-utils.h
+++ b/src/include/socket-utils.h
@@ -51,7 +51,7 @@
 
    Do NOT install this file.  */
 
-/* for HAVE_SOCKLEN_T, KRB5_USE_INET6, etc */
+/* for HAVE_SOCKLEN_T etc */
 #include "autoconf.h"
 /* for sockaddr_storage */
 #include "port-sockets.h"
@@ -72,12 +72,10 @@ static inline struct sockaddr_in *sa2sin (struct sockaddr *sa)
 {
     return (struct sockaddr_in *) (void *) sa;
 }
-#ifdef KRB5_USE_INET6
 static inline struct sockaddr_in6 *sa2sin6 (struct sockaddr *sa)
 {
     return (struct sockaddr_in6 *) (void *) sa;
 }
-#endif
 static inline struct sockaddr *ss2sa (struct sockaddr_storage *ss)
 {
     return (struct sockaddr *) ss;
@@ -86,23 +84,17 @@ static inline struct sockaddr_in *ss2sin (struct sockaddr_storage *ss)
 {
     return (struct sockaddr_in *) ss;
 }
-#ifdef KRB5_USE_INET6
 static inline struct sockaddr_in6 *ss2sin6 (struct sockaddr_storage *ss)
 {
     return (struct sockaddr_in6 *) ss;
 }
-#endif
 
 #if !defined (socklen)
 /* socklen_t socklen (struct sockaddr *) */
 #  ifdef HAVE_SA_LEN
 #    define socklen(X) ((X)->sa_len)
 #  else
-#    ifdef KRB5_USE_INET6
-#      define socklen(X) ((X)->sa_family == AF_INET6 ? (socklen_t) sizeof (struct sockaddr_in6) : (X)->sa_family == AF_INET ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
-#    else
-#      define socklen(X) ((X)->sa_family == AF_INET ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
-#    endif
+#    define socklen(X) ((X)->sa_family == AF_INET6 ? (socklen_t) sizeof (struct sockaddr_in6) : (X)->sa_family == AF_INET ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
 #  endif
 #endif
 
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 82d3ff736..53f274af7 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -115,7 +115,6 @@ typedef _W64 int         ssize_t;
 #define SYS_ERRLIST_DECLARED
 /* if __STDC_VERSION__ >= 199901L this shouldn't be needed */
 #define inline __inline
-#define KRB5_USE_INET6
 #define NEED_INSIXADDR_ANY
 #define ENABLE_THREADS
 #endif
-- 
cgit