From owner-svn-src-stable@freebsd.org  Thu Mar 16 01:50:12 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 6E233D0C5BA;
 Thu, 16 Mar 2017 01:50:12 +0000 (UTC)
 (envelope-from ngie@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 3D72C1433;
 Thu, 16 Mar 2017 01:50:12 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2G1oB8a062930;
 Thu, 16 Mar 2017 01:50:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2G1oBcb062929;
 Thu, 16 Mar 2017 01:50:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703160150.v2G1oBcb062929@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 16 Mar 2017 01:50:11 +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: r315348 - stable/10/etc/periodic/security
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Mar 2017 01:50:12 -0000

Author: ngie
Date: Thu Mar 16 01:50:11 2017
New Revision: 315348
URL: https://svnweb.freebsd.org/changeset/base/315348

Log:
  MFC r314895:
  
  Only install 900.tcpwrap if MK_INETD != "no" and MK_TCP_WRAPPERS != "no"
  
  It relies on output from inetd that is triggered by MK_TCP_WRAPPERS=yes.
  
  We need to check for both knobs being set -- otherwise the script doesn't
  have much value.
  
  PR:		217577

Modified:
  stable/10/etc/periodic/security/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/periodic/security/Makefile
==============================================================================
--- stable/10/etc/periodic/security/Makefile	Thu Mar 16 01:48:08 2017	(r315347)
+++ stable/10/etc/periodic/security/Makefile	Thu Mar 16 01:50:11 2017	(r315348)
@@ -11,8 +11,7 @@ FILES=	100.chksetuid \
 	400.passwdless \
 	410.logincheck \
 	700.kernelmsg \
-	800.loginfail \
-	900.tcpwrap
+	800.loginfail
 DATA=	security.functions
 
 # NB: keep these sorted by MK_* knobs
@@ -35,4 +34,8 @@ FILES+=	520.pfdenied
 FILES+=	460.chkportsum
 .endif
 
+.if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
+FILES+=	900.tcpwrap
+.endif
+
 .include <bsd.prog.mk>