DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / confs / 4056

diff --git a/test/confs/4056 b/test/confs/4056
index c77c439e4760247930ec3ca6cee9d252c1692655..d736bf62e9f680eecb9d01d6797f466b45c06c3a 100644 (file)
--- a/test/confs/4056
+++ b/test/confs/4056
@@ -1,6 +1,8 @@
 # test config 4056
 # Early-pipe, AUTH (no TLS!)
 
 # test config 4056
 # Early-pipe, AUTH (no TLS!)
 

+AA = yes
+

 keep_environment = PATH
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 keep_environment = PATH
 exim_path = EXIM_PATH
 host_lookup_order = bydns


@@ -18,6 +20,10 @@ dns_cname_loops = 9
 chunking_advertise_hosts =
 tls_advertise_hosts =
 
 chunking_advertise_hosts =
 tls_advertise_hosts =
 

+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+

 pipelining_connect_advertise_hosts = *
 auth_advertise_hosts = *
 log_selector = +pipelining
 pipelining_connect_advertise_hosts = *
 auth_advertise_hosts = *
 log_selector = +pipelining


@@ -44,6 +50,7 @@ begin transports
 
 smtp:
   driver =             smtp
 
 smtp:
   driver =             smtp

+  hosts_try_fastopen = :

   hosts_pipe_connect = *
   hosts_require_auth = *
 
   hosts_pipe_connect = *
   hosts_require_auth = *
 


@@ -54,9 +61,17 @@ plain:
   driver = plaintext
   public_name = PLAIN
 
   driver = plaintext
   public_name = PLAIN
 

+  server_advertise_condition = AA

   server_condition = "\
     ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}"
   server_set_id = $auth2
 
   client_send =        ^userx^secret
 
   server_condition = "\
     ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}"
   server_set_id = $auth2
 
   client_send =        ^userx^secret
 

+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,10s
+