summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-04-23 15:21:39 +1000
committerDamien Miller <djm@mindrot.org>2013-04-23 15:21:39 +1000
commitd5edefd27a30768cc7a4817302e964b6cb2f9be7 (patch)
tree08bb89dcb2b23afdc5c54a4a6f1dea8fc71045e7
parent6901032b05291fc5d2bd4067fc47904de3506fda (diff)
- djm@cvs.openbsd.org 2013/04/11 02:27:50
[packet.c] quiet disconnect notifications on the server from error() back to logit() if it is a normal client closure; bz#2057 ok+feedback dtucker@
-rw-r--r--ChangeLog4
-rw-r--r--packet.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84a6ae38a..545a524b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@
46 - dtucker@cvs.openbsd.org 2013/04/07 09:40:27 46 - dtucker@cvs.openbsd.org 2013/04/07 09:40:27
47 [sshd.8] 47 [sshd.8]
48 clarify -e text. suggested by & ok jmc@ 48 clarify -e text. suggested by & ok jmc@
49 - djm@cvs.openbsd.org 2013/04/11 02:27:50
50 [packet.c]
51 quiet disconnect notifications on the server from error() back to logit()
52 if it is a normal client closure; bz#2057 ok+feedback dtucker@
49 53
5020130418 5420130418
51 - (djm) [config.guess config.sub] Update to last versions before they switch 55 - (djm) [config.guess config.sub] Update to last versions before they switch
diff --git a/packet.c b/packet.c
index 9326ddea6..3e835d360 100644
--- a/packet.c
+++ b/packet.c
@@ -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);