Fix "-bP smtp_receive_timeout". Bug 2384

[exim.git] / test / confs / 0480

diff --git a/test/confs/0480 b/test/confs/0480
index 3308c0663bff6a39c06337188a8a705745affdf4..6c2b688ecac33cbb84b3e4246af9d2bd6fe95c34 100644 (file)
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -6,25 +6,20 @@ IP3=V4NET.0.0.3
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 

-smtp_active_hostname = ${if eq{$interface_address}{IP1}\
+smtp_active_hostname = ${if eq{$received_ip_address}{IP1}\

                        {host.IP1}\
                        {\
                        {host.IP1}\
                        {\

-                       ${if eq{$interface_address}{IP2}\
+                       ${if eq{$received_ip_address}{IP2}\

                          {}\
                          {\
                          {}\
                          {\

-                         ${if eq{$interface_address}{IP3}\
+                         ${if eq{$received_ip_address}{IP3}\

                            {${lookup{x}lsearch{/non/exist}}}\
                            fail}\
                          }}\
                            {${lookup{x}lsearch{/non/exist}}}\
                            fail}\
                          }}\