diff options
| author | jhb <jhb@FreeBSD.org> | 2013-06-25 15:45:31 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-06-25 15:45:31 +0000 |
| commit | b29359892ac52ab49c49c6c28c886afd659a2d4c (patch) | |
| tree | 64b3a3b65f39930a1d159bb51fb910f3380a158a /etc | |
| parent | 7dd11865c800b2dbc490ecc012380fd19dc63d93 (diff) | |
| download | FreeBSD-src-b29359892ac52ab49c49c6c28c886afd659a2d4c.zip FreeBSD-src-b29359892ac52ab49c49c6c28c886afd659a2d4c.tar.gz | |
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
Submitted by: Jason Unovitch <jason.unovitch@gmail.com>
MFC after: 3 days
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/periodic/daily/450.status-security | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security index 362bf3d..38a1c3c 100755 --- a/etc/periodic/daily/450.status-security +++ b/etc/periodic/daily/450.status-security @@ -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;; |
