Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 0620

diff --git a/test/confs/0620 b/test/confs/0620
index 15e31f1c505f022fd8ad6008b775e45f5767153f..6ee5ac654ad541ef82a3bdf9f3729f0dfd2e306d 100644 (file)
--- a/test/confs/0620
+++ b/test/confs/0620
@@ -13,25 +13,43 @@ acl_not_smtp = not_smtp
 begin acl
 
 not_smtp:
 begin acl
 
 not_smtp:

-  accept log_message = rcpt <$recipients> l <$local_part>
+  accept log_message = rcpts <$recipients> local_part <$local_part>

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

+hide_verifies:
+  driver =     accept
+  verify_only
+

 alias:
   driver =     redirect
   debug_print = DEBUG: $r_r1 $r_r2
   data =       b
 alias:
   driver =     redirect
   debug_print = DEBUG: $r_r1 $r_r2
   data =       b

-  set =        <;      r_r1 = <$local_part> aaa:bbb bar=baz
+               # r_r1 checks that a variable with tainted data is ok
+               #       that the default list-sep ":" is not used for this list
+               #       that an '=' on the RHS is ok
+  set =                r_r1 = <$local_part> aaa:bbb bar=baz
+               # r_local checks that a variable is immediately usable

   set =                r_local = check
   errors_to =  bad_$r_local
 
 user:
   driver =     accept
   debug_print = DEBUG: $r_r1 $r_r2
   set =                r_local = check
   errors_to =  bad_$r_local
 
 user:
   driver =     accept
   debug_print = DEBUG: $r_r1 $r_r2

+               # r_r1 vs. r_r2 checks we can have multiple "set" options

   set =                r_r1 = $local_part
   set =                r_r1 = $local_part

-  set =        <;      r_r2 = $local_part 2a00:1940:100::ff:0:1 foo=bar
+  set =                r_r2 = $local_part \
+                       2a00:1940:100::ff:0:1 \
+                       foo=bar \
+                       # check we can get a newline into content
+                       newline=initial\n\tcont \
+                       # check we can get a list-sep into content (by doubling)
+                       semicolon=initial;;cont \
+               ; \
+               # r_r3 checks we can have a list as arg for a "set" option
+               r_r3 = bletch

   transport =  local_delivery
 
 
   transport =  local_delivery
 
 


@@ -42,10 +60,9 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
 local_delivery:
   driver = appendfile
   envelope_to_add

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

   user = CALLER
   user = CALLER

-  debug_print = DEBUG: $r_r1 $r_r2
-  headers_add =        X-r1: <$r_r1>\nX-r2: <$r_r2>
+  headers_add =        X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>

 
 
 # End
 
 
 # End