From nobody Wed Jun 05 08:07:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VvKn15FKvz5MK8h; Wed, 05 Jun 2024 08:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VvKn14lDzz4CXL; Wed, 5 Jun 2024 08:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717574821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVWMYtbH1zspukkXQDTv6bljVXTEDWRl+fSkd8TwQok=; b=rWk+dj7Tfx5rMx2wWyWnClfZ5IgjGw7DOBSKObCYOPZ9eO469jF+EtQtmO/sddpcHQWke4 cK566FTvPThPavgOj1ld4FS1rufivGph+c6iMpi8fzx95Wb+CkhTS2Dc8fMSUpelGvguyQ XAh/NljpYHkI8ip/3ylBvAUnLFUVd6M0H86IYESLkJublmv73e9G7H1OSTcp4CCCiVm7j1 MyyPJqomkHOg/QBDNWgOT0fOeJS1UPZzZtMNROc6dyyzQeJ8JGdMYRVSZct7hT+38EGDB4 q+kyWPgXfr0aTNHHuOPjiiGSB6QjWMdhoZR+HhgnCIfiZ6OSprWArSp/KO7Wyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717574821; a=rsa-sha256; cv=none; b=vG81XNZI+sMEV463Rk+TDByveZc1HL1Im4/gNY/a4hvxkGQ/D+4tRSTWFYz1ciO7UDwdRy S/igyBj1vcove1StBpu/sc6oP2geyuUzeM3M2FhlOT83k+iaByGzMkQQhTAoXSsSAYfUKn 0vXpPuiY2tGb6g1OS8UvZlidp+2Z+gKtvfEgcotntuJ5lHWnclifiUFBTPS8DcO43EqlTR FHUUWYq7xYovDMqj1151u9/a9KS1LT06zt86k3A3KQaua+qqxcdZg4ya6nvq2jylytR6Vv Ie4GxhfDN0hEIqpnRvEgW1ThAh0rDjE21DDGTmunvAOOGJSyvWe2nEj5I3MFhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717574821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVWMYtbH1zspukkXQDTv6bljVXTEDWRl+fSkd8TwQok=; b=vYx19GHaF6JwMZr47xlBdbGok5D9/gO2ZzH7MRy8B4IlMSeZ7Fze7eDm8KqNVf3019iUYP 6jIe4UBnFJ1vClvCIzfSL8gfBvpJrpXPnkASYfbMXHO7ig+KTqgM7Uc0SjQBmwMgQmB41z ccV1EY3niyOEDGE/idMfX1UWyHwlzMiz+YO1zdu9oP3W7BlHuHdPGtBX/n+RcyR2MaFeym WSkG7ujmfgu4gD+u6xRkiypAbuO/jQH0ozSNJUOROQS7J9+J7KiJRl9ARNJ1RXHvvX0g4c W2MlBSAgjL0yLgbQkjTIBGdB7V7YiuC6UbJDzdZ2XJiYhuh3aXUaTcjO+N92sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VvKn14L6kztlL; Wed, 5 Jun 2024 08:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 455871We091770; Wed, 5 Jun 2024 08:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455871md091767; Wed, 5 Jun 2024 08:07:01 GMT (envelope-from git) Date: Wed, 5 Jun 2024 08:07:01 GMT Message-Id: <202406050807.455871md091767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 0e0919db966a - stable/14 - periodic.conf: remove long deprecated security_daily_compat_var() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e0919db966a83efc696d19b39a5962500e6ad46 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0919db966a83efc696d19b39a5962500e6ad46 commit 0e0919db966a83efc696d19b39a5962500e6ad46 Author: Michael Osipov AuthorDate: 2024-04-15 11:05:17 +0000 Commit: Michael Osipov CommitDate: 2024-06-05 08:05:54 +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 6af474712d6f..9852936257bc 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 608a199b3cc9..3bb34d827564 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -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