summaryrefslogtreecommitdiffstats
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-04-23 07:21:39 +0200
committerDamien Miller <djm@mindrot.org>2013-04-23 07:21:39 +0200
commitd5edefd27a30768cc7a4817302e964b6cb2f9be7 (patch)
tree08bb89dcb2b23afdc5c54a4a6f1dea8fc71045e7 /packet.c
parent - dtucker@cvs.openbsd.org 2013/04/07 09:40:27 (diff)
downloadopenssh-d5edefd27a30768cc7a4817302e964b6cb2f9be7.tar.xz
openssh-d5edefd27a30768cc7a4817302e964b6cb2f9be7.zip
- 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@
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 9326ddea6..3e835d360 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1460,7 +1460,11 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
case SSH2_MSG_DISCONNECT:
reason = packet_get_int();
msg = packet_get_string(NULL);
- error("Received disconnect from %s: %u: %.400s",
+ /* Ignore normal client exit notifications */
+ do_log2(active_state->server_side &&
+ reason == SSH2_DISCONNECT_BY_APPLICATION ?
+ SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR,
+ "Received disconnect from %s: %u: %.400s",
get_remote_ipaddr(), reason, msg);
xfree(msg);
cleanup_exit(255);