From owner-svn-src-all@FreeBSD.ORG  Wed May  4 12:48:03 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1FBEC106564A;
	Wed,  4 May 2011 12:48:03 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E6C88FC14;
	Wed,  4 May 2011 12:48:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p44Cm2lE050049;
	Wed, 4 May 2011 12:48:02 GMT (envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44Cm2Ni050047;
	Wed, 4 May 2011 12:48:02 GMT (envelope-from netchild@svn.freebsd.org)
Message-Id: <201105041248.p44Cm2Ni050047@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Wed, 4 May 2011 12:48:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221432 - head/etc/periodic/daily
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 12:48:03 -0000

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