git: ac339672fbb4 - stable/13 - periodic.conf: remove long deprecated security_daily_compat_var()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jun 2024 08:10:10 UTC
The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=ac339672fbb46b3beac5eeb339ed5a67910b3f58 commit ac339672fbb46b3beac5eeb339ed5a67910b3f58 Author: Michael Osipov <michaelo@FreeBSD.org> AuthorDate: 2024-04-15 11:05:17 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-06-05 08:08:28 +0000 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 (cherry picked from commit aa48259f337100e79933d660fec8856371f761ed) --- usr.sbin/periodic/etc/security/100.chksetuid | 2 -- usr.sbin/periodic/etc/security/110.neggrpperm | 2 -- usr.sbin/periodic/etc/security/200.chkmounts | 4 ---- usr.sbin/periodic/etc/security/300.chkuid0 | 2 -- usr.sbin/periodic/etc/security/400.passwdless | 2 -- usr.sbin/periodic/etc/security/410.logincheck | 2 -- usr.sbin/periodic/etc/security/500.ipfwdenied | 2 -- usr.sbin/periodic/etc/security/510.ipfdenied | 2 -- usr.sbin/periodic/etc/security/520.pfdenied | 2 -- usr.sbin/periodic/etc/security/550.ipfwlimit | 2 -- usr.sbin/periodic/etc/security/610.ipf6denied | 2 -- usr.sbin/periodic/etc/security/700.kernelmsg | 2 -- usr.sbin/periodic/etc/security/800.loginfail | 3 --- usr.sbin/periodic/etc/security/900.tcpwrap | 3 --- usr.sbin/periodic/etc/security/security.functions | 3 --- usr.sbin/periodic/periodic.conf | 22 ---------------------- 16 files changed, 57 deletions(-) diff --git a/usr.sbin/periodic/etc/security/100.chksetuid b/usr.sbin/periodic/etc/security/100.chksetuid index 071d296cdaff..6ade53a180be 100755 --- a/usr.sbin/periodic/etc/security/100.chksetuid +++ b/usr.sbin/periodic/etc/security/100.chksetuid @@ -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 diff --git a/usr.sbin/periodic/etc/security/110.neggrpperm b/usr.sbin/periodic/etc/security/110.neggrpperm index 6def25fc6a0e..41f2713533b0 100755 --- a/usr.sbin/periodic/etc/security/110.neggrpperm +++ b/usr.sbin/periodic/etc/security/110.neggrpperm @@ -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 diff --git a/usr.sbin/periodic/etc/security/200.chkmounts b/usr.sbin/periodic/etc/security/200.chkmounts index c6405bb86467..055cf256018a 100755 --- a/usr.sbin/periodic/etc/security/200.chkmounts +++ b/usr.sbin/periodic/etc/security/200.chkmounts @@ -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 diff --git a/usr.sbin/periodic/etc/security/300.chkuid0 b/usr.sbin/periodic/etc/security/300.chkuid0 index 121734357d06..c73980300d70 100755 --- a/usr.sbin/periodic/etc/security/300.chkuid0 +++ b/usr.sbin/periodic/etc/security/300.chkuid0 @@ -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 diff --git a/usr.sbin/periodic/etc/security/400.passwdless b/usr.sbin/periodic/etc/security/400.passwdless index 10a80ce43370..3e30e5e9cf5f 100755 --- a/usr.sbin/periodic/etc/security/400.passwdless +++ b/usr.sbin/periodic/etc/security/400.passwdless @@ -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 diff --git a/usr.sbin/periodic/etc/security/410.logincheck b/usr.sbin/periodic/etc/security/410.logincheck index 7e1ac5ec1b67..a3f3f3f1a21a 100755 --- a/usr.sbin/periodic/etc/security/410.logincheck +++ b/usr.sbin/periodic/etc/security/410.logincheck @@ -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 diff --git a/usr.sbin/periodic/etc/security/500.ipfwdenied b/usr.sbin/periodic/etc/security/500.ipfwdenied index f2a435711805..3ee7b3aa5cdc 100755 --- a/usr.sbin/periodic/etc/security/500.ipfwdenied +++ b/usr.sbin/periodic/etc/security/500.ipfwdenied @@ -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 diff --git a/usr.sbin/periodic/etc/security/510.ipfdenied b/usr.sbin/periodic/etc/security/510.ipfdenied index 3350bfd40fcf..b9f468fb96e5 100755 --- a/usr.sbin/periodic/etc/security/510.ipfdenied +++ b/usr.sbin/periodic/etc/security/510.ipfdenied @@ -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 diff --git a/usr.sbin/periodic/etc/security/520.pfdenied b/usr.sbin/periodic/etc/security/520.pfdenied index c295724d8949..13ed37b368d6 100755 --- a/usr.sbin/periodic/etc/security/520.pfdenied +++ b/usr.sbin/periodic/etc/security/520.pfdenied @@ -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 diff --git a/usr.sbin/periodic/etc/security/550.ipfwlimit b/usr.sbin/periodic/etc/security/550.ipfwlimit index 7b6f915a1ac5..8382c12df22f 100755 --- a/usr.sbin/periodic/etc/security/550.ipfwlimit +++ b/usr.sbin/periodic/etc/security/550.ipfwlimit @@ -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 diff --git a/usr.sbin/periodic/etc/security/610.ipf6denied b/usr.sbin/periodic/etc/security/610.ipf6denied index a7902e504baa..e1db7611557b 100755 --- a/usr.sbin/periodic/etc/security/610.ipf6denied +++ b/usr.sbin/periodic/etc/security/610.ipf6denied @@ -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 diff --git a/usr.sbin/periodic/etc/security/700.kernelmsg b/usr.sbin/periodic/etc/security/700.kernelmsg index cd4391aad98d..016bfbef36d0 100755 --- a/usr.sbin/periodic/etc/security/700.kernelmsg +++ b/usr.sbin/periodic/etc/security/700.kernelmsg @@ -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 diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index c5a3a972aaa1..19bf9a4b3b91 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -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 "` diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index 55fa58f4df39..bbbc04a03988 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -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 "` diff --git a/usr.sbin/periodic/etc/security/security.functions b/usr.sbin/periodic/etc/security/security.functions index aa19a99ebf87..c3ff6eb69391 100644 --- a/usr.sbin/periodic/etc/security/security.functions +++ b/usr.sbin/periodic/etc/security/security.functions @@ -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 # diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 9fc2ad3af0d0..088e3c612e70 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -342,28 +342,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