2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ae8efacae..40b939018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
      /*NOTREACHED*/ for lint warning:
        warning: function key_equal falls off bottom without returning value
      ok djm@
+   - markus@cvs.openbsd.org 2008/07/10 18:05:58
+     [channels.c]
+     missing bzero; from mickey; ok djm@
 
 20080709
  - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass
@@ -4615,4 +4618,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5071 2008/07/11 07:35:09 djm Exp $
+$Id: ChangeLog,v 1.5072 2008/07/11 07:35:37 djm Exp $
diff --git a/channels.c b/channels.c
index ac5134b5b..9f27fa632 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.282 2008/06/16 13:22:53 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.283 2008/07/10 18:05:58 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2875,6 +2875,7 @@ connect_to(const char *host, u_short port, char *ctype, char *rname)
                 return NULL;
         }
 
+        memset(&cctx, 0, sizeof(cctx));
         cctx.host = xstrdup(host);
         cctx.port = port;
         cctx.ai = cctx.aitop;