Testsuite: fix 0173 + 2100+, take 2

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

diff --git a/test/confs/0410 b/test/confs/0410
index 934d8a1e891a5b7a0dabbb72d4e3cb10a2285163..904073d3ba82dfc58fc90f0b374ba7d70fec3afd 100644 (file)
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -1,12 +1,7 @@
 # Exim test configuration 0410
 
 # Exim test configuration 0410
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -22,9 +17,7 @@ begin ACL
 
 rcpt:
   accept verify = recipient
 
 rcpt:
   accept verify = recipient

-        logwrite = rcpt R:$router_name

          verify = sender
          verify = sender

-        logwrite = sndr R:$router_name

          condition = ${if eq {$address_data}{ADDRESS_DATA_STRING}{yes}{no}}
          condition = ${if eq {$sender_address_data}{SENDER_ADDRESS_DATA_STRING}{yes}{no}}
 
          condition = ${if eq {$address_data}{ADDRESS_DATA_STRING}{yes}{no}}
          condition = ${if eq {$sender_address_data}{SENDER_ADDRESS_DATA_STRING}{yes}{no}}