4 files changed, 9 insertions, 37 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 643736d1d..0c07e50f6 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-25  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Moved test for socklen_t to include directory.
+
 2001-03-05  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Check for sys/filio.h for FIONBIO.
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index a12f8ddba..88ff70e1e 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -8,19 +8,6 @@ AC_TYPE_UID_T
 AC_TYPE_OFF_T
 dnl
 dnl
-AC_MSG_CHECKING(for socklen_t)
-AC_CACHE_VAL(krb5_cv_has_type_socklen_t,
-[AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <sys/socket.h>
-],[sizeof (socklen_t);],
-krb5_cv_has_type_socklen_t=yes,krb5_cv_has_type_socklen_t=no)])
-AC_MSG_RESULT($krb5_cv_has_type_socklen_t)
-if test $krb5_cv_has_type_socklen_t = yes; then
-    AC_DEFINE(HAVE_SOCKLEN_T)
-fi
-dnl
-dnl
 HAS_ANSI_VOLATILE
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h)
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index ceff3a62c..5ae26110f 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-25  Ken Raeburn  <raeburn@mit.edu>
+
+	* localaddr.c (socklen_t, socklen): Deleted; definitions now in
+	k5-int.h instead.
+
 2001-03-31  Ken Raeburn  <raeburn@mit.edu>
 
 	* t_gifconf.c: New file.
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 82c5863f9..1fc558d58 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -227,30 +227,6 @@ get_ifconf (int s, size_t *lenp, /*@out@*/ char *buf)
     return ret;
 }
 
-#ifndef HAVE_SOCKLEN_T
-typedef size_t socklen_t;
-#endif
-
-static size_t
-socklen (const struct sockaddr *sa)
-     /*@*/
-{
-#ifdef HAVE_SA_LEN
-    return sa->sa_len;
-#else
-    switch (sa->sa_family) {
-    case AF_INET:
-	return sizeof (struct sockaddr_in);
-#ifdef KRB5_USE_INET6
-    case AF_INET6:
-	return sizeof (struct sockaddr_in6);
-#endif
-    default:
-	return sizeof (struct sockaddr);
-    }
-#endif
-}
-
 /* Return value is errno if internal stuff failed, otherwise zero,
    even in the case where a called function terminated the iteration.