mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
periodic.conf: remove long deprecated security_daily_compat_var()
This function is documented to be gone in after 11. Time to remove this compat shim. PR: 275296 Reviewed by: jrm (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D44796
This commit is contained in:
Michael Osipov
parent
a8089ea5ae
commit
aa48259f33
|
|
@ -36,8 +36,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_chksetuid_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_chksetuid_enable
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ then
|
|||
source_periodic_confs
|
||||
fi
|
||||
|
||||
security_daily_compat_var security_status_neggrpperm_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_neggrpperm_enable
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@ fi
|
|||
|
||||
. /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
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@ then
|
|||
source_periodic_confs
|
||||
fi
|
||||
|
||||
security_daily_compat_var security_status_chkuid0_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_chkuid0_enable
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ then
|
|||
source_periodic_confs
|
||||
fi
|
||||
|
||||
security_daily_compat_var security_status_passwdless_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_passwdless_enable
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ then
|
|||
source_periodic_confs
|
||||
fi
|
||||
|
||||
security_daily_compat_var security_status_logincheck_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_logincheck_enable
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_ipfwdenied_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_ipfwdenied_enable
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_ipfdenied_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_ipfdenied_enable
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_pfdenied_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_pfdenied_enable
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@ then
|
|||
source_periodic_confs
|
||||
fi
|
||||
|
||||
security_daily_compat_var security_status_ipfwlimit_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_ipfwlimit_enable
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_ipf6denied_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_ipf6denied_enable
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ fi
|
|||
|
||||
. /etc/periodic/security/security.functions
|
||||
|
||||
security_daily_compat_var security_status_kernelmsg_enable
|
||||
|
||||
rc=0
|
||||
|
||||
if check_yesno_period security_status_kernelmsg_enable
|
||||
|
|
|
|||
|
|
@ -37,9 +37,6 @@ then
|
|||
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 "`
|
||||
|
|
|
|||
|
|
@ -37,9 +37,6 @@ then
|
|||
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 "`
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@ case "$0" in
|
|||
*/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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -345,28 +345,6 @@ if [ -z "${source_periodic_confs_defined}" ]; then
|
|||
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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue