svn commit: r315348 - stable/10/etc/periodic/security

[Ngie Cooper]

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>