diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-02-19 01:55:08 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-02-19 01:55:08 +0000 |
| commit | 2d064820ef6db1b6be5af0f464eefacbd1fdee14 (patch) | |
| tree | 48bdd4f75ca4fa124bd6413125c8088cc63efebe /etc/inc | |
| parent | 2ddf8c6e11e5316f0db5cb3f2f5a4347a99ec052 (diff) | |
| download | pfsense-2d064820ef6db1b6be5af0f464eefacbd1fdee14.zip pfsense-2d064820ef6db1b6be5af0f464eefacbd1fdee14.tar.gz | |
Backout my previous advice to CMB. It was grossly wrong.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 411cbb5..28eb61c 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -932,8 +932,13 @@ function filter_nat_rules_generate() { $natrules .= "\nno nat on \$wan to port tftp\n\n"; $natrules .= "\n# FTP Proxy/helper\n"; - /* get array of interfaces to work with */ - $iflist = get_interface_list(); + /* build an array of interfaces to work with */ + if($config['interfaces']['lan']) + $iflist = array("lan" => "LAN"); + else + $iflist = array(); + for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) + $iflist['opt' . $i] = "opt{$i}"; $interface_counter = 0; $vpns_list = get_vpns_list(); /* prevent 1:1 ips from ftp-proxy, they will be handled by ftp-sesame */ @@ -2682,7 +2687,12 @@ EOD; $extaddr = alias_expand($extaddr); if(!isset($config['system']['disablenatreflection'])) { - $iflist = get_interface_list(); + + /* if list */ + if($config['interfaces']['lan']) + $iflist = array("lan" => "LAN"); + else + $iflist = array(); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) $iflist['opt' . $i] = "opt{$i}"; @@ -3456,4 +3466,4 @@ function return_vpn_subnet($adr) { } -?>
\ No newline at end of file +?> |
