Backout my previous advice to CMB. It was grossly wrong.

This commit is contained in:
Scott Ullrich 2008-02-19 01:55:08 +00:00
parent 2ddf8c6e11
commit 2d064820ef

View File

@ -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) {
}
?>
?>