summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>1999-10-18 05:18:56 +0000
committerKen Raeburn <raeburn@mit.edu>1999-10-18 05:18:56 +0000
commit6a7116e9d55a4eaefc8387ce9510e621cca0f01e (patch)
tree15e6a62184b20f7e580142b36e39c4d5500dbfff /src
parente3a442c7e74814977c99c677215f0519ac84b92e (diff)
downloadkrb5-6a7116e9d55a4eaefc8387ce9510e621cca0f01e.tar.gz
krb5-6a7116e9d55a4eaefc8387ce9510e621cca0f01e.tar.xz
krb5-6a7116e9d55a4eaefc8387ce9510e621cca0f01e.zip
* localaddr.c (krb5_os_localaddr): Don't bother trying to create inet6 socket; any socket type will do
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11866 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog7
-rw-r--r--src/lib/krb5/os/localaddr.c9
2 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 118c17afd0..0f4d8c3e87 100644
--- 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 6a9acdc4ee..a73ba2533d 100644
--- 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;