Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / confs / 0002

diff --git a/test/confs/0002 b/test/confs/0002
index af680500c5b9f66c3ea257ed77e43ab215921180..409bd755f44da29716082006626bd5306ac83652 100644 (file)
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -15,6 +15,8 @@ gecos_name = CALLER_NAME
 # ----- Main settings -----
 
 domainlist dlist = *.aa.bb : ^\Nxxx(.*)
 # ----- Main settings -----
 
 domainlist dlist = *.aa.bb : ^\Nxxx(.*)

+domainlist elist = +dlist : ;;
+domainlist flist = <; a ; b;;c ; +elist ; 2001:630:212:8:204::b664 ;

 hostlist   hlist = V4NET.11.12.13 : iplsearch;DIR/aux-fixed/0002.iplsearch
 headers_charset = iso-8859-8
 
 hostlist   hlist = V4NET.11.12.13 : iplsearch;DIR/aux-fixed/0002.iplsearch
 headers_charset = iso-8859-8
 


@@ -42,4 +44,20 @@ check_data:
   warn  logwrite = Subject is: "$h_subject:"
   deny  message = reply_address=<$reply_address>
 
   warn  logwrite = Subject is: "$h_subject:"
   deny  message = reply_address=<$reply_address>
 

+a_ret:
+  accept message = ($acl_narg) [$acl_arg1] [$acl_arg2]
+
+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