- markus@cvs.openbsd.org 2003/09/19 11:33:09

     [packet.c sshd.c]
     do not call packet_close on fatal; ok deraadt

1 files changed, 1 insertions, 4 deletions

diff --git a/packet.c b/packet.c
index 02b629f30..6e7e574ab 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.110 2003/09/19 09:02:02 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.111 2003/09/19 11:33:09 markus Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -165,8 +165,6 @@ packet_set_connection(int fd_in, int fd_out)
                 buffer_init(&incoming_packet);
                 TAILQ_INIT(&outgoing);
         }
-        /* Kludge: arrange the close function to be called from fatal(). */
-        fatal_add_cleanup((void (*) (void *)) packet_close, NULL);
 }
 
 /* Returns 1 if remote host is connected via socket, 0 if not. */
@@ -1338,7 +1336,6 @@ packet_disconnect(const char *fmt,...)
 
         /* Close the connection. */
         packet_close();
-
         fatal_cleanup();
 }