Date: Fri, 28 Jun 2013 18:25:04 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252350 - stable/9/etc/periodic/daily Message-ID: <201306281825.r5SIP43f049658@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Fri Jun 28 18:25:04 2013 New Revision: 252350 URL: http://svnweb.freebsd.org/changeset/base/252350 Log: MFC 252205: If daily_status_security_inline is set, the rc value needs to be forced to 3 so that the output of this script is always displayed. In fact, setting this flag is identical to setting daily_status_security_output to an empty string. To make the logic less confusing, change the behavior of daily_status_security_inline such that it just forces daily_status_security_output to an empty string and then applies the normal logic. PR: conf/178611 Modified: stable/9/etc/periodic/daily/450.status-security Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/etc/periodic/daily/450.status-security ============================================================================== --- stable/9/etc/periodic/daily/450.status-security Fri Jun 28 18:07:41 2013 (r252349) +++ stable/9/etc/periodic/daily/450.status-security Fri Jun 28 18:25:04 2013 (r252350) @@ -18,19 +18,19 @@ case "$daily_status_security_enable" in case "$daily_status_security_inline" in [Yy][Ee][Ss]) - export security_output="";; + daily_status_security_output="";; + esac + + export security_output="${daily_status_security_output}" + case "${daily_status_security_output}" in + "") + rc=3;; + /*) + echo " (output logged separately)" + rc=0;; *) - export security_output="${daily_status_security_output}" - case "${daily_status_security_output}" in - "") - rc=3;; - /*) - echo " (output logged separately)" - rc=0;; - *) - echo " (output mailed separately)" - rc=0;; - esac;; + echo " (output mailed separately)" + rc=0;; esac periodic security || rc=3;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306281825.r5SIP43f049658>