diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20080712 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2008/07/12 04:52:50 | ||
4 | [channels.c] | ||
5 | unbreak; move clearing of cctx struct to before first use | ||
6 | reported by dkrause@ | ||
7 | |||
1 | 20080711 | 8 | 20080711 |
2 | - (djm) OpenBSD CVS Sync | 9 | - (djm) OpenBSD CVS Sync |
3 | - stevesk@cvs.openbsd.org 2008/07/07 00:31:41 | 10 | - stevesk@cvs.openbsd.org 2008/07/07 00:31:41 |
@@ -4622,4 +4629,4 @@ | |||
4622 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4629 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4623 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4630 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4624 | 4631 | ||
4625 | $Id: ChangeLog,v 1.5073 2008/07/11 07:36:48 djm Exp $ | 4632 | $Id: ChangeLog,v 1.5074 2008/07/12 07:12:29 djm Exp $ |
diff --git a/channels.c b/channels.c index 9f27fa632..7be577838 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.283 2008/07/10 18:05:58 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.284 2008/07/12 04:52:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2865,6 +2865,7 @@ connect_to(const char *host, u_short port, char *ctype, char *rname) | |||
2865 | struct channel_connect cctx; | 2865 | struct channel_connect cctx; |
2866 | Channel *c; | 2866 | Channel *c; |
2867 | 2867 | ||
2868 | memset(&cctx, 0, sizeof(cctx)); | ||
2868 | memset(&hints, 0, sizeof(hints)); | 2869 | memset(&hints, 0, sizeof(hints)); |
2869 | hints.ai_family = IPv4or6; | 2870 | hints.ai_family = IPv4or6; |
2870 | hints.ai_socktype = SOCK_STREAM; | 2871 | hints.ai_socktype = SOCK_STREAM; |
@@ -2875,7 +2876,6 @@ connect_to(const char *host, u_short port, char *ctype, char *rname) | |||
2875 | return NULL; | 2876 | return NULL; |
2876 | } | 2877 | } |
2877 | 2878 | ||
2878 | memset(&cctx, 0, sizeof(cctx)); | ||
2879 | cctx.host = xstrdup(host); | 2879 | cctx.host = xstrdup(host); |
2880 | cctx.port = port; | 2880 | cctx.port = port; |
2881 | cctx.ai = cctx.aitop; | 2881 | cctx.ai = cctx.aitop; |