DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0002

diff --git a/test/confs/0002 b/test/confs/0002
index eb473e6b91200245498bdfc9f7b38daa8be7c14b..7e346d54d6e95a990e1de2c36cf2f68bad6fa82e 100644 (file)
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -4,13 +4,20 @@ LENCHECK=
 PTBC=
 
 exim_path = EXIM_PATH
 PTBC=
 
 exim_path = EXIM_PATH

+keep_environment = USER

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 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
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif

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


@@ -32,7 +39,7 @@ LENCHECK
 begin acl
 
 connect0:
 begin acl
 
 connect0:

-  accept
+  accept logwrite = connection_id: $connection_id

 
 connect1:
   deny  hosts = <\n partial-lsearch;DIR/aux-fixed/0002.lsearch \n 1.2.3.4
 
 connect1:
   deny  hosts = <\n partial-lsearch;DIR/aux-fixed/0002.lsearch \n 1.2.3.4


@@ -57,6 +64,7 @@ a_defer:
   defer
 
 a_sub:
   defer
 
 a_sub:

+  require acl = a_none foo bar baz barf

   require acl = a_deny "new arg1" $acl_arg1
 
 # End
   require acl = a_deny "new arg1" $acl_arg1
 
 # End