diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | packet.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -13,6 +13,9 @@ | |||
13 | [auth.c] | 13 | [auth.c] |
14 | don't compare against pw_home if realpath fails for pw_home (seen | 14 | don't compare against pw_home if realpath fails for pw_home (seen |
15 | on AFS); ok djm@ | 15 | on AFS); ok djm@ |
16 | - markus@cvs.openbsd.org 2002/11/04 10:09:51 | ||
17 | [packet.c] | ||
18 | log before send disconnect; ok djm@ | ||
16 | 19 | ||
17 | 20021021 | 20 | 20021021 |
18 | - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from | 21 | - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from |
@@ -790,4 +793,4 @@ | |||
790 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 793 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
791 | ok provos@ | 794 | ok provos@ |
792 | 795 | ||
793 | $Id: ChangeLog,v 1.2503 2002/11/09 15:45:12 mouring Exp $ | 796 | $Id: ChangeLog,v 1.2504 2002/11/09 15:46:24 mouring Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.98 2002/10/23 10:32:13 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.99 2002/11/04 10:09:51 markus Exp $"); |
41 | 41 | ||
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
43 | #include "buffer.h" | 43 | #include "buffer.h" |
@@ -1226,6 +1226,9 @@ packet_disconnect(const char *fmt,...) | |||
1226 | vsnprintf(buf, sizeof(buf), fmt, args); | 1226 | vsnprintf(buf, sizeof(buf), fmt, args); |
1227 | va_end(args); | 1227 | va_end(args); |
1228 | 1228 | ||
1229 | /* Display the error locally */ | ||
1230 | log("Disconnecting: %.100s", buf); | ||
1231 | |||
1229 | /* Send the disconnect message to the other side, and wait for it to get sent. */ | 1232 | /* Send the disconnect message to the other side, and wait for it to get sent. */ |
1230 | if (compat20) { | 1233 | if (compat20) { |
1231 | packet_start(SSH2_MSG_DISCONNECT); | 1234 | packet_start(SSH2_MSG_DISCONNECT); |
@@ -1245,8 +1248,6 @@ packet_disconnect(const char *fmt,...) | |||
1245 | /* Close the connection. */ | 1248 | /* Close the connection. */ |
1246 | packet_close(); | 1249 | packet_close(); |
1247 | 1250 | ||
1248 | /* Display the error locally and exit. */ | ||
1249 | log("Disconnecting: %.100s", buf); | ||
1250 | fatal_cleanup(); | 1251 | fatal_cleanup(); |
1251 | } | 1252 | } |
1252 | 1253 | ||