diff options
author | jim-p <jimp@pfsense.org> | 2011-06-21 08:12:12 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-06-21 08:12:12 -0400 |
commit | c7bb0eeda4498e9310a5e2b765947f876afddf72 (patch) | |
tree | 8395e4a5b60dff7a2a3a576ddeb39ce8eb09a2e6 /etc/inc/util.inc | |
parent | ffdcbeb67b3b8bea0e381e9d969fb4743eff7754 (diff) | |
parent | 7cca77de28652ca92a901be6da2e8ad86259ce16 (diff) | |
download | pfsense-c7bb0eeda4498e9310a5e2b765947f876afddf72.zip pfsense-c7bb0eeda4498e9310a5e2b765947f876afddf72.tar.gz |
Merge remote branch 'upstream/master'
Conflicts:
etc/version
Diffstat (limited to 'etc/inc/util.inc')
-rw-r--r-- | etc/inc/util.inc | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 258700c..f5b74b5 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1327,29 +1327,30 @@ function is_interface_vlan_mismatch() { } function is_interface_mismatch() { - global $config, $g; + global $config, $g; - /* XXX: Should we process only enabled interfaces?! */ - $do_assign = false; - $i = 0; + $do_assign = false; + $i = 0; if (is_array($config['interfaces'])) { - foreach ($config['interfaces'] as $ifname => $ifcfg) { - if (preg_match("/^enc|^cua|^tun|^l2tp|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) { - $i++; - } - else if (does_interface_exist($ifcfg['if']) == false) { + foreach ($config['interfaces'] as $ifname => $ifcfg) { + if (preg_match("/^enc|^cua|^tun|^l2tp|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) { + // Do not check these interfaces. + $i++; + continue; + } + else if (does_interface_exist($ifcfg['if']) == false) { $do_assign = true; - } else - $i++; - } + } else + $i++; + } } - if ($g['minimum_nic_count'] > $i) { - $do_assign = true; - } else if (file_exists("{$g['tmp_path']}/assign_complete")) - $do_assign = false; + if ($g['minimum_nic_count'] > $i) { + $do_assign = true; + } else if (file_exists("{$g['tmp_path']}/assign_complete")) + $do_assign = false; - return $do_assign; + return $do_assign; } /* sync carp entries to other firewalls */ |