Fix missing Changelog entries for recent work

[exim.git] / test / confs / 0002

diff --git a/test/confs/0002 b/test/confs/0002
index 8662e54d07512fe739a4a5bfb396bc27bc85c7d4..6ca2d1bcbb8ff3639c5013052fbe8a594b4d199e 100644 (file)
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -4,17 +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 =

 
 # ----- 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
 


@@ -33,7 +36,7 @@ connect0:
   accept
 
 connect1:
   accept
 
 connect1:

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

 
 connect2:
   deny  hosts = net-lsearch;DIR/aux-fixed/0002.lsearch
 
 connect2:
   deny  hosts = net-lsearch;DIR/aux-fixed/0002.lsearch


@@ -42,4 +45,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