Testsute: output changes resulting

[exim.git] / test / confs / 5100

diff --git a/test/confs/5100 b/test/confs/5100
index a1b5c67d0cfa29589b76526892bf46470157ee2e..3cc4e8ade75ff636083bec6357d1bcb35f84bda8 100644 (file)
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -2,14 +2,9 @@
 
 IGNORE_QUOTA=FALSE
 
 
 IGNORE_QUOTA=FALSE
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -30,6 +25,7 @@ bounces:
 smartuser:
   driver = accept
   retry_use_local_part
 smartuser:
   driver = accept
   retry_use_local_part

+  address_data =       ${if inlist {$h_script:}{01:02:03:04:05:06:07:08:09:10} {$value}}

   transport = lmtp
 
 
   transport = lmtp
 
 


@@ -40,7 +36,7 @@ begin transports
 lmtp:
   driver = lmtp
   batch_max = 100
 lmtp:
   driver = lmtp
   batch_max = 100

-  command = DIR/bin/mtpscript DIR/aux-fixed/TESTNUM.script.$h_script: +DIR/spool/log/mainlog
+  command = DIR/bin/mtpscript DIR/aux-fixed/TESTNUM.script.$address_data +DIR/spool/log/mainlog

   timeout = 1s
   user = EXIMUSER
   ignore_quota = IGNORE_QUOTA
   timeout = 1s
   user = EXIMUSER
   ignore_quota = IGNORE_QUOTA


@@ -51,6 +47,7 @@ lmtp:
 
 begin retry
 
 
 begin retry
 

+*  mail_4xx

 *  rcpt_4xx   F,1d,1m
 *  *          F,5d,1d
 
 *  rcpt_4xx   F,1d,1m
 *  *          F,5d,1d