diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-09-30 18:11:04 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-09-30 18:12:38 -0500 |
| commit | 701f5caa9721b067a40048bca38dcdb0b071b932 (patch) | |
| tree | c8587be234e4238058294104b49fb0d11d17cd3b /src/etc/inc/captiveportal.inc | |
| parent | 0403236d5d667627aca3f097c90ab43c0716522f (diff) | |
| download | pfsense-701f5caa9721b067a40048bca38dcdb0b071b932.zip pfsense-701f5caa9721b067a40048bca38dcdb0b071b932.tar.gz | |
Can't use continue here as it continues the foreach, which skips the "ipfw zone" command, breaking CP for any system that doesn't have VIPs defined.
Diffstat (limited to 'src/etc/inc/captiveportal.inc')
| -rw-r--r-- | src/etc/inc/captiveportal.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index e95cc75..ad33603 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -500,12 +500,11 @@ function captiveportal_init_rules($reinit = false) { $cpipm = get_interface_ip($cpifgrp); if (is_ipaddr($cpipm)) { $cpips[] = $cpipm; - if (!is_array($config['virtualip']) || !is_array($config['virtualip']['vip'])) { - continue; - } - foreach ($config['virtualip']['vip'] as $vip) { - if (($vip['interface'] == $cpifgrp) && (($vip['mode'] == "carp") || ($vip['mode'] == "ipalias"))) { - $cpips[] = $vip['subnet']; + if (is_array($config['virtualip']) || is_array($config['virtualip']['vip'])) { + foreach ($config['virtualip']['vip'] as $vip) { + if (($vip['interface'] == $cpifgrp) && (($vip['mode'] == "carp") || ($vip['mode'] == "ipalias"))) { + $cpips[] = $vip['subnet']; + } } } } |
