3 files changed, 8 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index ac992e300..03910b301 100644
--- a/CREDITS
+++ b/CREDITS
@@ -5,6 +5,7 @@ Theo de Raadt, and Dug Song - Creators of OpenSSH
 
 Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes
 Andre Lucas <andre.lucas@dial.pipex.com> - build, login and many other fixes
+Andy Sloane <andy@guildsoftware.com> - bugfixes
 Ben Taylor <bent@clark.net> - Solaris debugging and fixes
 Chip Salzenberg <chip@valinux.com> - Assorted patches
 Chris Saia <csaia@wtower.com> - SuSE packaging
diff --git a/ChangeLog b/ChangeLog
index aec7a6d86..afc51024a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000123
+ - OpenBSD CVS:
+   - [packet.c]
+     getsockname() requires initialized tolen; andy@guildsoftware.com
+
 20000122
  - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor
    <bent@clark.net>
diff --git a/packet.c b/packet.c
index 3202e7e7b..d0f3a895a 100644
--- a/packet.c
+++ b/packet.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: packet.c,v 1.10 2000/01/22 08:47:21 damien Exp $");
+RCSID("$Id: packet.c,v 1.11 2000/01/22 22:38:00 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -136,7 +136,7 @@ int
 packet_connection_is_ipv4()
 {
         struct sockaddr_storage to;
-        socklen_t tolen;
+        socklen_t tolen = sizeof(to);
 
         memset(&to, 0, sizeof(to));
         if (getsockname(connection_out, (struct sockaddr *)&to, &tolen) < 0)