From 652b8ce06130ab0896227167e8a813faa3996442 Mon Sep 17 00:00:00 2001 From: Seth Mos Date: Sun, 4 Mar 2007 11:24:24 +0000 Subject: I forgot, the ftp helpers on releng_1 are started from config.inc not pfsense-utils.inc (head) --- etc/inc/config.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'etc/inc/config.inc') diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 4645d3a..75cf7a0 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1558,7 +1558,9 @@ function system_start_ftp_helpers() { /* grab the current interface IP address */ $int = convert_friendly_interface_to_real_interface_name($ifname); $ip = find_interface_ip($int); - if(isset($config['nat']['advancedoutbound']['enable'])) { + /* are we in routed mode? no source nat rules and not a outside interface? */ + /* If we have advanced outbound nat we skip the FTP proxy, we use ftpsesame */ + if((isset($config['nat']['advancedoutbound']['enable'])) && (! interface_has_gateway($ifname))) { $sourcenat = 0; /* we are using advanced outbound nat, are we in routing mode? */ /* if the interface address lies within a outbound NAT source network we should skip */ -- cgit v1.1