From owner-svn-src-all@FreeBSD.ORG  Wed May 29 17:31:35 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 B9E978A8;
 Wed, 29 May 2013 17:31:35 +0000 (UTC)
 (envelope-from bdrewery@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 ABBEEAFD;
 Wed, 29 May 2013 17:31:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4THVZ9p076227;
 Wed, 29 May 2013 17:31:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4THVZWJ076226;
 Wed, 29 May 2013 17:31:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201305291731.r4THVZWJ076226@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 29 May 2013 17:31:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251106 - stable/8/crypto/openssh
X-SVN-Group: stable-8
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: Wed, 29 May 2013 17:31:35 -0000

Author: bdrewery (ports committer)
Date: Wed May 29 17:31:34 2013
New Revision: 251106
URL: http://svnweb.freebsd.org/changeset/base/251106

Log:
  MFH r250595:
    The HPN patch added a new BUG bit for SSH_BUG_LARGEWINDOW
    and the update to 6.1 added SSH_BUG_DYNAMIC_RPORT with the
    same value.
  
    Fix the HPN SSH_BUG_LARGEWINDOW bit so it is unique.

Modified:
  stable/8/crypto/openssh/compat.h
Directory Properties:
  stable/8/crypto/openssh/   (props changed)

Modified: stable/8/crypto/openssh/compat.h
==============================================================================
--- stable/8/crypto/openssh/compat.h	Wed May 29 17:04:43 2013	(r251105)
+++ stable/8/crypto/openssh/compat.h	Wed May 29 17:31:34 2013	(r251106)
@@ -60,7 +60,7 @@
 #define SSH_BUG_RFWD_ADDR	0x02000000
 #define SSH_NEW_OPENSSH		0x04000000
 #define SSH_BUG_DYNAMIC_RPORT	0x08000000
-#define SSH_BUG_LARGEWINDOW	0x08000000
+#define SSH_BUG_LARGEWINDOW	0x10000000
 
 void     enable_compat13(void);
 void     enable_compat20(void);