From owner-svn-src-all@freebsd.org  Fri Mar  3 14:25:56 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0897CF5675;
 Fri,  3 Mar 2017 14:25:56 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 800891CE3;
 Fri,  3 Mar 2017 14:25:56 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v23EPtoo012786;
 Fri, 3 Mar 2017 14:25:55 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v23EPtYG012785;
 Fri, 3 Mar 2017 14:25:55 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201703031425.v23EPtYG012785@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Fri, 3 Mar 2017 14:25:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314601 - head/crypto/openssh
X-SVN-Group: head
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Mar 2017 14:25:56 -0000

Author: des
Date: Fri Mar  3 14:25:55 2017
New Revision: 314601
URL: https://svnweb.freebsd.org/changeset/base/314601

Log:
  Re-apply part of r311585 which was inadvertantly reverted in the upgrade
  to 7.3p1.  The other part (which adds -DLIBWRAP to sshd's CFLAGS) is
  still in place.
  
  Reported by:	ngie

Modified:
  head/crypto/openssh/config.h

Modified: head/crypto/openssh/config.h
==============================================================================
--- head/crypto/openssh/config.h	Fri Mar  3 14:19:37 2017	(r314600)
+++ head/crypto/openssh/config.h	Fri Mar  3 14:25:55 2017	(r314601)
@@ -1438,7 +1438,7 @@
 /* #undef LASTLOG_WRITE_PUTUTXLINE */
 
 /* Define if you want TCP Wrappers support */
-#define LIBWRAP 1
+/* #undef LIBWRAP */
 
 /* Define to whatever link() returns for "not supported" if it doesn't return
    EOPNOTSUPP. */