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 @@ | |||
44 | append to moduli file when screening candidates rather than overwriting. | 44 | append to moduli file when screening candidates rather than overwriting. |
45 | allows resumption of interrupted screen; patch from Christophe Garault | 45 | allows resumption of interrupted screen; patch from Christophe Garault |
46 | in bz#1957; ok dtucker@ | 46 | in bz#1957; ok dtucker@ |
47 | - djm@cvs.openbsd.org 2013/02/10 23:35:24 | ||
48 | [packet.c] | ||
49 | record "Received disconnect" messages at ERROR rather than INFO priority, | ||
50 | since they are abnormal and result in a non-zero ssh exit status; patch | ||
51 | from Iain Morgan in bz#2057; ok dtucker@ | ||
47 | 52 | ||
48 | 20130211 | 53 | 20130211 |
49 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old | 54 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.180 2013/01/08 18:49:04 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1460,7 +1460,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) | |||
1460 | case SSH2_MSG_DISCONNECT: | 1460 | case SSH2_MSG_DISCONNECT: |
1461 | reason = packet_get_int(); | 1461 | reason = packet_get_int(); |
1462 | msg = packet_get_string(NULL); | 1462 | msg = packet_get_string(NULL); |
1463 | logit("Received disconnect from %s: %u: %.400s", | 1463 | error("Received disconnect from %s: %u: %.400s", |
1464 | get_remote_ipaddr(), reason, msg); | 1464 | get_remote_ipaddr(), reason, msg); |
1465 | xfree(msg); | 1465 | xfree(msg); |
1466 | cleanup_exit(255); | 1466 | cleanup_exit(255); |
@@ -1485,7 +1485,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) | |||
1485 | break; | 1485 | break; |
1486 | case SSH_MSG_DISCONNECT: | 1486 | case SSH_MSG_DISCONNECT: |
1487 | msg = packet_get_string(NULL); | 1487 | msg = packet_get_string(NULL); |
1488 | logit("Received disconnect from %s: %.400s", | 1488 | error("Received disconnect from %s: %.400s", |
1489 | get_remote_ipaddr(), msg); | 1489 | get_remote_ipaddr(), msg); |
1490 | cleanup_exit(255); | 1490 | cleanup_exit(255); |
1491 | break; | 1491 | break; |