summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/packet.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2003-09-19 11:33:10 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2003-09-19 11:33:10 +0000
commit46027757abcc1fac8980efe314938adb337c15b6 (patch)
tree4b8255d4e9d6f9ed1e03cc0192e0c57e76348464 /usr.bin/ssh/packet.c
parentfa3bef7839bc3953dd269eaed97c60ddd3537067 (diff)
do not call packet_close on fatal; ok deraadt
Diffstat (limited to 'usr.bin/ssh/packet.c')
-rw-r--r--usr.bin/ssh/packet.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index 91f3ab7a3f1..7635ac2d138 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/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 <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. */
@@ -1333,7 +1331,6 @@ packet_disconnect(const char *fmt,...)
/* Close the connection. */
packet_close();
-
fatal_cleanup();
}