From 3b1f00f56509708d5369b82a81c95e507f5938e0 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Tue, 9 Dec 2014 22:53:13 -0500 Subject: Mods to SH Script - Remove part of the suppression as it was added to the PHP function in pfblockerng.inc (IPv4 Filter Array) --- config/pfblockerng/pfblockerng.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/pfblockerng/pfblockerng.sh') diff --git a/config/pfblockerng/pfblockerng.sh b/config/pfblockerng/pfblockerng.sh index 2f622153..c09d52e1 100644 --- a/config/pfblockerng/pfblockerng.sh +++ b/config/pfblockerng/pfblockerng.sh @@ -283,7 +283,7 @@ if [ -e "$pfbsuppression" ] && [ -s "$pfbsuppression" ]; then # Count (PRE) countg=$(grep -c ^ $pfbfolder$alias".txt") - grep -Ev "^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|127\.0\.0\.1|0\.0\.0\.0|#|$)" $pfbfolder$alias".txt" | + grep -Ev "^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|#|$)" $pfbfolder$alias".txt" | sort | uniq > $tempfile # Count (Post RFC1918) countm=$(grep -c ^ $tempfile) @@ -350,7 +350,7 @@ else if [ ! "$alias" == "" ]; then countg=$(grep -c ^ $pfbfolder$alias".txt") - grep -Ev "^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|127\.0\.0\.1|0\.0\.0\.0|#|$)" $pfbfolder$alias".txt" | + grep -Ev "^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|#|$)" $pfbfolder$alias".txt" | sort | uniq > $tempfile; mv -f $tempfile $pfbfolder$alias".txt" countx=$(grep -c ^ $pfbfolder$alias".txt") # Update Masterfiles. Don't execute if Duplication Process is Disabled or if No Suppression Changes Found -- cgit v1.2.3