[packet.c]
     log before send disconnect; ok djm@
This commit is contained in:
Ben Lindstrom 2002-11-09 15:46:24 +00:00
parent 485075e8fa
commit 9bda7ae4c6
2 changed files with 8 additions and 4 deletions

View File

@ -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
@ -790,4 +793,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
$Id: ChangeLog,v 1.2503 2002/11/09 15:45:12 mouring Exp $
$Id: ChangeLog,v 1.2504 2002/11/09 15:46:24 mouring Exp $

View File

@ -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();
}