DKIM: tighten up parsing for DKIM DNS and header records. Bug 3056

[exim.git] / test / confs / 0372

diff --git a/test/confs/0372 b/test/confs/0372
index 682eb91a8f8c1c564ea9e9e42c14a35633b6c37f..983d596a13dbd260e23d2ea3df17e1277a903fb4 100644 (file)
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -2,14 +2,9 @@
 
 STRICT=
 
 
 STRICT=
 

-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,8 +25,8 @@ a1:
          set acl_m0  = value for m0 is local_part: $local_part
          set acl_m5  = value for m5 contains newline\nthere!
          set acl_m9  = value for m9 is domain: $domain
          set acl_m0  = value for m0 is local_part: $local_part
          set acl_m5  = value for m5 contains newline\nthere!
          set acl_m9  = value for m9 is domain: $domain

-         set acl_mfoo = value for mfoo is local_part: $local_part
-         set acl_mbar = value for mbar is domain: $domain
+         set acl_m_foo = value for mfoo is local_part: $local_part
+         set acl_m_bar = value for mbar is domain: $domain

 
   accept local_parts = a
          set acl_m0  = value for m0 is local_part: $local_part
 
   accept local_parts = a
          set acl_m0  = value for m0 is local_part: $local_part


@@ -58,7 +53,7 @@ r1:
                 acl_m2="$acl_m2"\nacl_m3="$acl_m3"\nacl_m4="$acl_m4"\n\
                 acl_m5="$acl_m5"\nacl_m6="$acl_m6"\nacl_m7="$acl_m7"\n\
                 acl_m8="$acl_m8"\nacl_m9="$acl_m9"\n\
                 acl_m2="$acl_m2"\nacl_m3="$acl_m3"\nacl_m4="$acl_m4"\n\
                 acl_m5="$acl_m5"\nacl_m6="$acl_m6"\nacl_m7="$acl_m7"\n\
                 acl_m8="$acl_m8"\nacl_m9="$acl_m9"\n\

-                acl_mfoo="$acl_mfoo"\nacl_mbar="$acl_mbar"\n\
+                acl_m_foo="$acl_m_foo"\nacl_m_bar="$acl_m_bar"\n\

                 acl_c_foo="$acl_c_foo"\nacl_c_bar="$acl_c_bar"
   transport = t1
 
                 acl_c_foo="$acl_c_foo"\nacl_c_bar="$acl_c_bar"
   transport = t1