From owner-svn-src-stable@freebsd.org  Wed Dec 23 21:57:27 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A59C7A508D7;
 Wed, 23 Dec 2015 21:57:27 +0000 (UTC)
 (envelope-from lidl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 744E31649;
 Wed, 23 Dec 2015 21:57:27 +0000 (UTC)
 (envelope-from lidl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNLvQrO090536;
 Wed, 23 Dec 2015 21:57:26 GMT (envelope-from lidl@FreeBSD.org)
Received: (from lidl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNLvQMv090535;
 Wed, 23 Dec 2015 21:57:26 GMT (envelope-from lidl@FreeBSD.org)
Message-Id: <201512232157.tBNLvQMv090535@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lidl set sender to
 lidl@FreeBSD.org using -f
From: Kurt Lidl <lidl@FreeBSD.org>
Date: Wed, 23 Dec 2015 21:57:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292672 - stable/10/etc/periodic/security
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 21:57:27 -0000

Author: lidl
Date: Wed Dec 23 21:57:26 2015
New Revision: 292672
URL: https://svnweb.freebsd.org/changeset/base/292672

Log:
  MFC r290405:
  
  Restrict 520.pfdenied to only list rules that blocked traffic.
  Before this change, the 520.pfdenied script listed all rules that
  matched /^block/ in the rule. Restrict the printed output to only
  those rules that result in packets being dropped.
  
  Approved by:	rpaulo (mentor)

Modified:
  stable/10/etc/periodic/security/520.pfdenied
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/periodic/security/520.pfdenied
==============================================================================
--- stable/10/etc/periodic/security/520.pfdenied	Wed Dec 23 21:55:54 2015	(r292671)
+++ stable/10/etc/periodic/security/520.pfdenied	Wed Dec 23 21:57:26 2015	(r292672)
@@ -44,7 +44,7 @@ rc=0
 if check_yesno_period security_status_pfdenied_enable
 then
 	TMP=`mktemp -t security`
-	if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then
+	if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then
 	  check_diff new_only pf ${TMP} "${host} pf denied packets:"
 	fi
 	rc=$?