From owner-svn-src-all@FreeBSD.ORG  Thu Apr 23 15:19:57 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D0F7BF26;
 Thu, 23 Apr 2015 15:19:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE1CF1B6C;
 Thu, 23 Apr 2015 15:19:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NFJvLf022643;
 Thu, 23 Apr 2015 15:19:57 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NFJv3e022642;
 Thu, 23 Apr 2015 15:19:57 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201504231519.t3NFJv3e022642@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 23 Apr 2015 15:19:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281893 - stable/10/crypto/openssh
X-SVN-Group: stable-10
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.20
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: Thu, 23 Apr 2015 15:19:57 -0000

Author: bdrewery
Date: Thu Apr 23 15:19:56 2015
New Revision: 281893
URL: https://svnweb.freebsd.org/changeset/base/281893

Log:
  MFC r280999:
  
    Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.

Modified:
  stable/10/crypto/openssh/clientloop.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/crypto/openssh/clientloop.c
==============================================================================
--- stable/10/crypto/openssh/clientloop.c	Thu Apr 23 15:18:43 2015	(r281892)
+++ stable/10/crypto/openssh/clientloop.c	Thu Apr 23 15:19:56 2015	(r281893)
@@ -1922,7 +1922,7 @@ client_request_agent(const char *request
 	if (options.hpn_disabled)
 		c = channel_new("authentication agent connection",
 		    SSH_CHANNEL_OPEN, sock, sock, -1,
-		    CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
+		    CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
 		    "authentication agent connection", 1);
 	else
 		c = channel_new("authentication agent connection",