svn commit: r252205 - head/etc/periodic/daily

[John Baldwin]

Author: jhb
Date: Tue Jun 25 15:45:31 2013
New Revision: 252205
URL: http://svnweb.freebsd.org/changeset/base/252205

Log:
  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 at gmail.com>
  MFC after:	3 days

Modified:
  head/etc/periodic/daily/450.status-security

Modified: head/etc/periodic/daily/450.status-security
==============================================================================
--- head/etc/periodic/daily/450.status-security	Tue Jun 25 10:50:17 2013	(r252204)
+++ head/etc/periodic/daily/450.status-security	Tue Jun 25 15:45:31 2013	(r252205)
@@ -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;;