svn commit: r249475 - head/crypto/openssh

Dag-Erling Smørgrav des at FreeBSD.org
Sun Apr 14 13:06:08 UTC 2013


Author: des
Date: Sun Apr 14 13:06:07 2013
New Revision: 249475
URL: http://svnweb.freebsd.org/changeset/base/249475

Log:
  Silence "received disconnect" in the common case.

Modified:
  head/crypto/openssh/packet.c
Directory Properties:
  head/crypto/openssh/   (props changed)

Modified: head/crypto/openssh/packet.c
==============================================================================
--- head/crypto/openssh/packet.c	Sun Apr 14 12:55:39 2013	(r249474)
+++ head/crypto/openssh/packet.c	Sun Apr 14 13:06:07 2013	(r249475)
@@ -1465,7 +1465,11 @@ packet_read_poll_seqnr(u_int32_t *seqnr_
 			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_
 				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;


More information about the svn-src-all mailing list