Date: Wed, 4 May 2011 12:48:02 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221432 - head/etc/periodic/daily Message-ID: <201105041248.p44Cm2Ni050047@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Wed May 4 12:48:02 2011 New Revision: 221432 URL: http://svn.freebsd.org/changeset/base/221432 Log: 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 Modified: head/etc/periodic/daily/450.status-security Modified: head/etc/periodic/daily/450.status-security ============================================================================== --- head/etc/periodic/daily/450.status-security Wed May 4 12:44:46 2011 (r221431) +++ head/etc/periodic/daily/450.status-security Wed May 4 12:48:02 2011 (r221432) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105041248.p44Cm2Ni050047>