summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2011-05-04 12:48:02 +0000
committernetchild <netchild@FreeBSD.org>2011-05-04 12:48:02 +0000
commitfe5d0c873aedc5923ff92390dc6d20f06e747396 (patch)
treec3e7275305a75e949cf3f1bddf579b202fcf07f7
parentba47b21115dfb5e5bdb6c1b75fe3ce743385aac4 (diff)
downloadFreeBSD-src-fe5d0c873aedc5923ff92390dc6d20f06e747396.zip
FreeBSD-src-fe5d0c873aedc5923ff92390dc6d20f06e747396.tar.gz
The security run requests unmaskable output, even if the only output is to
tell that there is a separate email or that the output is logged to a file. This commit changes the return code for the non-inline case to tell that this message is not important enough and can be masked if necessary. The messages from the security checks themself are not affected by this and show up as before in the periodic security email/file. The inline case still requests to not mask the output, as with the current way of handling this there is no easy way to handle this. PR: 138692 Analysis/patch atch by: Chris Cowart <ccowart@timesinks.net> X-MFC after: on request
-rwxr-xr-xetc/periodic/daily/450.status-security11
1 files changed, 6 insertions, 5 deletions
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index c0eb46c..362bf3d 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -23,16 +23,17 @@ case "$daily_status_security_enable" in
export security_output="${daily_status_security_output}"
case "${daily_status_security_output}" in
"")
- ;;
+ rc=3;;
/*)
- echo " (output logged separately)";;
+ echo " (output logged separately)"
+ rc=0;;
*)
- echo " (output mailed separately)";;
+ echo " (output mailed separately)"
+ rc=0;;
esac;;
esac
- periodic security
- rc=3;;
+ periodic security || rc=3;;
*) rc=0;;
esac
OpenPOWER on IntegriCloud