From owner-svn-src-head@FreeBSD.ORG  Tue Jun 25 15:45:32 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2BC67464;
 Tue, 25 Jun 2013 15:45:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1EAA01386;
 Tue, 25 Jun 2013 15:45:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PFjWHw054620;
 Tue, 25 Jun 2013 15:45:32 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5PFjVdd054619;
 Tue, 25 Jun 2013 15:45:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306251545.r5PFjVdd054619@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 25 Jun 2013 15:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252205 - head/etc/periodic/daily
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jun 2013 15:45:32 -0000

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@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;;