aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-20 17:46:43 -0200
committerRenato Botelho <renato@netgate.com>2015-10-20 17:46:43 -0200
commitae6ec4a94e14026c8169753addd83bcaee8c11c9 (patch)
tree9b548c5671988e144049fe7617bdf778133c1585
parentf6728f6b79f9f01cafab5af87f0762f8bbd1c045 (diff)
parent90b6ca93e0a11b4925935950997376b8ddd4a32e (diff)
downloadpfsense-packages-ae6ec4a94e14026c8169753addd83bcaee8c11c9.tar.gz
pfsense-packages-ae6ec4a94e14026c8169753addd83bcaee8c11c9.tar.bz2
pfsense-packages-ae6ec4a94e14026c8169753addd83bcaee8c11c9.zip
Merge pull request #1106 from doktornotor/patch-3
-rwxr-xr-xconfig/squid3/34/squid.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index 3dafded6..f4be3ee3 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -894,8 +894,8 @@ function squid_validate_nac($post, &$input_errors) {
$allowed_subnets = explode("\n", $post['allowed_subnets']);
foreach ($allowed_subnets as $subnet) {
$subnet = trim($subnet);
- if (!empty($subnet) && !is_subnet($subnet)) {
- $input_errors[] = "The subnet '$subnet' is not a valid CIDR range.";
+ if (!empty($subnet) && !is_subnet($subnet) && $subnet != "all") {
+ $input_errors[] = "'Allowed Subnets' must be a valid CIDR range or 'all'. The subnet '$subnet' is not valid.";
}
}