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

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

diff --git a/ChangeLog b/ChangeLog
index bf25165f1b095e5a0d3f3c9a53bab3d32d1fd536..c434763e2eed9d1d31f79ad48a7b4fac0d405d47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,9 @@
    - markus@cvs.openbsd.org 2003/09/19 11:31:33
      [channels.c]
      do not call channel_free_all on fatal; ok deraadt
+   - markus@cvs.openbsd.org 2003/09/19 11:33:09
+     [packet.c sshd.c]
+     do not call packet_close on fatal; ok deraadt
 
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;

diff --git a/packet.c b/packet.c
index 02b629f30f6ec5358248fa8b26a262527c29fd11..6e7e574ab5c32c71674ce798ddbd2f59abfddf46 100644 (file)
--- 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();
 }
 

diff --git a/sshd.c b/sshd.c
index 47df9caf1f6c63b3b7e0e064a7ffec41177bdbea..4b3ff0da3f8e79eee1013d59cb6a3d0ccd125a81 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.276 2003/08/28 12:54:34 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.277 2003/09/19 11:33:09 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -587,8 +587,6 @@ privsep_preauth(void)
        if (pid == -1) {
                fatal("fork of unprivileged child failed");
        } else if (pid != 0) {
-               fatal_remove_cleanup((void (*) (void *)) packet_close, NULL);
-
                debug2("Network child is on pid %ld", (long)pid);
 
                close(pmonitor->m_recvfd);
@@ -602,10 +600,6 @@ privsep_preauth(void)
                while (waitpid(pid, &status, 0) < 0)
                        if (errno != EINTR)
                                break;
-
-               /* Reinstall, since the child has finished */
-               fatal_add_cleanup((void (*) (void *)) packet_close, NULL);
-
                return (authctxt);
        } else {
                /* child */
@@ -653,8 +647,6 @@ privsep_postauth(Authctxt *authctxt)
        if (pmonitor->m_pid == -1)
                fatal("fork of unprivileged child failed");
        else if (pmonitor->m_pid != 0) {
-               fatal_remove_cleanup((void (*) (void *)) packet_close, NULL);
-
                debug2("User child is on pid %ld", (long)pmonitor->m_pid);
                close(pmonitor->m_recvfd);
                monitor_child_postauth(pmonitor);