DANE: Fix 2 messages from queue case

[users/heiko/exim.git] / test / confs / 0024

diff --git a/test/confs/0024 b/test/confs/0024
index 0d55784237d50100a2e459da35af520076e1ea3b..fac5e12a5c5b6bdbb6f29235351ab0a34bea5e84 100644 (file)
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,13 +1,8 @@
 # Exim test configuration 0024
 
 # Exim test configuration 0024
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -32,6 +27,10 @@ acl_rcpt:
 
   require verify        = sender
 
 
   require verify        = sender
 

+  deny   domains       = +local_domains
+         local_parts   = ^[.] : ^.*[@%!/|]
+         message       = Restricted characters in address
+

   deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
           dnslists      = rbl.test.ex
 
   deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
           dnslists      = rbl.test.ex
 


@@ -64,6 +63,11 @@ r1:
   transport = dev_null
   no_more
 
   transport = dev_null
   no_more
 

+redir:
+  driver =     redirect
+  local_parts =        føø
+  data =       userx
+

 r2:
   driver = accept
   local_parts = userx : postmaster
 r2:
   driver = accept
   local_parts = userx : postmaster


@@ -82,7 +86,7 @@ dev_null:
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 # End
   user = CALLER
 
 # End