diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
commit | 328b60656f29db6306994d7498dede386ec2d1c3 (patch) | |
tree | 7d3a4fd1eb06c355e7122b89b408b51b0b9b6c9b /packet.c | |
parent | 91c1846f2f94bc944f5e8f53b9903cb59ca42adc (diff) | |
parent | 79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff) |
merge 6.2p2
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 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,11 @@ 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 | error("Received disconnect from %s: %u: %.400s", | 1463 | /* Ignore normal client exit notifications */ |
1464 | do_log2(active_state->server_side && | ||
1465 | reason == SSH2_DISCONNECT_BY_APPLICATION ? | ||
1466 | SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR, | ||
1467 | "Received disconnect from %s: %u: %.400s", | ||
1464 | get_remote_ipaddr(), reason, msg); | 1468 | get_remote_ipaddr(), reason, msg); |
1465 | xfree(msg); | 1469 | xfree(msg); |
1466 | cleanup_exit(255); | 1470 | cleanup_exit(255); |