refactor

[exim.git] / test / confs / 3403

diff --git a/test/confs/3403 b/test/confs/3403
index 79fb73fe1209e93814b72c822eacf5deaba525ae..327308591abb0dfa40f9e9ed1244c4a1f4fa2936 100644 (file)
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -7,7 +7,7 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept

-acl_smtp_data = accept add_header = :at_start:${authresults {$primary_hostname}}
+acl_smtp_data = check_data

 
 
 # ----- Authentication -----
 
 
 # ----- Authentication -----


@@ -27,6 +27,12 @@ plain1:
   server_mail_auth_condition = ${if eq{$authenticated_id}{userx}{yes}}
 
 
   server_mail_auth_condition = ${if eq{$authenticated_id}{userx}{yes}}
 
 

+# ----- ACL -----
+begin acl
+
+check_data:
+  accept add_header = :at_start:${authresults {$primary_hostname}}
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -34,6 +40,7 @@ begin routers
 d1:
   driver = accept
   headers_add = aid: $authenticated_id
 d1:
   driver = accept
   headers_add = aid: $authenticated_id

+  headers_add = rtr_authres: ${authresults {$primary_hostname}}

   retry_use_local_part
   transport = t1
 
   retry_use_local_part
   transport = t1
 


@@ -45,6 +52,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 # End
   user = CALLER
 
 # End