summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2015-10-19 09:24:10 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2015-10-19 10:01:54 -0500
commit42d59a5da504e4e7f8914ae63968c1871ad33014 (patch)
tree2c3861cc81843da78d07434453cb6151a62b85df /src
parent02570c3f093140e038452c7c58c202913b6b3858 (diff)
downloadpfsense-42d59a5da504e4e7f8914ae63968c1871ad33014.zip
pfsense-42d59a5da504e4e7f8914ae63968c1871ad33014.tar.gz
Fix the captive portal rules after 98bf4991dc31f97fc7315a6b8aba433de9d39cea.
The malformed rules breaks the parsing of initialisation rules. Issue: #4746
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/captiveportal.inc14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index f6bbb64..59ca4ae 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -545,19 +545,13 @@ EOD;
$rulenum++;
$cprules .= "add {$rulenum} pass ip from table(100) to any out\n";
$rulenum++;
- $ips = "";
- foreach ($cpips as $cpip) {
+ foreach ($cpips as $cpip)
$cprules .= "table 100 add {$cpip}\n";
- }
- $cprules .= "table 100 add 255.255.255.255\n";
- $cprules .= "add {$rulenum} pass ip from any to {$ips} in\n";
- $rulenum++;
- $cprules .= "add {$rulenum} pass ip from {$ips} to any out\n";
+ $cprules .= "add {$rulenum} pass ip from any to 255.255.255.255 in\n";
$rulenum++;
- $cprules .= "add {$rulenum} pass icmp from {$ips} to any out icmptype 0\n";
- $rulenum++;
- $cprules .= "add {$rulenum} pass icmp from any to {$ips} in icmptype 8 \n";
+ $cprules .= "add {$rulenum} pass ip from 255.255.255.255 to any out\n";
$rulenum++;
+
/* Allowed ips */
$cprules .= "add {$rulenum} pipe tablearg ip from table(3) to any in\n";
$rulenum++;
OpenPOWER on IntegriCloud