diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-08-31 14:27:08 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-08-31 14:27:08 +0000 |
| commit | 14e58758bbcc3a257f2fc7c5a02ecede21fb1e59 (patch) | |
| tree | f6e65609f32af05926844f77b0405dc0960ea351 /etc | |
| parent | 63182e6083d1a920248120a3b9fbd7eeafc39460 (diff) | |
| download | pfsense-14e58758bbcc3a257f2fc7c5a02ecede21fb1e59.zip pfsense-14e58758bbcc3a257f2fc7c5a02ecede21fb1e59.tar.gz | |
Fix detection if an interface is part of bridge up to date.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 487f9d7..2f370b2 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -432,6 +432,7 @@ function generate_optcfg_array() $oic['alias-subnet'] = $oc['alias-subnet']; $oic['gateway'] = $oc['gateway']; $oic['spoofcheck'] = "yes"; + $oic['bridge'] = link_int_to_bridge_interface($if); $FilterIflist[$if] = $oic; } @@ -2167,8 +2168,7 @@ EOD; break; default: /* allow access to DHCP server on interfaces */ - if (isset($config['dhcpd'][$on]['enable']) && (!$oc['bridge']) || - ($oc['bridge'] && isset($config['dhcpd'][$oc['bridge']]['enable']))) { + if (isset($config['dhcpd'][$on]['enable']) && empty($oc['bridge'])) { $ipfrules .= <<<EOD # allow access to DHCP server on {$oc['descr']} anchor "dhcpserver{$oc['descr']}" |
