- markus@cvs.openbsd.org 2002/11/04 10:09:51

     [packet.c]
     log before send disconnect; ok djm@

diff --git a/ChangeLog b/ChangeLog
index 0eddaa792d2d38da81edcdf466de5d900fa6e71e..ae04d4c5ba949cb687859e5cb78d6b853a91b643 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
      [auth.c]
      don't compare against pw_home if realpath fails for pw_home (seen 
      on AFS); ok djm@
+   - markus@cvs.openbsd.org 2002/11/04 10:09:51
+     [packet.c]
+     log before send disconnect; ok djm@
 
 20021021
  - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 

diff --git a/packet.c b/packet.c
index 5078630e7465c630d66fb152b0b7f6db10ae0478..6400ad9b109c2aa517dae4ad0aa4d545aebc2638 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.98 2002/10/23 10:32:13 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.99 2002/11/04 10:09:51 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -1226,6 +1226,9 @@ packet_disconnect(const char *fmt,...)
        vsnprintf(buf, sizeof(buf), fmt, args);
        va_end(args);
 
+       /* Display the error locally */
+       log("Disconnecting: %.100s", buf);
+
        /* Send the disconnect message to the other side, and wait for it to get sent. */
        if (compat20) {
                packet_start(SSH2_MSG_DISCONNECT);
@@ -1245,8 +1248,6 @@ packet_disconnect(const char *fmt,...)
        /* Close the connection. */
        packet_close();
 
-       /* Display the error locally and exit. */
-       log("Disconnecting: %.100s", buf);
        fatal_cleanup();
 }