DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 3500

diff --git a/test/confs/3500 b/test/confs/3500
index 999cd5673babe70fd39bd4f1c8568f7dc6446c95..5cf34fa20e8fca59edd4901cd82c2c1ffa6645f2 100644 (file)
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,19 +1,14 @@
 # Exim test configuration 3500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
 domainlist local_domains = test.ex : *.test.ex
 
-hostlist auth_hosts = 10.0.0.1
+hostlist auth_hosts = 10.0.0.1 : 10.0.0.5
 hostlist relay_hosts = 10.0.0.4
 hostlist auth_relay_hosts = 10.0.0.3 : 10.0.0.4
 
@@ -76,10 +71,11 @@ begin authenticators
 cram_md5:
   driver = cram_md5
   public_name = CRAM-MD5
-  server_debug_print = +++CRAM-MD5 \$1="$1" \$2=\"$2" \$3="$3"
-  server_secret = "${if eq{$1}{tim}{tanstaaftanstaaf}\
-    {${if eq{$1}{userx}{secret}fail}}}"
-  server_set_id = $1
+  server_debug_print = +++CRAM-MD5 \$auth1="$auth1" \$auth2=\"$auth2" \$auth3="$auth3"
+  server_secret = "${if eq{$auth1}{tim}{tanstaaftanstaaf}\
+    {${if eq{$auth1}{userx}{secret}fail}}}"
+  server_set_id = $auth1
+  server_condition = ${if !eq {$sender_host_address}{10.0.0.5}}
 
 
 
@@ -107,6 +103,7 @@ appendfile:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER