Merge branch 'acl'

[exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index a7c87622988b3b796755d4cb093f024d9ab7f718..b4b96dfb56d835a7ebdd684a6632e28a0abdb8e2 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -49,20 +49,20 @@
 > reduce: 6
 > reduce: 9
 > 
-> list: *.aa.bb : ^\Nxxx(.*)
-> list: *.aa.bb : ^\Nxxx(.*)
-> list: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch
-> list: *.aa.bb : ^\Nxxx(.*) : ;;
-> list: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664
+> listnamed: *.aa.bb : ^\Nxxx(.*)
+> listnamed: *.aa.bb : ^\Nxxx(.*)
+> listnamed: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch
+> listnamed: *.aa.bb : ^\Nxxx(.*) : ;;
+> listnamed: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664
 > Failed: "nolist" is not a named list
-> list: *.aa.bb : ^\Nxxx(.*)
+> listnamed: *.aa.bb : ^\Nxxx(.*)
 > Failed: "hlist" is not a domain named list
 > Failed: bad suffix on "list" operator
 > 
-> nlist: 3
-> nlist: 0
-> nlist: 3
-> nlist: 2
+> listcount: 3
+> listcount: 0
+> listcount: 3
+> listcount: 2
 > 
 > # Tests with iscntrl() and illegal separators
 > 
@@ -78,6 +78,21 @@
 > 
 > # Operators
 > 
+> Failed: missing or misplaced { or }
+> Failed: missing or misplaced { or }
+> Failed: error from acl "a_nosuch"
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> acl: (2) [firstarg] [secondarg]
+> acl: (1) [arg with spaces] []
+> acl: 
+> acl: 
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> Failed: error from acl "a_defer"
+> acl: (2) [new arg1] [top_arg_1]
+> acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
+> 
 > addrss: local-part@dom.ain
 > addrss: local-part@dom.ain
 > domain: dom.ain
@@ -377,6 +392,12 @@
 > queue_running after or: y
 > first_delivery after or: y
 > 
+> # acl expansion condition
+> acl if: Y:(0) [] []
+> acl if: Y:(1) [argY] []
+> acl if: N:(2) [argN] [arg2]
+> Failed: error from acl "a_defer"
+> 
 > # Default values for both if strings
 > 
 > ${if eq{1}{1}}  >true<