Page MenuHomeFreeBSD
Files F115840809

D44796.diff
No OneTemporary
Actions

D44796.diff
View Options

diff --git a/usr.sbin/periodic/etc/security/100.chksetuid b/usr.sbin/periodic/etc/security/100.chksetuid
--- a/usr.sbin/periodic/etc/security/100.chksetuid
+++ b/usr.sbin/periodic/etc/security/100.chksetuid
@@ -36,8 +36,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_chksetuid_enable
-
rc=0
if check_yesno_period security_status_chksetuid_enable
diff --git a/usr.sbin/periodic/etc/security/110.neggrpperm b/usr.sbin/periodic/etc/security/110.neggrpperm
--- a/usr.sbin/periodic/etc/security/110.neggrpperm
+++ b/usr.sbin/periodic/etc/security/110.neggrpperm
@@ -34,8 +34,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_neggrpperm_enable
-
rc=0
if check_yesno_period security_status_neggrpperm_enable
diff --git a/usr.sbin/periodic/etc/security/200.chkmounts b/usr.sbin/periodic/etc/security/200.chkmounts
--- a/usr.sbin/periodic/etc/security/200.chkmounts
+++ b/usr.sbin/periodic/etc/security/200.chkmounts
@@ -39,10 +39,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_chkmounts_enable
-security_daily_compat_var security_status_chkmounts_ignore
-security_daily_compat_var security_status_noamd
-
ignore="${security_status_chkmounts_ignore}"
rc=0
diff --git a/usr.sbin/periodic/etc/security/300.chkuid0 b/usr.sbin/periodic/etc/security/300.chkuid0
--- a/usr.sbin/periodic/etc/security/300.chkuid0
+++ b/usr.sbin/periodic/etc/security/300.chkuid0
@@ -35,8 +35,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_chkuid0_enable
-
rc=0
if check_yesno_period security_status_chkuid0_enable
diff --git a/usr.sbin/periodic/etc/security/400.passwdless b/usr.sbin/periodic/etc/security/400.passwdless
--- a/usr.sbin/periodic/etc/security/400.passwdless
+++ b/usr.sbin/periodic/etc/security/400.passwdless
@@ -34,8 +34,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_passwdless_enable
-
rc=0
if check_yesno_period security_status_passwdless_enable
diff --git a/usr.sbin/periodic/etc/security/410.logincheck b/usr.sbin/periodic/etc/security/410.logincheck
--- a/usr.sbin/periodic/etc/security/410.logincheck
+++ b/usr.sbin/periodic/etc/security/410.logincheck
@@ -34,8 +34,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_logincheck_enable
-
rc=0
if check_yesno_period security_status_logincheck_enable
diff --git a/usr.sbin/periodic/etc/security/500.ipfwdenied b/usr.sbin/periodic/etc/security/500.ipfwdenied
--- a/usr.sbin/periodic/etc/security/500.ipfwdenied
+++ b/usr.sbin/periodic/etc/security/500.ipfwdenied
@@ -36,8 +36,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_ipfwdenied_enable
-
rc=0
if check_yesno_period security_status_ipfwdenied_enable
diff --git a/usr.sbin/periodic/etc/security/510.ipfdenied b/usr.sbin/periodic/etc/security/510.ipfdenied
--- a/usr.sbin/periodic/etc/security/510.ipfdenied
+++ b/usr.sbin/periodic/etc/security/510.ipfdenied
@@ -36,8 +36,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_ipfdenied_enable
-
rc=0
if check_yesno_period security_status_ipfdenied_enable
diff --git a/usr.sbin/periodic/etc/security/520.pfdenied b/usr.sbin/periodic/etc/security/520.pfdenied
--- a/usr.sbin/periodic/etc/security/520.pfdenied
+++ b/usr.sbin/periodic/etc/security/520.pfdenied
@@ -36,8 +36,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_pfdenied_enable
-
rc=0
if check_yesno_period security_status_pfdenied_enable
diff --git a/usr.sbin/periodic/etc/security/550.ipfwlimit b/usr.sbin/periodic/etc/security/550.ipfwlimit
--- a/usr.sbin/periodic/etc/security/550.ipfwlimit
+++ b/usr.sbin/periodic/etc/security/550.ipfwlimit
@@ -37,8 +37,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_ipfwlimit_enable
-
rc=0
if check_yesno_period security_status_ipfwlimit_enable
diff --git a/usr.sbin/periodic/etc/security/610.ipf6denied b/usr.sbin/periodic/etc/security/610.ipf6denied
--- a/usr.sbin/periodic/etc/security/610.ipf6denied
+++ b/usr.sbin/periodic/etc/security/610.ipf6denied
@@ -36,8 +36,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_ipf6denied_enable
-
rc=0
if check_yesno_period security_status_ipf6denied_enable
diff --git a/usr.sbin/periodic/etc/security/700.kernelmsg b/usr.sbin/periodic/etc/security/700.kernelmsg
--- a/usr.sbin/periodic/etc/security/700.kernelmsg
+++ b/usr.sbin/periodic/etc/security/700.kernelmsg
@@ -39,8 +39,6 @@
. /etc/periodic/security/security.functions
-security_daily_compat_var security_status_kernelmsg_enable
-
rc=0
if check_yesno_period security_status_kernelmsg_enable
diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail
--- a/usr.sbin/periodic/etc/security/800.loginfail
+++ b/usr.sbin/periodic/etc/security/800.loginfail
@@ -37,9 +37,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_logdir
-security_daily_compat_var security_status_loginfail_enable
-
LOG="${security_status_logdir}"
yesterday=`date -v-1d "+%b %e "`
diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap
--- a/usr.sbin/periodic/etc/security/900.tcpwrap
+++ b/usr.sbin/periodic/etc/security/900.tcpwrap
@@ -37,9 +37,6 @@
source_periodic_confs
fi
-security_daily_compat_var security_status_logdir
-security_daily_compat_var security_status_tcpwrap_enable
-
LOG="${security_status_logdir}"
yesterday=`date -v-1d "+%b %e "`
diff --git a/usr.sbin/periodic/etc/security/security.functions b/usr.sbin/periodic/etc/security/security.functions
--- a/usr.sbin/periodic/etc/security/security.functions
+++ b/usr.sbin/periodic/etc/security/security.functions
@@ -31,9 +31,6 @@
*/security.functions) exit 0 ;;
esac
-security_daily_compat_var security_status_logdir
-security_daily_compat_var security_status_diff_flags
-
#
# Show differences in the output of an audit command
#
diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf
--- a/usr.sbin/periodic/periodic.conf
+++ b/usr.sbin/periodic/periodic.conf
@@ -345,28 +345,6 @@
fi
}
- # Compatibility with old daily variable names.
- # They can be removed in stable/11.
- security_daily_compat_var() {
- local var=$1 dailyvar value
-
- dailyvar=daily_status_security${var#security_status}
- periodvar=${var%enable}period
- eval value=\"\$$dailyvar\"
- [ -z "$value" ] && return
- echo "Warning: Variable \$$dailyvar is deprecated," \
- "use \$$var instead." >&2
- case "$value" in
- [Yy][Ee][Ss])
- eval $var=YES
- eval $periodvar=daily
- ;;
- *)
- eval $var=\"$value\"
- ;;
- esac
- }
-
check_yesno_period() {
local var="$1" periodvar value period

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 10:07 AM (19 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17855848
Default Alt Text
D44796.diff (6 KB)

Event Timeline