diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-16 09:13:15 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-16 09:13:15 -0300 |
| commit | 0f8ae70920f0247dfcff94bcb658e45074afccc4 (patch) | |
| tree | 9cb8584fac1c721e68847305960ad26c0173ef33 /etc/inc/util.inc | |
| parent | e96d2182cddab944ecc6de439d81ad95ca09ac62 (diff) | |
| parent | 67299a3fe75dbe7802d7d3f81f3da59f2608b686 (diff) | |
| download | pfsense-0f8ae70920f0247dfcff94bcb658e45074afccc4.zip pfsense-0f8ae70920f0247dfcff94bcb658e45074afccc4.tar.gz | |
Merge remote branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 922eb5e..8632540 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1192,7 +1192,7 @@ function is_interface_mismatch() { $do_assign = false; $i = 0; foreach ($config['interfaces'] as $ifname => $ifcfg) { - if (preg_match("/^enc|^cua|^tun|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) { + 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) { @@ -1431,4 +1431,4 @@ function array_merge_recursive_unique($array0, $array1) return $result; } -?>
\ No newline at end of file +?> |
