From nobody@FreeBSD.org  Tue May 14 04:38:09 2013
Return-Path: <nobody@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 8638CEA7
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 14 May 2013 04:38:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.FreeBSD.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AB98FE3
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 14 May 2013 04:38:09 +0000 (UTC)
Received: from oldred.FreeBSD.org ([127.0.1.6])
	by oldred.FreeBSD.org (8.14.5/8.14.5) with ESMTP id r4E4c8c9077195
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 14 May 2013 04:38:08 GMT
	(envelope-from nobody@oldred.FreeBSD.org)
Received: (from nobody@localhost)
	by oldred.FreeBSD.org (8.14.5/8.14.5/Submit) id r4E4c8r8077194;
	Tue, 14 May 2013 04:38:08 GMT
	(envelope-from nobody)
Message-Id: <201305140438.r4E4c8r8077194@oldred.FreeBSD.org>
Date: Tue, 14 May 2013 04:38:08 GMT
From: Jason Unovitch <jason.unovitch@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] daily_status_security_inline broken in 450.status-security
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         178611
>Category:       conf
>Synopsis:       [patch] daily_status_security_inline broken in 450.status-security
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 04:40:00 UTC 2013
>Closed-Date:    Fri Jun 28 18:25:24 UTC 2013
>Last-Modified:  Fri Jun 28 18:30:00 UTC 2013
>Originator:     Jason Unovitch
>Release:        FreeBSD 9.1-RELEASE
>Organization:
N/A
>Environment:
FreeBSD xts-bsd 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64

# $FreeBSD: release/9.1.0/etc/periodic/daily/450.status-security 221432 2011-05-04 12:48:02Z netchild $
>Description:
The current /etc/periodic/daily/450.status-security combines two 'case' statements together resulting in the second case statement being passed when daily_status_security_inline="YES".  When daily_show_success="NO" this will also result in the security report vanishing rather than showing up as intended by the "") rc=3;; statement in the script.

See discussion here for more details and a more detailed breakdown.
http://forums.freebsd.org/showthread.php?t=39113
>How-To-Repeat:
echo 'daily_show_success="NO"' >> /etc/periodic.conf
echo 'daily_status_security_inline="YES"' >> /etc/periodic.conf
periodic daily
>Fix:
Apply attached patch file or update as follows.


#!/bin/sh
#
# $FreeBSD: release/9.1.0/etc/periodic/daily/450.status-security 221432 2011-05-04 12:48:02Z netchild $
#

# 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])
                export security_output="";;
            *)
                export security_output="${daily_status_security_output}";;
        esac

        case "$security_output" in
            "")
                rc=3;;
            /*)
                echo "    (output logged separately)"
                rc=0;;
            *)
                echo "    (output mailed separately)"
                rc=0;;
        esac

        periodic security || rc=3;;

    *)  rc=0;;
esac

Patch attached with submission follows:

--- /root/450.status-security.20130508	2013-05-09 06:09:24.000000000 +0000
+++ /etc/periodic/daily/450.status-security	2013-05-12 05:09:34.000000000 +0000
@@ -20,17 +20,18 @@
 	    [Yy][Ee][Ss])
 		export security_output="";;
 	    *)
-		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;;
+		export security_output="${daily_status_security_output}";;
+	esac
+
+	case "$security_output" in
+	    "")
+		rc=3;;
+	    /*)
+		echo "    (output logged separately)"
+		rc=0;;
+	    *)
+		echo "    (output mailed separately)"
+		rc=0;;
 	esac
 
 	periodic security || rc=3;;


>Release-Note:
>Audit-Trail:

From: Jason Unovitch <jason.unovitch@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: conf/178611: [patch] daily_status_security_inline broken in
 450.status-security
Date: Tue, 14 May 2013 04:38:08 GMT

 >Number:         178611
 >Category:       conf
 >Synopsis:       [patch] daily_status_security_inline broken in 450.status-security
 >Confidential:   no
 >Severity:       non-critical
 >Priority:       low
 >Responsible:    freebsd-bugs
 >State:          open
 >Quarter:        
 >Keywords:       
 >Date-Required:
 >Class:          sw-bug
 >Submitter-Id:   current-users
 >Arrival-Date:   Tue May 14 04:40:00 UTC 2013
 >Closed-Date:
 >Last-Modified:
 >Originator:     Jason Unovitch
 >Release:        FreeBSD 9.1-RELEASE
 >Organization:
 N/A
 >Environment:
 FreeBSD xts-bsd 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
 
 # $FreeBSD: release/9.1.0/etc/periodic/daily/450.status-security 221432 2011-05-04 12:48:02Z netchild $
 >Description:
 The current /etc/periodic/daily/450.status-security combines two 'case' statements together resulting in the second case statement being passed when daily_status_security_inline="YES".  When daily_show_success="NO" this will also result in the security report vanishing rather than showing up as intended by the "") rc=3;; statement in the script.
 
 See discussion here for more details and a more detailed breakdown.
 http://forums.freebsd.org/showthread.php?t=39113
 >How-To-Repeat:
 echo 'daily_show_success="NO"' >> /etc/periodic.conf
 echo 'daily_status_security_inline="YES"' >> /etc/periodic.conf
 periodic daily
 >Fix:
 Apply attached patch file or update as follows.
 
 
 #!/bin/sh
 #
 # $FreeBSD: release/9.1.0/etc/periodic/daily/450.status-security 221432 2011-05-04 12:48:02Z netchild $
 #
 
 # 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])
                 export security_output="";;
             *)
                 export security_output="${daily_status_security_output}";;
         esac
 
         case "$security_output" in
             "")
                 rc=3;;
             /*)
                 echo "    (output logged separately)"
                 rc=0;;
             *)
                 echo "    (output mailed separately)"
                 rc=0;;
         esac
 
         periodic security || rc=3;;
 
     *)  rc=0;;
 esac
 
 Patch attached with submission follows:
 
 --- /root/450.status-security.20130508	2013-05-09 06:09:24.000000000 +0000
 +++ /etc/periodic/daily/450.status-security	2013-05-12 05:09:34.000000000 +0000
 @@ -20,17 +20,18 @@
  	    [Yy][Ee][Ss])
  		export security_output="";;
  	    *)
 -		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;;
 +		export security_output="${daily_status_security_output}";;
 +	esac
 +
 +	case "$security_output" in
 +	    "")
 +		rc=3;;
 +	    /*)
 +		echo "    (output logged separately)"
 +		rc=0;;
 +	    *)
 +		echo "    (output mailed separately)"
 +		rc=0;;
  	esac
  
  	periodic security || rc=3;;
 
 
 >Release-Note:
 >Audit-Trail:
 >Unformatted:
 _______________________________________________
 freebsd-bugs@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
 To unsubscribe, send any mail to "freebsd-bugs-unsubscribe@freebsd.org"

From: Jason Unovitch <jason.unovitch@gmail.com>
To: bug-followup@FreeBSD.org, freebsd-current@FreeBSD.org
Cc:  
Subject: Re: conf/178611: [patch] daily_status_security_inline broken in 450.status-security
Date: Fri, 21 Jun 2013 17:35:14 -0400

 This is a cryptographically signed message in MIME format.
 
 --------------ms020204030502020003020606
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: quoted-printable
 
 All,
 I'd like to add some additional detail for=20
 /etc/periodic/daily/450.status-security not working properly in all use=20
 cases in PR conf/178611.  After looking a bit closer at other versions,=20
 I noticed that FreeBSD 10-CURRENT is also affected along with the=20
 9.1-RELEASE that I use and mentioned in the PR.  Both versions can be=20
 fixed up the the patch in the PR.  The latest 8.4-RELEASE still uses the =
 
 old way of doing things with an explict "rc=3D3" statement at the end so =
 
 that output never gets masked.
 
 Best regards,
 Jason Unovitch
 
 
 --------------ms020204030502020003020606
 Content-Type: application/pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIKVDCC
 BRowggQCoAMCAQICEG0Z6qcZT2ozIuYiMnqqcd4wDQYJKoZIhvcNAQEFBQAwga4xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAcBgNVBAoT
 FVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2VydHJ1c3Qu
 Y29tMTYwNAYDVQQDEy1VVE4tVVNFUkZpcnN0LUNsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQg
 RW1haWwwHhcNMTEwNDI4MDAwMDAwWhcNMjAwNTMwMTA0ODM4WjCBkzELMAkGA1UEBhMCR0Ix
 GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
 ChMRQ09NT0RPIENBIExpbWl0ZWQxOTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGlj
 YXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBAJKEhFtLV5jUXi+LpOFAyKNTWF9mZfEyTvefMn1V0HhMVbdClOD5J3EHxcZppLkyxPFA
 GpDMJ1Zifxe1cWmu5SAb5MtjXmDKokH2auGj/7jfH0htZUOMKi4rYzh337EXrMLaggLW1DJq
 1GdvIBOPXDX65VSAr9hxCh03CgJQU2yVHakQFLSZlVkSMf8JotJM3FLb3uJAAVtIaN3FSrTg
 7SQfOq9xXwfjrL8UO7AlcWg99A/WF1hGFYE8aIuLgw9teiFX5jSw2zJ+40rhpVJyZCaRTqWS
 D//gsWD9Gm9oUZljjRqLpcxCm5t9ImPTqaD8zp6Q30QZ9FxbNboW86eb/8ECAwEAAaOCAUsw
 ggFHMB8GA1UdIwQYMBaAFImCZ33EnSZwAEu0UEh83j2uBG59MB0GA1UdDgQWBBR6E04AdFvG
 eGNkJ8Ev4qBbvHnFezAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADARBgNV
 HSAECjAIMAYGBFUdIAAwWAYDVR0fBFEwTzBNoEugSYZHaHR0cDovL2NybC51c2VydHJ1c3Qu
 Y29tL1VUTi1VU0VSRmlyc3QtQ2xpZW50QXV0aGVudGljYXRpb25hbmRFbWFpbC5jcmwwdAYI
 KwYBBQUHAQEEaDBmMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVRO
 QWRkVHJ1c3RDbGllbnRfQ0EuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1
 c3QuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQCF1r54V1VtM39EUv5C1QaoAQOAivsNsv1Kv/av
 QUn1G1rF0q0bc24+6SZ85kyYwTAo38v7QjyhJT4KddbQPTmGZtGhm7VNm2+vKGwdr+XqdFqo
 2rHA8XV6L566k3nK/uKRHlZ0sviN0+BDchvtj/1gOSBH+4uvOmVIPJg9pSW/ve9g4EnlFsjr
 P0OD8ODuDcHTzTNfm9C9YGqzO/761Mk6PB/tm/+bSTO+Qik5g+4zaS6CnUVNqGnagBsePdIa
 XXxHmaWbCG0SmYbWXVcHG6cwvktJRLiQfsrReTjrtDP6oDpdJlieYVUYtCHVmdXgQ0BCML7q
 peeU0rD+83X5f27nMIIFMjCCBBqgAwIBAgIRANpYFAa4K3v/RFGj7CcJ1kowDQYJKoZIhvcN
 AQEFBQAwgZMxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTkwNwYDVQQDEzBD
 T01PRE8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EwHhcNMTMw
 NTI4MDAwMDAwWhcNMTQwNTI4MjM1OTU5WjApMScwJQYJKoZIhvcNAQkBFhhqYXNvbi51bm92
 aXRjaEBnbWFpbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyPmlErSTr
 hOKET4lTn5vhwjPW3yF8UdzLFZC1GJNB2kz3D43AehkoWniMxJPdWeZJPvlswX7j7GJEIlB7
 x+HjlmFRF9khFMNWOuz2KbBsv2J7EjMepI9XKtLStJ2L4KNS37xM9hConf5gowPG5fJUk4+b
 Et2cZTXi8h3FkPr8kS6aFNN7JOaVnbOdTFicMIzN8B65lOrE1nk393x5975R1quaVM/lopgZ
 ukGW768uwb/hnc3inIshgJ2KSvVe+L7jTa0TfcHeoLsAebZzN0MDO5s9fgHfv33TMk+hMxf3
 NwRJVGdVq/wNixL9VsFzJ+dPifQ8ENWDqsbxy6aggwwhAgMBAAGjggHoMIIB5DAfBgNVHSME
 GDAWgBR6E04AdFvGeGNkJ8Ev4qBbvHnFezAdBgNVHQ4EFgQU7MgMQO0VsBYBsYVXsVKy4bhx
 +2UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwIAYDVR0lBBkwFwYIKwYBBQUHAwQG
 CysGAQQBsjEBAwUCMBEGCWCGSAGG+EIBAQQEAwIFIDBGBgNVHSAEPzA9MDsGDCsGAQQBsjEB
 AgEBATArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzBXBgNV
 HR8EUDBOMEygSqBIhkZodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DbGllbnRBdXRo
 ZW50aWNhdGlvbmFuZFNlY3VyZUVtYWlsQ0EuY3JsMIGIBggrBgEFBQcBAQR8MHowUgYIKwYB
 BQUHMAKGRmh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0NsaWVudEF1dGhlbnRpY2F0
 aW9uYW5kU2VjdXJlRW1haWxDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
 b2NhLmNvbTAjBgNVHREEHDAagRhqYXNvbi51bm92aXRjaEBnbWFpbC5jb20wDQYJKoZIhvcN
 AQEFBQADggEBAHkDqUErHcIxgm2GQtFY7ccGNwG4DmqisSfsEdA/E8LSPRGLVrDek40TiCfR
 2Sz9C/j+y+RIUFPySQGEspkFdmTJaVlMCDoOnZvVLUKcQmq3Ju3zpn6ODt/y+wBnKFDGqEtx
 60QGUt5RZN/Yk/xopoOh2COybLu+aM/ZdAof/BYR4xywhKo9YzV/+3QK0sN6YBZkh7K6H/GD
 q+eayU1D5YyLPw0LkGPnMb1nsxJ4fAZtMgvzg2RAfbxTmWfe6MpR6V4vZzuSev0evtCV/8zi
 STS5LUqaEhYdzdDNwdk44VaF7kYNKLg44xO6aWO1iGp5TqCcJ0tw/Aq4/zLNWI8cVJ0xggQc
 MIIEGAIBATCBqTCBkzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3Rl
 cjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxOTA3BgNV
 BAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQIR
 ANpYFAa4K3v/RFGj7CcJ1kowCQYFKw4DAhoFAKCCAkcwGAYJKoZIhvcNAQkDMQsGCSqGSIb3
 DQEHATAcBgkqhkiG9w0BCQUxDxcNMTMwNjIxMjEzNTE0WjAjBgkqhkiG9w0BCQQxFgQUk85u
 Qo7PaomOuPwD0VwUaxMC/kIwbAYJKoZIhvcNAQkPMV8wXTALBglghkgBZQMEASowCwYJYIZI
 AWUDBAECMAoGCCqGSIb3DQMHMA4GCCqGSIb3DQMCAgIAgDANBggqhkiG9w0DAgIBQDAHBgUr
 DgMCBzANBggqhkiG9w0DAgIBKDCBugYJKwYBBAGCNxAEMYGsMIGpMIGTMQswCQYDVQQGEwJH
 QjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYD
 VQQKExFDT01PRE8gQ0EgTGltaXRlZDE5MDcGA1UEAxMwQ09NT0RPIENsaWVudCBBdXRoZW50
 aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENBAhEA2lgUBrgre/9EUaPsJwnWSjCBvAYLKoZI
 hvcNAQkQAgsxgayggakwgZMxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNo
 ZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTkw
 NwYDVQQDEzBDT01PRE8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwg
 Q0ECEQDaWBQGuCt7/0RRo+wnCdZKMA0GCSqGSIb3DQEBAQUABIIBAC3XqMIpOnMmsZKcEiGN
 eWvSdmpOZnOLNhXOB3M1khiTs1Jk84Lg1M0Y6NcsxYFY64s8AT3sjZ7qfFYEnyrg+X9vZvIw
 u+vTBuid6SblOLKhREjHNd7ZBraUKipJQaovBspj46+CynLRhI8pVWimc0axqqvJucwazWVa
 SC3CsbgkSzBywTPAXFBSBtnky5jaWEUFE4It9FOYByvRtHE8RbIK2tWss59jeBxerZNWsQRc
 1e4dYceTFyp2fPgy5qANv/2YiiP1dP5d2v8BRWO4LWjVOVlW8wsPpIoXxFb5+lPnSjrZUfvC
 1C7UNY/9FA12Ou2Ii7zHNpxGg1L0/wbZZPoAAAAAAAA=
 --------------ms020204030502020003020606--
State-Changed-From-To: open->patched 
State-Changed-By: jhb 
State-Changed-When: Tue Jun 25 15:45:42 UTC 2013 
State-Changed-Why:  
Variant committed to HEAD, take this for the MFC reminder.  Thanks! 


Responsible-Changed-From-To: freebsd-bugs->jhb 
Responsible-Changed-By: jhb 
Responsible-Changed-When: Tue Jun 25 15:45:42 UTC 2013 
Responsible-Changed-Why:  
Variant committed to HEAD, take this for the MFC reminder.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178611 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/178611: commit references a PR
Date: Tue, 25 Jun 2013 15:45:39 +0000 (UTC)

 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;;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: jhb 
State-Changed-When: Fri Jun 28 18:25:12 UTC 2013 
State-Changed-Why:  
Merged to 9. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178611 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/178611: commit references a PR
Date: Fri, 28 Jun 2013 18:25:17 +0000 (UTC)

 Author: jhb
 Date: Fri Jun 28 18:25:04 2013
 New Revision: 252350
 URL: http://svnweb.freebsd.org/changeset/base/252350
 
 Log:
   MFC 252205:
   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
 
 Modified:
   stable/9/etc/periodic/daily/450.status-security
 Directory Properties:
   stable/9/etc/   (props changed)
 
 Modified: stable/9/etc/periodic/daily/450.status-security
 ==============================================================================
 --- stable/9/etc/periodic/daily/450.status-security	Fri Jun 28 18:07:41 2013	(r252349)
 +++ stable/9/etc/periodic/daily/450.status-security	Fri Jun 28 18:25:04 2013	(r252350)
 @@ -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;;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
