aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2013-04-14 13:06:07 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2013-04-14 13:06:07 +0000
commitf29b8a64d04e04f2ea3784f6033528cbdbaa00bf (patch)
treeeacbc125270b2d89dd048adc12aec26db766c2f4 /crypto
parentc3dbfb8dee94eea296499b08bf6b5564fed822bc (diff)
parentf74399985cb95da0afe370a71979d6c243038f32 (diff)
downloadsrc-f29b8a64d04e04f2ea3784f6033528cbdbaa00bf.tar.gz
src-f29b8a64d04e04f2ea3784f6033528cbdbaa00bf.zip
Silence "received disconnect" in the common case.
Notes
Notes: svn path=/head/; revision=249475
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/packet.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c
index b9bf9617c524..675f8cfa13b5 100644
--- a/crypto/openssh/packet.c
+++ b/crypto/openssh/packet.c
@@ -1465,7 +1465,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_DEBUG1 : SYSLOG_LEVEL_ERROR,
+ "Received disconnect from %s: %u: %.400s",
get_remote_ipaddr(), reason, msg);
xfree(msg);
cleanup_exit(255);
@@ -1490,7 +1494,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
break;
case SSH_MSG_DISCONNECT:
msg = packet_get_string(NULL);
- error("Received disconnect from %s: %.400s",
+ logit("Received disconnect from %s: %.400s",
get_remote_ipaddr(), msg);
cleanup_exit(255);
break;