Index: stable/11/etc/periodic/daily/450.status-security
===================================================================
--- stable/11/etc/periodic/daily/450.status-security	(revision 317553)
+++ stable/11/etc/periodic/daily/450.status-security	(revision 317554)
@@ -1,41 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 case "$daily_status_security_enable" in
     [Yy][Ee][Ss])
 	echo ""
 	echo "Security check:"
 
 	case "$daily_status_security_inline" in
 	    [Yy][Ee][Ss])
 		daily_status_security_output="";;
 	esac
 
 	export security_output="${daily_status_security_output}"
+	rc=0
 	case "${daily_status_security_output}" in
 	    "")
-		rc=3;;
+		if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+		then
+			periodic security > $tempfile || rc=3
+			if [ -s "$tempfile" ]; then
+				cat "$tempfile"
+				rc=3
+			fi
+			rm -f "$tempfile"
+		fi;;
 	    /*)
 		echo "    (output logged separately)"
-		rc=0;;
+		periodic security || rc=3;;
 	    *)
 		echo "    (output mailed separately)"
-		rc=0;;
-	esac
-
-	periodic security || rc=3;;
-
+		periodic security || rc=3;;
+	esac;;
     *)  rc=0;;
 esac
 
 exit $rc
Index: stable/11/etc/periodic/monthly/450.status-security
===================================================================
--- stable/11/etc/periodic/monthly/450.status-security	(revision 317553)
+++ stable/11/etc/periodic/monthly/450.status-security	(revision 317554)
@@ -1,41 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 case "$monthly_status_security_enable" in
     [Yy][Ee][Ss])
 	echo ""
 	echo "Security check:"
 
 	case "$monthly_status_security_inline" in
 	    [Yy][Ee][Ss])
 		monthly_status_security_output="";;
 	esac
 
 	export security_output="${monthly_status_security_output}"
+	rc=0
 	case "${monthly_status_security_output}" in
 	    "")
-		rc=3;;
+		if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+		then
+			periodic security > $tempfile || rc=3
+			if [ -s "$tempfile" ]; then
+				cat "$tempfile"
+				rc=3
+			fi
+			rm -f "$tempfile"
+		fi;;
 	    /*)
 		echo "    (output logged separately)"
-		rc=0;;
+		periodic security || rc=3;;
 	    *)
 		echo "    (output mailed separately)"
-		rc=0;;
-	esac
-
-	periodic security || rc=3;;
-
+		periodic security || rc=3;;
+	esac;;
     *)  rc=0;;
 esac
 
 exit $rc
Index: stable/11/etc/periodic/weekly/450.status-security
===================================================================
--- stable/11/etc/periodic/weekly/450.status-security	(revision 317553)
+++ stable/11/etc/periodic/weekly/450.status-security	(revision 317554)
@@ -1,41 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 case "$weekly_status_security_enable" in
     [Yy][Ee][Ss])
 	echo ""
 	echo "Security check:"
 
 	case "$weekly_status_security_inline" in
 	    [Yy][Ee][Ss])
 		weekly_status_security_output="";;
 	esac
 
 	export security_output="${weekly_status_security_output}"
+	rc=0
 	case "${weekly_status_security_output}" in
 	    "")
-		rc=3;;
+		if tempfile=`mktemp ${TMPDIR:-/tmp}/450.status-security.XXXXXX`
+		then
+			periodic security > $tempfile || rc=3
+			if [ -s "$tempfile" ]; then
+				cat "$tempfile"
+				rc=3
+			fi
+			rm -f "$tempfile"
+		fi;;
 	    /*)
 		echo "    (output logged separately)"
-		rc=0;;
+		periodic security || rc=3;;
 	    *)
 		echo "    (output mailed separately)"
-		rc=0;;
-	esac
-
-	periodic security || rc=3;;
-
+		periodic security || rc=3;;
+	esac;;
     *)  rc=0;;
 esac
 
 exit $rc
Index: stable/11
===================================================================
--- stable/11	(revision 317553)
+++ stable/11	(revision 317554)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r316548