Merge branch 'master' of ssh://git.exim.org/home/git/exim

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0002

diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index 62a0a1f56b08199784fc97eb91ebe5f95b466067..e35e4a0820842526f6b64aa3ea29cb3f9ba615da 100644 (file)
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -88,7 +88,7 @@ reduce: ${reduce {<\x7f 1\x7f2\177 3}{0}{${eval:$value+$item}}}
 
 acl: ${acl
 acl: ${acl}
 
 acl: ${acl
 acl: ${acl}

-acl: ${acl {a_bad}}
+acl: ${acl {a_nosuch}}

 acl: ${acl {a_ret}}
 acl: ${acl {a_ret}{person@dom.ain}}
 acl: ${acl {a_ret}{firstarg}{secondarg}}
 acl: ${acl {a_ret}}
 acl: ${acl {a_ret}{person@dom.ain}}
 acl: ${acl {a_ret}{firstarg}{secondarg}}


@@ -97,6 +97,8 @@ acl: ${acl {a_none}}
 acl: ${acl {a_none}{person@dom.ain}}
 acl: ${acl {a_deny}}
 acl: ${acl {a_deny}{person@dom.ain}}
 acl: ${acl {a_none}{person@dom.ain}}
 acl: ${acl {a_deny}}
 acl: ${acl {a_deny}{person@dom.ain}}

+acl: ${acl {a_defer}}
+acl: ${acl {a_sub}{top_arg_1}{top_arg_2}{top_arg_3}}

 acl: ${reduce {1:2:3:4} {} {$value ${acl {a_ret}{$item}}}}
 
 addrss: ${address:local-part@dom.ain}
 acl: ${reduce {1:2:3:4} {} {$value ${acl {a_ret}{$item}}}}
 
 addrss: ${address:local-part@dom.ain}


@@ -421,6 +423,12 @@ first_delivery: ${if first_delivery{y}{n}}
 queue_running after or: ${if or{{eq {0}{0}}{queue_running}}{y}{n}}
 first_delivery after or: ${if or{{eq {0}{0}}{first_delivery}}{y}{n}}
 
 queue_running after or: ${if or{{eq {0}{0}}{queue_running}}{y}{n}}
 first_delivery after or: ${if or{{eq {0}{0}}{first_delivery}}{y}{n}}
 

+# acl expansion condition
+acl if: ${if acl {{a_ret}}               {Y:$value}{N:$value}}
+acl if: ${if acl {{a_ret}{argY}}         {Y:$value}{N:$value}}
+acl if: ${if acl {{a_deny}{argN}{arg2}}  {Y:$value}{N:$value}}
+acl if: ${if acl {{a_defer}{argN}{arg2}} {Y:$value}{N:$value}}
+

 # Default values for both if strings
 
 \${if eq{1}{1}}  >${if eq{1}{1}}<
 # Default values for both if strings
 
 \${if eq{1}{1}}  >${if eq{1}{1}}<


@@ -918,3 +926,8 @@ exim -d -be
 match_ip:        15 ${if match_ip{1.2.3.4}{1.2.3}}
 match_ip:        16 ${if match_ip{1.2.3.4}{1.2.3.4/abc}}
 ****
 match_ip:        15 ${if match_ip{1.2.3.4}{1.2.3}}
 match_ip:        16 ${if match_ip{1.2.3.4}{1.2.3.4/abc}}
 ****

+# Operation of inlist and negated inlist
+exim -be
+${if inlist{aa}{aa} {in list}{not in list}}
+${if !inlist{aa}{aa} {not in list}{in list}}
+****