Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 0480

diff --git a/test/confs/0480 b/test/confs/0480
index 3308c0663bff6a39c06337188a8a705745affdf4..0c0f2ca11a76d3527db6738bffd9e339032a0ba4 100644 (file)
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -8,23 +8,23 @@ 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
+tls_advertise_hosts =
 
 # ----- 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}\
                        {\
-                       ${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}\
                          }}\