aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-10-19 01:03:38 +0200
committerdoktornotor <notordoktor@gmail.com>2015-10-19 01:03:38 +0200
commit90b6ca93e0a11b4925935950997376b8ddd4a32e (patch)
tree9b548c5671988e144049fe7617bdf778133c1585
parentf6728f6b79f9f01cafab5af87f0762f8bbd1c045 (diff)
downloadpfsense-packages-90b6ca93e0a11b4925935950997376b8ddd4a32e.tar.gz
pfsense-packages-90b6ca93e0a11b4925935950997376b8ddd4a32e.tar.bz2
pfsense-packages-90b6ca93e0a11b4925935950997376b8ddd4a32e.zip
Accept "all" in 'Allowed Subnets' (Bug #4525)
-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.";
}
}