diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-07-09 16:09:05 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-07-09 16:09:05 +0000 |
| commit | a9e486854c0d4ff0c5f23193ecf6980f9955a9e8 (patch) | |
| tree | 3cc9233729ffb50e921cd34a2dfcad8c4fd9bd4b /etc/inc/filter.inc | |
| parent | 748225fa92963aaa99b3974fc8d722e6121b6146 (diff) | |
| download | pfsense-a9e486854c0d4ff0c5f23193ecf6980f9955a9e8.zip pfsense-a9e486854c0d4ff0c5f23193ecf6980f9955a9e8.tar.gz | |
Fixup for now utterly complex/braindead interface finding for user rules till the
merge of the RELENG_1_MULTI_ANYTHING happens.
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 23db733..a037c2f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1711,7 +1711,8 @@ function generate_user_filter_rule($rule, $ngcounter) { // translate wan, man, lan, opt to real interface. $interface = $rule['interface']; $temp = filter_get_opt_interface_descr($interface); - if($temp <> "") $interface = $temp; + if($temp <> "" && $interface != "lan" && $interface != "wan") + $interface = $temp; if(isset($rule['destination']['address'])) { $canadd = 0; // XXX: billm - eh? this is a nice little noop /* because pf will not allow a interface for proxyARP @@ -1721,7 +1722,7 @@ function generate_user_filter_rule($rule, $ngcounter) { $canadd = 0; } if($canadd == 0 && !isset($rule['floating'])) - $aline['interface'] = "on \$" . convert_real_interface_to_friendly_descr($rule['interface']) . " "; + $aline['interface'] = "on \$" . $interface . " "; } |
