aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2014-12-09 22:53:13 -0500
committerBBcan177 <bbcan177@gmail.com>2014-12-09 22:53:13 -0500
commit3b1f00f56509708d5369b82a81c95e507f5938e0 (patch)
tree29e3190b474d1d4a430bf6d5deaf20e0c8e3ed63
parent1e090c32020a4d219bc4f72bc6f32f08a67be3ca (diff)
downloadpfsense-packages-3b1f00f56509708d5369b82a81c95e507f5938e0.tar.gz
pfsense-packages-3b1f00f56509708d5369b82a81c95e507f5938e0.tar.bz2
pfsense-packages-3b1f00f56509708d5369b82a81c95e507f5938e0.zip
Mods to SH Script
- Remove part of the suppression as it was added to the PHP function in pfblockerng.inc (IPv4 Filter Array)
-rw-r--r--config/pfblockerng/pfblockerng.sh4
1 files changed, 2 insertions, 2 deletions
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