diff --git a/ChangeLog b/ChangeLog
index de8a9e0fc3..6195c3a925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-06-25  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* nscd/connections.c (nscd_run): Use correct type for optlen variable.
+
 1999-06-25  Ulrich Drepper  <drepper@cygnus.com>
 
 	* string/bits/string2.h (strnlen): Remove extra prototype.
diff --git a/nscd/connections.c b/nscd/connections.c
index f0b3beeca9..eef2568863 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -410,7 +410,7 @@ nscd_run (void *p)
 	  if (secure_in_use)
 	    {
 	      struct ucred caller;
-	      int optlen = sizeof (caller);
+	      socklen_t optlen = sizeof (caller);
 
 	      if (getsockopt (fd, SOL_SOCKET, SO_PEERCRED,
 			      &caller, &optlen) < 0)