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
This commit is contained in:
jhb 2013-06-25 15:45:31 +00:00
parent 7dd11865c8
commit b29359892a

View File

@ -18,19 +18,19 @@ case "$daily_status_security_enable" in
case "$daily_status_security_inline" in case "$daily_status_security_inline" in
[Yy][Ee][Ss]) [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}" echo " (output mailed separately)"
case "${daily_status_security_output}" in rc=0;;
"")
rc=3;;
/*)
echo " (output logged separately)"
rc=0;;
*)
echo " (output mailed separately)"
rc=0;;
esac;;
esac esac
periodic security || rc=3;; periodic security || rc=3;;