From 00ff22e1308ef704fdb175ce0d657a02d0e389f6 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 16 Mar 2017 01:50:11 +0000 Subject: [PATCH] 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 --- etc/periodic/security/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile index 954becb36175..3b618624189d 100644 --- a/etc/periodic/security/Makefile +++ b/etc/periodic/security/Makefile @@ -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