summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 73b71dd80..ea27f1747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,9 @@
58 - markus@cvs.openbsd.org 2003/09/19 11:30:39 58 - markus@cvs.openbsd.org 2003/09/19 11:30:39
59 [ssh-keyscan.c] 59 [ssh-keyscan.c]
60 avoid fatal_cleanup, just call exit(); ok deraadt 60 avoid fatal_cleanup, just call exit(); ok deraadt
61 - markus@cvs.openbsd.org 2003/09/19 11:31:33
62 [channels.c]
63 do not call channel_free_all on fatal; ok deraadt
61 64
6220030919 6520030919
63 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; 66 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1194,4 +1197,4 @@
1194 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1197 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1195 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1198 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1196 1199
1197$Id: ChangeLog,v 1.3032 2003/09/22 11:11:20 dtucker Exp $ 1200$Id: ChangeLog,v 1.3033 2003/09/22 11:12:56 dtucker Exp $
diff --git a/channels.c b/channels.c
index 3d75c8f2b..af2ae18b1 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.195 2003/09/16 21:02:40 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.196 2003/09/19 11:31:33 markus Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -217,7 +217,6 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
217 channels = xmalloc(channels_alloc * sizeof(Channel *)); 217 channels = xmalloc(channels_alloc * sizeof(Channel *));
218 for (i = 0; i < channels_alloc; i++) 218 for (i = 0; i < channels_alloc; i++)
219 channels[i] = NULL; 219 channels[i] = NULL;
220 fatal_add_cleanup((void (*) (void *)) channel_free_all, NULL);
221 } 220 }
222 /* Try to find a free slot where to put the new channel. */ 221 /* Try to find a free slot where to put the new channel. */
223 for (found = -1, i = 0; i < channels_alloc; i++) 222 for (found = -1, i = 0; i < channels_alloc; i++)