* localaddr.c (krb5_os_localaddr): Don't bother trying to create inet6 socket; any...

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 118c17afd01374e148095487006053cbcbfc8101..0f4d8c3e8784de4989575fb29f3e0321e121a818 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,4 +1,9 @@
-1999-10-17  Ken Raeburn  <raeburn@raeburn.org>
+1999-10-18  Ken Raeburn  <raeburn@mit.edu>
+
+       * localaddr.c (krb5_os_localaddr): Don't bother trying to create
+       inet6 socket; any socket type will do.
+
+1999-10-17  Ken Raeburn  <raeburn@mit.edu>
 
        * localaddr.c (krb5_os_localaddr): Raise buffer size to 10K.
        Handle INET6 addresses.  If INET6 support is built in but the

diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 6a9acdc4ee422fa1a6854b6e86aac01e16eafd31..a73ba2533d5c0d91e6854d67c6c3cf0e3ca06c04 100644 (file)
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -54,12 +54,7 @@
 #include <netinet/in.h>
 
 #ifndef USE_AF
-#ifdef AF_INET6
-#define USE_AF  AF_INET6
-#define USE_AF2 AF_INET
-#else
 #define USE_AF AF_INET
-#endif
 #define USE_TYPE SOCK_DGRAM
 #define USE_PROTO 0
 #endif
@@ -130,10 +125,6 @@ krb5_os_localaddr(context, addr)
     ifc.ifc_buf = buf;
 
     s = socket (USE_AF, USE_TYPE, USE_PROTO);
-#if defined (USE_AF2) && defined (EPROTONOSUPPORT)
-    if (s < 0 && SOCKET_ERRNO == EPROTONOSUPPORT)
-       s = socket (USE_AF2, USE_TYPE, USE_PROTO);
-#endif
     if (s < 0)
        return SOCKET_ERRNO;