aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2015-02-19 13:26:14 -0500
committerBBcan177 <bbcan177@gmail.com>2015-02-19 13:26:14 -0500
commiteeca7210dbc18f19ff8c267442b5b0642f4525a9 (patch)
tree8995f758e41c28b0d3dbfbcaf2bdbe36e14015c1
parentf3694e2170392cc89d14eabadfaded8ab7bca6d6 (diff)
downloadpfsense-packages-eeca7210dbc18f19ff8c267442b5b0642f4525a9.tar.gz
pfsense-packages-eeca7210dbc18f19ff8c267442b5b0642f4525a9.tar.bz2
pfsense-packages-eeca7210dbc18f19ff8c267442b5b0642f4525a9.zip
Revert "pfBlockerNG - Mod to IPv4 CIDR Regex"
This reverts commit e49ea2af46ed44cd955c1f4513b66ca984c2fc8a.
-rw-r--r--config/pfblockerng/pfblockerng.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index df546963..78622631 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -1189,7 +1189,7 @@ function sync_package_pfblockerng($cron = "") {
# IPv4 REGEX Definitions
$pfb['range'] = '/((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))-((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))/';
$pfb['block'] = '/(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[ 0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.([0]{1})\s+/';
- $pfb['cidr'] = '/((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)?\/([1-9]{1}|[12][0-9]|3[012]))$/';
+ $pfb['cidr'] = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)?\/[0-9]{2}/';
$pfb['single'] = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s+/';
$pfb['s_html'] = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/';