diff options
author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:03:58 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:03:58 +1100 |
commit | 894926ebd8cc3d6651ad1a3a1269a60ef127cd44 (patch) | |
tree | 7f1c5c67c188c3eb38126035236b5e5e16048b97 | |
parent | 78d22713c79da46b80eceec02411563be3c65e71 (diff) |
- djm@cvs.openbsd.org 2013/02/10 23:35:24
[packet.c]
record "Received disconnect" messages at ERROR rather than INFO priority,
since they are abnormal and result in a non-zero ssh exit status; patch
from Iain Morgan in bz#2057; ok dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | packet.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -44,6 +44,11 @@ append to moduli file when screening candidates rather than overwriting. allows resumption of interrupted screen; patch from Christophe Garault in bz#1957; ok dtucker@ + - djm@cvs.openbsd.org 2013/02/10 23:35:24 + [packet.c] + record "Received disconnect" messages at ERROR rather than INFO priority, + since they are abnormal and result in a non-zero ssh exit status; patch + from Iain Morgan in bz#2057; ok dtucker@ 20130211 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.180 2013/01/08 18:49:04 markus Exp $ */ +/* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1460,7 +1460,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) case SSH2_MSG_DISCONNECT: reason = packet_get_int(); msg = packet_get_string(NULL); - logit("Received disconnect from %s: %u: %.400s", + error("Received disconnect from %s: %u: %.400s", get_remote_ipaddr(), reason, msg); xfree(msg); cleanup_exit(255); @@ -1485,7 +1485,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) break; case SSH_MSG_DISCONNECT: msg = packet_get_string(NULL); - logit("Received disconnect from %s: %.400s", + error("Received disconnect from %s: %.400s", get_remote_ipaddr(), msg); cleanup_exit(255); break; |