aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2013-06-25 15:45:31 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2013-06-25 15:45:31 +0000
commitd58802817b1ed51398fd9b784c8cd79908e217ae (patch)
tree64b3a3b65f39930a1d159bb51fb910f3380a158a
parent1a5fc4190d960b780e6b8bae0829ff9f922db745 (diff)
downloadsrc-d58802817b1ed51398fd9b784c8cd79908e217ae.tar.gz
src-d58802817b1ed51398fd9b784c8cd79908e217ae.zip
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
Notes
Notes: svn path=/head/; revision=252205
-rwxr-xr-xetc/periodic/daily/450.status-security24
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index 362bf3d59243..38a1c3c9e909 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;;