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 @@
    - markus@cvs.openbsd.org 2003/09/19 11:30:39
      [ssh-keyscan.c]
      avoid fatal_cleanup, just call exit(); ok deraadt
+   - markus@cvs.openbsd.org 2003/09/19 11:31:33
+     [channels.c]
+     do not call channel_free_all on fatal; ok deraadt
 
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1194,4 +1197,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3032 2003/09/22 11:11:20 dtucker Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.195 2003/09/16 21:02:40 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.196 2003/09/19 11:31:33 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -217,7 +217,6 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
                 channels = xmalloc(channels_alloc * sizeof(Channel *));
                 for (i = 0; i < channels_alloc; i++)
                         channels[i] = NULL;
-                fatal_add_cleanup((void (*) (void *)) channel_free_all, NULL);
         }
         /* Try to find a free slot where to put the new channel. */
         for (found = -1, i = 0; i < channels_alloc; i++)