Author: ngie
Date: Thu Mar 16 01:48:08 2017
New Revision: 315347
URL: https://svnweb.freebsd.org/changeset/base/315347

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/11/etc/periodic/security/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/periodic/security/Makefile
==============================================================================
--- stable/11/etc/periodic/security/Makefile    Thu Mar 16 01:47:26 2017        
(r315346)
+++ stable/11/etc/periodic/security/Makefile    Thu Mar 16 01:48:08 2017        
(r315347)
@@ -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
@@ -31,4 +30,8 @@ FILES+=       500.ipfwdenied \
 FILES+=        520.pfdenied
 .endif
 
+.if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
+FILES+=        900.tcpwrap
+.endif
+
 .include <bsd.prog.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to