From owner-svn-src-all@FreeBSD.ORG  Sun Apr 14 12:55:40 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 46857B7E;
 Sun, 14 Apr 2013 12:55:40 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 37371E80;
 Sun, 14 Apr 2013 12:55:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3ECtd2j080105;
 Sun, 14 Apr 2013 12:55:39 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3ECtdgg080104;
 Sun, 14 Apr 2013 12:55:39 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201304141255.r3ECtdgg080104@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sun, 14 Apr 2013 12:55:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r249474 - vendor-crypto/openssh/dist
X-SVN-Group: vendor-crypto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Apr 2013 12:55:40 -0000

Author: des
Date: Sun Apr 14 12:55:39 2013
New Revision: 249474
URL: http://svnweb.freebsd.org/changeset/base/249474

Log:
  Apply a patch from OpenSSH bugzilla #2057 to silence "received disconnect"
  errors in the common case (i.e. client intentionally disconnected).

Modified:
  vendor-crypto/openssh/dist/packet.c

Modified: vendor-crypto/openssh/dist/packet.c
==============================================================================
--- vendor-crypto/openssh/dist/packet.c	Sun Apr 14 12:20:13 2013	(r249473)
+++ vendor-crypto/openssh/dist/packet.c	Sun Apr 14 12:55:39 2013	(r249474)
@@ -1460,7 +1460,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);