Merge branch 'master' into 4.next

[exim.git] / test / confs / 0002

diff --git a/test/confs/0002 b/test/confs/0002
index 317c4a27daafcb8df1e2e7aa3856272a749aaca3..7e565805bf12505f86fcc9df1275c043e088c1ea 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 -----
 


@@ -45,11 +52,19 @@ check_data:
   deny  message = reply_address=<$reply_address>
 
 a_ret:
   deny  message = reply_address=<$reply_address>
 
 a_ret:

-  accept message = [$address_data]
+  accept message = ($acl_narg) [$acl_arg1] [$acl_arg2]

 
 a_none:
   accept
 
 a_deny:
 
 a_none:
   accept
 
 a_deny:

+  deny message = ($acl_narg) [$acl_arg1] [$acl_arg2]
+
+a_defer:
+  defer
+
+a_sub:
+  require acl = a_none foo bar baz barf
+  require acl = a_deny "new arg1" $acl_arg1

 
 # End
 
 # End