summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2009-05-22 09:55:18 +0000
committerErmal Luçi <eri@pfsense.org>2009-05-22 09:55:18 +0000
commit97edea16c28984e2444f0271655a7d6e43598264 (patch)
tree15a3eb24b28e3cd66cf04787834f825e61d10fcc /usr/local
parentb27f1caf39f866b30093d6cbb5ffbfb9434cfbef (diff)
downloadpfsense-97edea16c28984e2444f0271655a7d6e43598264.zip
pfsense-97edea16c28984e2444f0271655a7d6e43598264.tar.gz
Fix bridge checking missed in previous convert to multi interface capble CP. This is arguably needed since with new bridge the interface might be in full routing mode and be bridged just for SNAP port. Anyway people can run CP on top of the bridge interface itself anyway.
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/services_captiveportal.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index bc07fb2..f0d8b24 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -100,8 +100,9 @@ if ($_POST) {
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
/* make sure no interfaces are bridged */
- if (link_interface_to_bridge($pconfig['cinterface']))
- $input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged.";
+ foreach ($pconfig['cinterface'] as $cpbrif)
+ if (link_interface_to_bridge($cpbrif))
+ $input_errors[] = "The captive portal cannot be used on interface {$cpbrif} since it is part of a bridge.";
if ($_POST['httpslogin_enable']) {
if (!$_POST['cert'] || !$_POST['key']) {
OpenPOWER on IntegriCloud