More debug output

diff --git a/src/src/acl.c b/src/src/acl.c
index eb2211d60f3d0a38cdf03c924b20b7d1d9b91013..42b9091c3af4d9fae0de85fe70325899d7c25f93 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -2992,12 +2992,14 @@ for (; cb != NULL; cb = cb->next)
 
   if (cb->type == ACLC_MESSAGE)
     {
 
   if (cb->type == ACLC_MESSAGE)
     {

+    HDEBUG(D_acl) debug_printf("  message: %s\n", cb->arg);

     user_message = cb->arg;
     continue;
     }
 
   if (cb->type == ACLC_LOG_MESSAGE)
     {
     user_message = cb->arg;
     continue;
     }
 
   if (cb->type == ACLC_LOG_MESSAGE)
     {

+    HDEBUG(D_acl) debug_printf("l_message: %s\n", cb->arg);

     log_message = cb->arg;
     continue;
     }
     log_message = cb->arg;
     continue;
     }

diff --git a/src/src/expand.c b/src/src/expand.c
index 34fb0346effe91d7160ed7ceecad80a2a91b2429..8f1b3d8754f1f6d0be06c17ce599e0d52781914e 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3949,6 +3949,8 @@ while (*s != 0)
        {
        case OK:
        case FAIL:
        {
        case OK:
        case FAIL:

+         DEBUG(D_expand)
+           debug_printf("acl expansion yield: %s\n", user_msg);

          if (user_msg)
             yield = string_cat(yield, &size, &ptr, user_msg, Ustrlen(user_msg));
          continue;
          if (user_msg)
             yield = string_cat(yield, &size, &ptr, user_msg, Ustrlen(user_msg));
          continue;

diff --git a/src/src/malware.c b/src/src/malware.c
index 7b3453f727439d0ac31087da94cabc4e885fa438..aaf3fcb7e59192e6eff3c3e423811511e3aa543e 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -406,6 +406,7 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
        return m_errlog_defer(scanent, errstr);
       break;
     }
        return m_errlog_defer(scanent, errstr);
       break;
     }

+    DEBUG(D_lookup) debug_printf("Malware scan: %s\n", scanner_name);

 
     switch (scanent->scancode) {
     case M_FPROTD: /* "f-protd" scanner type -------------------------------- */
 
     switch (scanent->scancode) {
     case M_FPROTD: /* "f-protd" scanner type -------------------------------- */

diff --git a/test/stderr/0002 b/test/stderr/0002
index 7a6632bfe383a747dee4963017d7b444d468710b..023c001bda7a9f7e957af8da4225d33415bfd554 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -254,6 +254,7 @@ search_tidyup called
 LOG: 10HmaX-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmaX-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept"
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept"


@@ -266,6 +267,7 @@ LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 LOG: 10HmaY-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmaY-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
 >>> processing "accept"
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
 >>> processing "accept"


@@ -278,6 +280,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a
 LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
 >>> processing "accept"
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
 >>> processing "accept"


@@ -290,6 +293,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c
 LOG: 10HmbA-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmbA-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept"
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept"


@@ -302,6 +306,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 LOG: 10HmbB-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmbB-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
 >>> host in hosts_connection_nolog? no (option unset)


@@ -325,6 +330,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x
 LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> host in hosts_connection_nolog? no (option unset)


@@ -348,6 +354,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"
 LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 >>> warn: condition test succeeded in ACL "check_data"
 >>> processing "deny"

+>>>   message: reply_address=<$reply_address>

 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....
 >>> deny: condition test succeeded in ACL "check_data"
 LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....

diff --git a/test/stderr/0018 b/test/stderr/0018
index 27aa6bc6db2693b4018ee5b6bbe120a9ada05e7c..6ab98144110fcf51f56f446f199237e3148cb979 100644 (file)
--- a/test/stderr/0018
+++ b/test/stderr/0018
@@ -16,6 +16,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "!localhost"? no (matched "!localhost")
 >>> deny: condition test failed in ACL "check_etrn"
 >>> processing "warn"
 >>> host in "!localhost"? no (matched "!localhost")
 >>> deny: condition test failed in ACL "check_etrn"
 >>> processing "warn"

+>>> l_message: accepted $smtp_command

 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=[127.0.0.1] Warning: accepted etrn #some.random.domain
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=[127.0.0.1] Warning: accepted etrn #some.random.domain
 >>> processing "accept"

diff --git a/test/stderr/0021 b/test/stderr/0021
index 64c72d2bff0d39da89792f803623b916a2de5d73..3dbb81639b1441f396b910128a555350aa150843 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -18,6 +18,7 @@ check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop"
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"


@@ -29,6 +30,7 @@ LOG: MAIN
 accept: condition test succeeded in ACL "connect"
 using ACL "mail"
 processing "warn"
 accept: condition test succeeded in ACL "connect"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test3"? no (end of list)
 check senders = ok@test3
 address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test3"? no (end of list)


@@ -44,6 +46,7 @@ LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 address match test: subject=ok@test1 pattern=ok@test3
 test1 in "test3"? no (end of list)
 check senders = ok@test3
 address match test: subject=ok@test1 pattern=ok@test3
 test1 in "test3"? no (end of list)


@@ -116,6 +119,7 @@ check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop"
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop"

+l_message: forcibly dropped

 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"


@@ -127,6 +131,7 @@ LOG: MAIN
 accept: condition test succeeded in ACL "connect"
 using ACL "mail"
 processing "warn"
 accept: condition test succeeded in ACL "connect"
 using ACL "mail"
 processing "warn"

+  message: added header line

 check senders = ok@test3
 address match test: subject=ok@test3 pattern=ok@test3
 test3 in "test3"? yes (matched "test3")
 check senders = ok@test3
 address match test: subject=ok@test3 pattern=ok@test3
 test3 in "test3"? yes (matched "test3")

diff --git a/test/stderr/0022 b/test/stderr/0022
index b486e0afd66ab1e566de079223824ef6370e1d63..864e197621f134d8ed323290c7e086a5c951594a 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -92,6 +92,7 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<warn_log@test.ex>
 using ACL "warn_log"
 processing "warn"
 SMTP<< rcpt to:<warn_log@test.ex>
 using ACL "warn_log"
 processing "warn"

+l_message: warn log message

 warn: condition test succeeded in ACL "warn_log"
 LOG: MAIN
   H=[V4NET.9.8.7] Warning: warn log message
 warn: condition test succeeded in ACL "warn_log"
 LOG: MAIN
   H=[V4NET.9.8.7] Warning: warn log message


@@ -157,6 +158,7 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<warn_user@test.ex>
 using ACL "warn_user"
 processing "warn"
 SMTP<< rcpt to:<warn_user@test.ex>
 using ACL "warn_user"
 processing "warn"

+  message: warn user message

 warn: condition test succeeded in ACL "warn_user"
 processing "accept"
 accept: condition test succeeded in ACL "warn_user"
 warn: condition test succeeded in ACL "warn_user"
 processing "accept"
 accept: condition test succeeded in ACL "warn_user"


@@ -203,6 +205,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "defer"
 >>> processing "defer"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "defer"
 >>> processing "defer"

+>>>   message: forcibly deferred

 >>> defer: condition test succeeded in ACL "defer"
 LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
 >>> using ACL "accept"
 >>> defer: condition test succeeded in ACL "defer"
 LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
 >>> using ACL "accept"


@@ -210,6 +213,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly defer
 >>> accept: condition test succeeded in ACL "accept"
 >>> using ACL "drop"
 >>> processing "drop"
 >>> accept: condition test succeeded in ACL "accept"
 >>> using ACL "drop"
 >>> processing "drop"

+>>>   message: forcibly dropped

 >>> drop: condition test succeeded in ACL "drop"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
 LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
 >>> drop: condition test succeeded in ACL "drop"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
 LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL


@@ -266,16 +270,19 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> processing "deny"
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
 >>> processing "deny"
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")

+>>>   message: host data >$host_data<

 >>> deny: condition test succeeded in ACL "host_check"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check"
 >>> processing "deny"
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
 >>> deny: condition test succeeded in ACL "host_check"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check"
 >>> processing "deny"
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")

+>>>   message: host data >$host_data<

 >>> deny: condition test succeeded in ACL "host_check"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 >>> processing "deny"
 >>> deny: condition test succeeded in ACL "host_check"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 >>> processing "deny"

+>>>   message: host data >$host_data<

 >>> check hosts = +some_hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
 >>> host in "+some_hosts"? yes (matched "+some_hosts")
 >>> check hosts = +some_hosts
 >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
 >>> host in "+some_hosts"? yes (matched "+some_hosts")


@@ -283,6 +290,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 >>> processing "deny"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 >>> processing "deny"

+>>>   message: host data >$host_data<

 >>> check hosts = +some_hosts
 >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> check hosts = +some_hosts
 >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
 >>> deny: condition test succeeded in ACL "host_check2"


@@ -330,6 +338,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> check acl = drop
 >>> using ACL "drop"
 >>> processing "drop"
 >>> check acl = drop
 >>> using ACL "drop"
 >>> processing "drop"

+>>>   message: forcibly dropped

 >>> drop: condition test succeeded in ACL "drop"
 >>> accept: condition test yielded "drop" in ACL "nested_drop"
 >>> accept: endpass encountered - denying access
 >>> drop: condition test succeeded in ACL "drop"
 >>> accept: condition test yielded "drop" in ACL "nested_drop"
 >>> accept: endpass encountered - denying access


@@ -349,6 +358,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> check acl = drop
 >>> using ACL "drop"
 >>> processing "drop"
 >>> check acl = drop
 >>> using ACL "drop"
 >>> processing "drop"

+>>>   message: forcibly dropped

 >>> drop: condition test succeeded in ACL "drop"
 >>> require: condition test yielded "drop" in ACL "nested_drop_require"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
 >>> drop: condition test succeeded in ACL "drop"
 >>> require: condition test yielded "drop" in ACL "nested_drop_require"
 LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped

diff --git a/test/stderr/0023 b/test/stderr/0023
index b9894240bd4766488eb80d9573b5f865d84c5505..01994efe66511a2910a85b4ed8bc28b21b2d9c5f 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -12,10 +12,13 @@
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)


@@ -24,6 +27,7 @@
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")

+>>>   message: $domain gets refused

 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"
 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"


@@ -33,10 +37,13 @@
 >>> z in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> z in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> z in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> z in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> z in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> z in "deny.test.ex"? no (end of list)


@@ -63,10 +70,13 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)


@@ -75,6 +85,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")

+>>>   message: $domain gets refused

 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"
 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"


@@ -84,10 +95,13 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> test.ex in "deny.test.ex"? no (end of list)


@@ -96,6 +110,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")

+>>>   message: $domain gets refused

 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"
 >>> check domains = !refuse.test.ex
 >>> test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"


@@ -105,10 +120,13 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> relay.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> relay.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> relay.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> relay.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> relay.test.ex in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> relay.test.ex in "deny.test.ex"? no (end of list)


@@ -117,6 +135,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> relay.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
 >>> relay.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> relay.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
 >>> relay.test.ex in "+local_domains"? yes (matched "+local_domains")

+>>>   message: $domain gets refused

 >>> check domains = !refuse.test.ex
 >>> relay.test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"
 >>> check domains = !refuse.test.ex
 >>> relay.test.ex in "!refuse.test.ex"? yes (end of list)
 >>> accept: condition test succeeded in ACL "acl_1_2_3"


@@ -126,10 +145,13 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> deny.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> deny.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> deny.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> deny.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex")
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex")


@@ -141,10 +163,13 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIE
 >>> refuse.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> refuse.test.ex in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> refuse.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"
 >>> check domains = !wontpass
 >>> refuse.test.ex in "!wontpass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "deny"

+>>>   message: domain explicitly denied
+>>> l_message: DOMAIN EXPLICITLY DENIED

 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> refuse.test.ex in "deny.test.ex"? no (end of list)
 >>> check continue = this value is not used
 >>> check domains = deny.test.ex
 >>> refuse.test.ex in "deny.test.ex"? no (end of list)


@@ -153,6 +178,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIE
 >>> check domains = +local_domains
 >>> refuse.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
 >>> refuse.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> refuse.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
 >>> refuse.test.ex in "+local_domains"? yes (matched "+local_domains")

+>>>   message: $domain gets refused

 >>> check domains = !refuse.test.ex
 >>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex")
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> check domains = !refuse.test.ex
 >>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex")
 >>> accept: condition test failed in ACL "acl_1_2_3"


@@ -170,6 +196,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
 >>> wontpass in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"
 >>> wontpass in "!nopass"? yes (end of list)
 >>> require: condition test succeeded in ACL "acl_1_2_3"
 >>> processing "require"

+>>>   message: $local_part@$domain shall not pass

 >>> check domains = !wontpass
 >>> wontpass in "!wontpass"? no (matched "!wontpass")
 >>> require: condition test failed in ACL "acl_1_2_3"
 >>> check domains = !wontpass
 >>> wontpass in "!wontpass"? no (matched "!wontpass")
 >>> require: condition test failed in ACL "acl_1_2_3"


@@ -246,6 +273,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"

+>>>   message: don't like this host

 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"


@@ -256,6 +284,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"

+>>>   message: don't like this host

 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"


@@ -275,6 +304,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"

+>>>   message: don't like this host

 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? no (end of list)
 >>> deny: condition test failed in ACL "acl_9_9_9"
 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? no (end of list)
 >>> deny: condition test failed in ACL "acl_9_9_9"


@@ -288,6 +318,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny"

+>>>   message: don't like this host

 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? no (end of list)
 >>> deny: condition test failed in ACL "acl_9_9_9"
 >>> check hosts = 9.9.9.0/26
 >>> host in "9.9.9.0/26"? no (end of list)
 >>> deny: condition test failed in ACL "acl_9_9_9"


@@ -381,6 +412,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>>                 = no
 >>> accept: condition test failed in ACL "acl_5_6_11"
 >>> processing "deny"
 >>>                 = no
 >>> accept: condition test failed in ACL "acl_5_6_11"
 >>> processing "deny"

+>>>   message: "local part of wrong type\n(quotes are literal)

 >>> deny: condition test succeeded in ACL "acl_5_6_11"
 LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "acl_5_6_11"
 LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> host in hosts_connection_nolog? no (option unset)


@@ -395,6 +427,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> processing "accept"
 >>> check hosts = 5.6.12.1
 >>> host in "5.6.12.1"? yes (matched "5.6.12.1")
 >>> processing "accept"
 >>> check hosts = 5.6.12.1
 >>> host in "5.6.12.1"? yes (matched "5.6.12.1")

+>>>   message: failed nested acl

 >>> check acl = acl_5_6_12A
 >>> using ACL "acl_5_6_12A"
 >>> processing "accept"
 >>> check acl = acl_5_6_12A
 >>> using ACL "acl_5_6_12A"
 >>> processing "accept"


@@ -406,6 +439,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> processing "accept"
 >>> check hosts = 5.6.12.1
 >>> host in "5.6.12.1"? yes (matched "5.6.12.1")
 >>> processing "accept"
 >>> check hosts = 5.6.12.1
 >>> host in "5.6.12.1"? yes (matched "5.6.12.1")

+>>>   message: failed nested acl

 >>> check acl = acl_5_6_12A
 >>> using ACL "acl_5_6_12A"
 >>> processing "accept"
 >>> check acl = acl_5_6_12A
 >>> using ACL "acl_5_6_12A"
 >>> processing "accept"


@@ -588,6 +622,8 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"

+>>>   message: host in DNS list $dnslist_domain: $dnslist_text
+>>> l_message: DNSLIST ($dnslist_domain: $dnslist_text)

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex


@@ -597,6 +633,8 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
 LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"
 LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"

+>>>   message: host in DNS list $dnslist_domain: $dnslist_text
+>>> l_message: DNSLIST ($dnslist_domain: $dnslist_text)

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup


@@ -614,6 +652,8 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"

+>>>   message: host in DNS list $dnslist_domain: $dnslist_text
+>>> l_message: DNSLIST ($dnslist_domain: $dnslist_text)

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 12.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 12.12.11.V4NET.rbl.test.ex


@@ -624,6 +664,8 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> accept: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny"

+>>>   message: host in DNS list $dnslist_domain: $dnslist_text
+>>> l_message: DNSLIST ($dnslist_domain: $dnslist_text)

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup


@@ -642,6 +684,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y


@@ -656,6 +699,7 @@ LOG: H=[20.20.20.20] sender verify fail for <x@y>: Unrouteable address
 LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"
 LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> check verify = sender
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_20_20_20"


@@ -671,6 +715,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y


@@ -679,6 +724,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------

+>>>   message: recipient verify failure

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x1@y
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x1@y


@@ -692,8 +738,10 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"
 LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
 >>> using ACL "acl_20_20_20"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender
 >>> using cached sender verify result
 >>> check verify = sender
 >>> using cached sender verify result

+>>>   message: recipient verify failure

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y


@@ -831,6 +879,7 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
 >>> processing "deny"
 >>> check hosts = 23.23.23.0
 >>> host in "23.23.23.0"? yes (matched "23.23.23.0")
 >>> processing "deny"
 >>> check hosts = 23.23.23.0
 >>> host in "23.23.23.0"? yes (matched "23.23.23.0")

+>>>   message: sender must verify

 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y


@@ -846,6 +895,7 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> processing "deny"
 >>> check hosts = 23.23.23.0
 >>> host in "23.23.23.0"? yes (matched "23.23.23.0")
 >>> processing "deny"
 >>> check hosts = 23.23.23.0
 >>> host in "23.23.23.0"? yes (matched "23.23.23.0")

+>>>   message: sender must verify

 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y


@@ -882,6 +932,7 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_24_24_24"
 >>> processing "warn"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_24_24_24"
 >>> processing "warn"

+>>>   message: X-Warn: sender didn't verify

 >>> check condition = yes
 >>> warn: condition test succeeded in ACL "acl_24_24_24"
 >>> end of ACL "acl_24_24_24": implicit DENY
 >>> check condition = yes
 >>> warn: condition test succeeded in ACL "acl_24_24_24"
 >>> end of ACL "acl_24_24_24": implicit DENY


@@ -896,6 +947,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_25_25_25"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_25_25_25"
 >>> processing "deny"

+>>>   message: denying domains=x

 >>> check domains = x
 >>> y in "x"? no (end of list)
 >>> deny: condition test failed in ACL "acl_25_25_25"
 >>> check domains = x
 >>> y in "x"? no (end of list)
 >>> deny: condition test failed in ACL "acl_25_25_25"


@@ -913,6 +965,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")

+>>>   message: bounce messages can have only one recipient

 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = no
 >>> deny: condition test failed in ACL "acl_26_26_26"
 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = no
 >>> deny: condition test failed in ACL "acl_26_26_26"


@@ -922,6 +975,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")

+>>>   message: bounce messages can have only one recipient

 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"


@@ -930,6 +984,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")

+>>>   message: bounce messages can have only one recipient

 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> check condition = ${if > {$recipients_count}{0}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"


@@ -1058,6 +1113,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"

+>>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"

 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/ten-1
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/ten-1
 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/ten-1
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/ten-1


@@ -1068,6 +1124,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
 LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"
 LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"

+>>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"

 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/ten-2
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/ten-2
 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/ten-2
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/ten-2


@@ -1081,6 +1138,7 @@ LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "acl_30_30_30"
 >>> processing "deny"

+>>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"

 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/13.12.11.V4NET.rbl
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/13.12.11.V4NET.rbl
 >>> check dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
 >>>                = test.ex=V4NET.0.0.1,127.0.0.2/13.12.11.V4NET.rbl
 >>> DNS list check: test.ex=V4NET.0.0.1,127.0.0.2/13.12.11.V4NET.rbl


@@ -1116,6 +1174,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_33_33_33"
 >>> processing "accept"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_33_33_33"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender/no_details
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
 >>> check verify = sender/no_details
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y


@@ -1129,6 +1188,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using ACL "acl_33_33_33"
 >>> processing "accept"
 LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using ACL "acl_33_33_33"
 >>> processing "accept"

+>>>   message: sender verify failure

 >>> check verify = sender/no_details
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_33_33_33"
 >>> check verify = sender/no_details
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_33_33_33"

diff --git a/test/stderr/0026 b/test/stderr/0026
index c33875c88452f53c97117e2b79394a339813c2c6..328b169bd0fd453c22c8bae168260bdc6e7484a1 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -11,6 +11,7 @@
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"

+>>> l_message: body contains trigger

 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = no
 >>> deny: condition test failed in ACL "acl_data"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = no
 >>> deny: condition test failed in ACL "acl_data"


@@ -31,6 +32,7 @@ LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "acl_data"
 >>> processing "deny"

+>>> l_message: body contains trigger

 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"
 >>> check condition = ${if match{$message_body}{trigger}{yes}{no}}
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"

diff --git a/test/stderr/0038 b/test/stderr/0038
index 141a1121df1c00b11508f1313bf07c40229e9626..727c1c6c3bbcde8a3620c3f3b3a715d40779f8b3 100644 (file)
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -16,6 +16,7 @@
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"


@@ -26,6 +27,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"


@@ -48,6 +50,7 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"


@@ -58,6 +61,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"


@@ -81,6 +85,7 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"


@@ -91,6 +96,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"


@@ -113,6 +119,7 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"


@@ -123,6 +130,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"


@@ -146,6 +154,7 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "accept"


@@ -158,6 +167,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "check_rcpt"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "check_rcpt"


@@ -169,6 +179,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0

+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_rcpt"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "check_rcpt"
 >>> warn: condition test succeeded in ACL "check_rcpt"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "check_rcpt"


@@ -180,6 +191,7 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=
 >>> ratelimit found key in database
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 3.0
 >>> ratelimit found key in database
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 3.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"


@@ -236,6 +248,7 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 19.0
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 19.0

+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period

 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
 >>> processing "deny"

diff --git a/test/stderr/0043 b/test/stderr/0043
index fdbc34231b1c6723b7e96cd42a461c2943fedd69..31ba8d9cedfd697856f10d08e000741e0c0b9b57 100644 (file)
--- a/test/stderr/0043
+++ b/test/stderr/0043
@@ -53,6 +53,7 @@ LOG: H=(exim.test.ex) [V4NET.0.0.97] incomplete transaction (RSET) from <junkjun
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex


@@ -86,6 +87,7 @@ LOG: H=(exim.test.ex) [V4NET.0.0.97] incomplete transaction (RSET) from <junkjun
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junkjunk@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junkjunk@exim.test.ex


@@ -108,6 +110,7 @@ LOG: H=(exim.test.ex) [V4NET.0.0.97] F=<postmaster@exim.test.ex> rejected RCPT j
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@exim.test.ex

diff --git a/test/stderr/0044 b/test/stderr/0044
index 83c7578332ded8b40c7ba45f0baa2d32c2b1802f..d8b7ebe80f46d809f42625fb62e536e1d5b4ac90 100644 (file)
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -32,6 +32,7 @@
 >>> postmaster@exim.test.ex in "myfriend@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> postmaster@exim.test.ex in "myfriend@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex

diff --git a/test/stderr/0057 b/test/stderr/0057
index 6a5ec62f9d56cc91cbe86b877e9b67078d4446ca..483ca182cb4fff6edfd06da1d3ded48a791840f2 100644 (file)
--- a/test/stderr/0057
+++ b/test/stderr/0057
@@ -26,6 +26,7 @@
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> 3rdhost.example.com in percent_hack_domains? no (end of list)
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> 3rdhost.example.com in percent_hack_domains? no (end of list)


@@ -41,6 +42,7 @@ LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@another
 >>> 3rdhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> 3rdhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0059 b/test/stderr/0059
index 1ccdb7afd95a5d129ca16828143ab6bab4241ac6..34fffb580b7c2db3efd772fd68e7a1f445dfd63a 100644 (file)
--- a/test/stderr/0059
+++ b/test/stderr/0059
@@ -29,6 +29,7 @@
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0060 b/test/stderr/0060
index da4ae48103132109bf3568800f99c38fc22d4393..7e3e5672f99da158117f82fcabbe02ef90829a80 100644 (file)
--- a/test/stderr/0060
+++ b/test/stderr/0060
@@ -70,6 +70,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss


@@ -180,6 +181,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=sss


@@ -214,6 +216,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=s
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=sss


@@ -248,6 +251,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=s
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=sss


@@ -282,6 +286,7 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=s
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.4] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.4] P=smtp S=sss

diff --git a/test/stderr/0061 b/test/stderr/0061
index 99511950ec536e0769b52eaaac3aa05cff6b6557..8e178fbc59f84f5098eb66b54da0aa78eda86c10 100644 (file)
--- a/test/stderr/0061
+++ b/test/stderr/0061
@@ -66,6 +66,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss

diff --git a/test/stderr/0062 b/test/stderr/0062
index d5386dd62d3845376581f8a062f31673e2c76500..7343d7df2162855e84f1b227af6194aff96727d6 100644 (file)
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -37,6 +37,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> using ACL "check_message"
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> using ACL "check_message"

diff --git a/test/stderr/0063 b/test/stderr/0063
index f158b6490078092ab77170466aae811f603f99de..2eb0b3160a6a68be0cc4bdd87403b73b8686c5cc 100644 (file)
--- a/test/stderr/0063
+++ b/test/stderr/0063
@@ -37,6 +37,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0064 b/test/stderr/0064
index 60b8b18c5cb330f2ea270ba8ddbc034e4d59f071..6790f9495319e2e1555511475e5cdd261bf2268d 100644 (file)
--- a/test/stderr/0064
+++ b/test/stderr/0064
@@ -37,6 +37,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0065 b/test/stderr/0065
index eee5d0d836b6374f979c6ba43d717f527ae6f484..ae6fc7f97bef6182b41622514fce3801c061e13b 100644 (file)
--- a/test/stderr/0065
+++ b/test/stderr/0065
@@ -60,6 +60,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss


@@ -125,6 +126,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss

diff --git a/test/stderr/0066 b/test/stderr/0066
index 59d9e69e91bd3ac66cd2a163d9762fddff35535a..9dbb6f08b67052d3918c381e516299da889aa3d2 100644 (file)
--- a/test/stderr/0066
+++ b/test/stderr/0066
@@ -72,6 +72,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss


@@ -152,6 +153,7 @@ LOG: no host name found for IP address 1.3.2.4
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss


@@ -308,6 +310,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S=sss
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S=sss

diff --git a/test/stderr/0069 b/test/stderr/0069
index 1692a621fde43e2c26835e301c7888a37f59f796..2355b74cd01d5877c45502a1e2d734ca60f2998a 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -68,6 +68,7 @@ LOG: no IP address found for host non.existent.invalid (during SMTP connection f
 >>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"
 >>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"

+>>>   message: "Denied"

 >>> deny: condition test succeeded in ACL "check_recipienty"
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_recipienty"
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)


@@ -111,6 +112,7 @@ LOG: no IP address found for host non.existent.invalid (during SMTP connection f
 LOG: list matching forced to fail: failed to find IP address for non.existent.invalid
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"
 LOG: list matching forced to fail: failed to find IP address for non.existent.invalid
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"

+>>>   message: "Denied"

 >>> deny: condition test succeeded in ACL "check_recipienty"
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_recipienty"
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)

diff --git a/test/stderr/0070 b/test/stderr/0070
index 4a2959d4fa9e781cc301fc12c000eb763d4c4780..bb6e554a834c9d0283eb52056be44451540c289d 100644 (file)
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -28,6 +28,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"
 >>> no EHLO/HELO command was issued
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"
 >>> no EHLO/HELO command was issued


@@ -55,6 +56,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"
 LOG: H=([V4NET.0.0.1]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo not verified
 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"
 LOG: H=([V4NET.0.0.1]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo not verified


@@ -80,9 +82,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> matched host address
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> matched host address
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"
 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"

+>>>   message: helo did verify

 >>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.2]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.2]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)


@@ -205,6 +209,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
 >>> require: condition test failed in ACL "rcpt"
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
 >>> require: condition test failed in ACL "rcpt"


@@ -229,11 +234,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"

+>>>   message: helo did verify

 >>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.13]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.13]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)


@@ -257,6 +264,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "require"

+>>>   message: helo not verified

 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for 99.99.99.99
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for 99.99.99.99

diff --git a/test/stderr/0079 b/test/stderr/0079
index ebdd6b2449bbb73382788b6ef79190db0a258275..e00d79050a2c26a58d161cc211536126b6ff88c1 100644 (file)
--- a/test/stderr/0079
+++ b/test/stderr/0079
@@ -14,6 +14,8 @@
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn"
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
+>>> l_message: $sender_host_address is in $dnslist_domain

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl.test.ex


@@ -22,6 +24,8 @@
 >>> warn: condition test succeeded in ACL "check_recipient"
 LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: V4NET.11.12.14 is in rbl.test.ex
 >>> processing "warn"
 >>> warn: condition test succeeded in ACL "check_recipient"
 LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: V4NET.11.12.14 is in rbl.test.ex
 >>> processing "warn"

+>>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
+>>> l_message: accepting postmaster from host in $dnslist_domain

 >>> check recipients = postmaster@exim.test.ex
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
 >>> check recipients = postmaster@exim.test.ex
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")


@@ -43,6 +47,8 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host i
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn"
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
+>>> l_message: $sender_host_address is in $dnslist_domain

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> using result of previous DNS lookup


@@ -50,6 +56,8 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host i
 >>> => that means V4NET.11.12.14 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "warn"
 >>> => that means V4NET.11.12.14 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
+>>> l_message: accepting postmaster from host in $dnslist_domain

 >>> check recipients = postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"
 >>> check recipients = postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"


@@ -58,6 +66,7 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host i
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check dnslists = rbl2.test.ex
 >>> DNS list check: rbl2.test.ex
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl2.test.ex
 >>> DNS list check: rbl2.test.ex
 >>> using result of previous DNS lookup

diff --git a/test/stderr/0080 b/test/stderr/0080
index 199d3a22c3fcaf831fa6803e9587d1d8231b68ed..0a0d03f470aabb03d9084deb7f484f60822b3802 100644 (file)
--- a/test/stderr/0080
+++ b/test/stderr/0080
@@ -20,6 +20,7 @@
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check dnslists = rbl.test.ex:rbl2.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex:rbl2.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl.test.ex

diff --git a/test/stderr/0089 b/test/stderr/0089
index a6e85e13289b2d8bf2c7a64926d24acaf1eba28a..83fc35df4fcd84b291e8115c2d650b2b198f4a88 100644 (file)
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -39,6 +39,7 @@ LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&
 >>> else.where in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> else.where in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else.where>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else.where>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)


@@ -88,5 +89,6 @@ MUNGED: ::1 will be omitted in what follows
 >>> relay.two.ex in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> relay.two.ex in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-99.test.ex (@#$%^&*()) [V4NET.0.0.99] F=<root@myhost.test.ex> rejected RCPT <yy@relay.two.ex>: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-99.test.ex (@#$%^&*()) [V4NET.0.0.99] F=<root@myhost.test.ex> rejected RCPT <yy@relay.two.ex>: relay not permitted

diff --git a/test/stderr/0092 b/test/stderr/0092
index bdda285758690fdcb5ccac46f68c216b6ba02aef..f7bdef8195693c4275958d99f557ba1eb05218d5 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -21,6 +21,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"


@@ -46,6 +47,7 @@ exim: timed out while reading - message abandoned
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check recipients = verify@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")
 >>> check recipients = verify@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")

diff --git a/test/stderr/0094 b/test/stderr/0094
index 1450ab01b1f49383ee9e43216e4e7e0b497efd7d..77ca6bc2a0cd57b16389fd40b2b8b466619f4961 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -25,6 +25,7 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)


@@ -58,6 +59,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 Exim version x.yz ....
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 Exim version x.yz ....


@@ -141,6 +143,7 @@ host in "*.masq.test.ex"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"

+  message: relay not permitted

 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

diff --git a/test/stderr/0124 b/test/stderr/0124
index a7246fcf855c5ff2bcfd2c91aff3597c94abbeb8..328d78084840470522e370fea2f613090620c2a3 100644 (file)
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -25,6 +25,7 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
 >>> using ACL "check_recipient"
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
 >>> using ACL "check_recipient"


@@ -42,5 +43,6 @@ LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>:
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted

diff --git a/test/stderr/0130 b/test/stderr/0130
index bac07b8bfa50ffa8bb2c2997f466bf2f42546ab8..50c29e9384d366ed9ae8660c87fe97fb9fa1015f 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex

diff --git a/test/stderr/0138 b/test/stderr/0138
index 92f12813da1210a01584908b5164d4b82537c9e1..921115a6e2e0c05647d9a4ecba40b256229e5f5b 100644 (file)
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -69,6 +69,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> => that means V4NET.11.12.13 is not listed at rbl3.test.ex
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> => that means V4NET.11.12.13 is not listed at rbl3.test.ex
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check dnslists = rbl2.test.ex
 >>> DNS list check: rbl2.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl2.test.ex
 >>> check dnslists = rbl2.test.ex
 >>> DNS list check: rbl2.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl2.test.ex


@@ -76,6 +77,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> => that means V4NET.11.12.13 is not listed at rbl2.test.ex
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "warn"
 >>> => that means V4NET.11.12.13 is not listed at rbl2.test.ex
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warning: $sender_host_address is listed at $dnslist_domain

 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex


@@ -98,6 +100,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex

diff --git a/test/stderr/0139 b/test/stderr/0139
index 7e31007d2194fc295902ffb0b2c5b5f09f700d1b..c7f1f32eb995ac66ac25f71a84bd7a922cb3bbe6 100644 (file)
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -39,6 +39,7 @@
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> using ACL "check_recipient"
 >>> processing "warn"
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> using ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}

 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> new DNS lookup for 14.12.11.V4NET.rbl3.test.ex
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> new DNS lookup for 14.12.11.V4NET.rbl3.test.ex


@@ -46,6 +47,7 @@
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}

 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup


@@ -69,6 +71,7 @@
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex


@@ -86,6 +89,7 @@
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> using ACL "check_recipient"
 >>> processing "warn"
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> using ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}

 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> using result of previous DNS lookup


@@ -93,6 +97,7 @@
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}

 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup


@@ -105,6 +110,7 @@
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list@exim.test.ex


@@ -160,6 +166,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> using ACL "check_recipient"
 >>> processing "warn"
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> using ACL "check_recipient"
 >>> processing "warn"

+>>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}

 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> new DNS lookup for 15.12.11.V4NET.rbl3.test.ex
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> DNS list check: rbl3.test.ex!=127.0.0.3
 >>> new DNS lookup for 15.12.11.V4NET.rbl3.test.ex


@@ -168,6 +175,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> => there was an exclude match for =127.0.0.3
 >>> warn: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> => there was an exclude match for =127.0.0.3
 >>> warn: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}

 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> DNS list check: rbl3.test.ex=127.0.0.3
 >>> using result of previous DNS lookup

diff --git a/test/stderr/0157 b/test/stderr/0157
index 4980dc9c862e6af3a6481563a3fe2dbb4698e3bf..bcd4f6f7811c91d28c460dfee3efb8ad7b7a8eb4 100644 (file)
--- a/test/stderr/0157
+++ b/test/stderr/0157
@@ -19,6 +19,7 @@
 >>> processing "accept"
 >>> check hosts = V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
 >>> processing "accept"
 >>> check hosts = V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")

+>>>   message: invalid sender

 >>> check senders = userx@test.ex
 >>> x@y.z in "userx@test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> check senders = userx@test.ex
 >>> x@y.z in "userx@test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"


@@ -37,6 +38,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> processing "accept"
 >>> check hosts = V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
 >>> processing "accept"
 >>> check hosts = V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")

+>>>   message: invalid sender

 >>> check senders = userx@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> userx@test.ex in "userx@test.ex"? yes (matched "userx@test.ex")
 >>> check senders = userx@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> userx@test.ex in "userx@test.ex"? yes (matched "userx@test.ex")


@@ -114,6 +116,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> using ACL "check_recipient"
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> using ACL "check_recipient"


@@ -135,5 +138,6 @@ LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted

diff --git a/test/stderr/0234 b/test/stderr/0234
index b382af22d7fd7460c82809f471be8d559d50ff4a..727641b5702764126232f8f2898f7bac80104397 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -13,6 +13,7 @@
 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"

diff --git a/test/stderr/0243 b/test/stderr/0243
index 6b5aca3b3db8a46838473d156431343c2d8d3a64..b8aaf253c08bd9d3be5f7d01196ca8569d7280fc 100644 (file)
--- a/test/stderr/0243
+++ b/test/stderr/0243
@@ -10,6 +10,7 @@
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net

diff --git a/test/stderr/0251 b/test/stderr/0251
index b3d4324999a6354b1baf5a303cc27312503cf773..982d9af3dd4f89825bd2301a3f21430495b857be 100644 (file)
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex


@@ -33,6 +34,7 @@
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> using ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex

diff --git a/test/stderr/0281 b/test/stderr/0281
index 93d75446b7969834bed390c861cef3317f98d4b4..88d08143f21d5efc0eae7670c4ec26dc5eb03651 100644 (file)
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"

+>>>   message: domain doesn't match @ or @[]

 >>> check domains = @ : @[]
 >>> myhost.test.ex in "@ : @[]"? yes (matched "@")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> check domains = @ : @[]
 >>> myhost.test.ex in "@ : @[]"? yes (matched "@")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"


@@ -15,6 +16,7 @@
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"

+>>>   message: domain doesn't match @ or @[]

 >>> check domains = @ : @[]
 >>> [127.0.0.1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> check domains = @ : @[]
 >>> [127.0.0.1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"


@@ -22,12 +24,14 @@
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"

+>>>   message: domain doesn't match @ or @[]

 >>> check domains = @ : @[]
 >>> else.where in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_1"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[]
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 >>> check domains = @ : @[]
 >>> else.where in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_1"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[]
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
 >>> local host has lowest MX
 >>> check domains = @mx_any
 >>> other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
 >>> local host has lowest MX


@@ -37,6 +41,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> check domains = @mx_any
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX


@@ -46,6 +51,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)


@@ -58,6 +64,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_any
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)


@@ -67,12 +74,14 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"
 >>> check domains = @mx_any
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_primary

 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)


@@ -83,6 +92,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't ma
 >>> accept: condition test succeeded in ACL "acl_rcpt_3"
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_3"
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_primary

 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)


@@ -95,6 +105,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't ma
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_primary

 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_primary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)


@@ -104,12 +115,14 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't matc
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_primary

 >>> check domains = @mx_primary
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"
 >>> check domains = @mx_primary
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_secondary

 >>> check domains = @mx_secondary
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> check domains = @mx_secondary
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX


@@ -118,6 +131,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't ma
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_secondary

 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)


@@ -131,6 +145,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't matc
 >>> accept: condition test succeeded in ACL "acl_rcpt_4"
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_4"
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_secondary

 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_secondary
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> ten-2.test.ex in hosts_treat_as_local? no (end of list)


@@ -140,12 +155,14 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't matc
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_secondary

 >>> check domains = @mx_secondary
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"
 >>> check domains = @mx_secondary
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"

+>>>   message: host doesn't match @ or @[]

 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:


@@ -163,6 +180,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't matc
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"

+>>>   message: host doesn't match @ or @[]

 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:


@@ -181,6 +199,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require"

+>>>   message: host doesn't match @ or @[]

 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>> check hosts = @ : @[]
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:


@@ -199,6 +218,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_2"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any

 >>> check domains = @mx_any
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_any
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)


@@ -210,6 +230,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
 >>> using ACL "acl_rcpt_3"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_primary

 >>> check domains = @mx_primary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_primary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)


@@ -220,6 +241,7 @@ MUNGED: ::1 will be omitted in what follows
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_secondary

 >>> check domains = @mx_secondary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> check domains = @mx_secondary
 >>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
 >>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

diff --git a/test/stderr/0304 b/test/stderr/0304
index e8e7e0bb9b150887917ab96bdf85511e560a1622..253287df22a7c612898508b65ae6816e05b5ce54 100644 (file)
--- a/test/stderr/0304
+++ b/test/stderr/0304
@@ -8,32 +8,39 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b1@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b1@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b1@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b1@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> b1@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> b1@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x


@@ -43,38 +50,46 @@
 LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b2@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b2@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b2@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b2@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> b2@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> b2@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x
 >>> b2@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x
 >>> b2@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>>  in "^$"? yes (matched "^$")
 >>> check recipients = b2@x
 >>> check senders = ^\$
 >>>  in "^$"? yes (matched "^$")
 >>> check recipients = b2@x


@@ -84,53 +99,64 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b9@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> x in "domain.only"? no (end of list)
 >>> x in "*.domain2.only"? no (end of list)
 >>> b9@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b9@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> b9@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> b9@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> b9@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x
 >>> b9@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> check recipients = b1@x
 >>> b9@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>>  in "^$"? yes (matched "^$")
 >>> check recipients = b2@x
 >>> b9@x in "b2@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>>  in "^$"? yes (matched "^$")
 >>> check recipients = b2@x
 >>> b9@x in "b2@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -138,18 +164,21 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b in "b"? yes (matched "b")
 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> b in "b"? yes (matched "b")
 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")


@@ -157,50 +186,61 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> ok in "domain.only"? no (end of list)
 >>> ok in "*.domain2.only"? no (end of list)
 >>> ok@ok in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> ok in "domain.only"? no (end of list)
 >>> ok in "*.domain2.only"? no (end of list)
 >>> ok@ok in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@ok in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@ok in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> ok@ok in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> ok@ok in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -208,70 +248,85 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> d.e.f in "domain.only"? no (end of list)
 >>> d.e.f in "*.domain2.only"? no (end of list)
 >>> x@d.e.f in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> d.e.f in "domain.only"? no (end of list)
 >>> d.e.f in "*.domain2.only"? no (end of list)
 >>> x@d.e.f in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@d.e.f in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@d.e.f in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> x@d.e.f in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> x@d.e.f in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -279,92 +334,112 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> at.1 in "domain.only"? no (end of list)
 >>> at.1 in "*.domain2.only"? no (end of list)
 >>> ok@at.1 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> at.1 in "domain.only"? no (end of list)
 >>> at.1 in "*.domain2.only"? no (end of list)
 >>> ok@at.1 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@at.1 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> ok@at.1 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> ok@at.1 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> ok@at.1 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -372,18 +447,22 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain.only in "domain.only"? yes (matched "domain.only")
 >>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
 >>> check recipients = domain.only : *.domain2.only
 >>> domain.only in "domain.only"? yes (matched "domain.only")
 >>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")


@@ -391,18 +470,22 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> abc.domain2.only in "domain.only"? no (end of list)
 >>> abc.domain2.only in "*.domain2.only"? yes (matched "*.domain2.only")
 >>> check recipients = domain.only : *.domain2.only
 >>> abc.domain2.only in "domain.only"? no (end of list)
 >>> abc.domain2.only in "*.domain2.only"? yes (matched "*.domain2.only")


@@ -411,50 +494,61 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain2.only in "domain.only"? no (end of list)
 >>> domain2.only in "*.domain2.only"? no (end of list)
 >>> x@domain2.only in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain2.only in "domain.only"? no (end of list)
 >>> domain2.only in "*.domain2.only"? no (end of list)
 >>> x@domain2.only in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain2.only in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain2.only in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> x@domain2.only in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> x@domain2.only in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -462,24 +556,29 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain3 in "domain.only"? no (end of list)
 >>> domain3 in "*.domain2.only"? no (end of list)
 >>> abc@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain3 in "domain.only"? no (end of list)
 >>> domain3 in "*.domain2.only"? no (end of list)
 >>> abc@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain3 in "domain3"? yes (matched "domain3")
 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain3 in "domain3"? yes (matched "domain3")
 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")


@@ -487,24 +586,29 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> x.domain4 in "domain.only"? no (end of list)
 >>> x.domain4 in "*.domain2.only"? no (end of list)
 >>> xyz@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> x.domain4 in "domain.only"? no (end of list)
 >>> x.domain4 in "*.domain2.only"? no (end of list)
 >>> xyz@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x.domain4 in "*.domain4"? yes (matched "*.domain4")
 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x.domain4 in "*.domain4"? yes (matched "*.domain4")
 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")


@@ -512,51 +616,62 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> x.domain4 in "domain.only"? no (end of list)
 >>> x.domain4 in "*.domain2.only"? no (end of list)
 >>> abc@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> x.domain4 in "domain.only"? no (end of list)
 >>> x.domain4 in "*.domain2.only"? no (end of list)
 >>> abc@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x.domain4 in "domain3"? no (end of list)
 >>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x.domain4 in "domain3"? no (end of list)
 >>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> abc@x.domain4 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> abc@x.domain4 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -564,52 +679,63 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain3 in "domain.only"? no (end of list)
 >>> domain3 in "*.domain2.only"? no (end of list)
 >>> xyz@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain3 in "domain.only"? no (end of list)
 >>> domain3 in "*.domain2.only"? no (end of list)
 >>> xyz@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain3 in "*.domain4"? no (end of list)
 >>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain3 in "*.domain4"? no (end of list)
 >>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> xyz@domain3 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> xyz@domain3 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -617,28 +743,34 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> myhost.test.ex in "domain.only"? no (end of list)
 >>> myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> pqr@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> myhost.test.ex in "domain.only"? no (end of list)
 >>> myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> pqr@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> myhost.test.ex in "@"? yes (matched "@")
 >>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
 >>> check recipients = pqr@@
 >>> myhost.test.ex in "@"? yes (matched "@")
 >>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")


@@ -646,50 +778,61 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> myhost.test.ex in "domain.only"? no (end of list)
 >>> myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> xxx@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> myhost.test.ex in "domain.only"? no (end of list)
 >>> myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> xxx@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> xxx@myhost.test.ex in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> xxx@myhost.test.ex in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -697,42 +840,51 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> domain5 in "b"? no (end of list)
 >>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> domain5 in "b"? no (end of list)
 >>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain5 in "domain.only"? no (end of list)
 >>> domain5 in "*.domain2.only"? no (end of list)
 >>> a@domain5 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain5 in "domain.only"? no (end of list)
 >>> domain5 in "*.domain2.only"? no (end of list)
 >>> a@domain5 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> a@domain5 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> a@domain5 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> a@domain5 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> a@domain5 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")


@@ -740,47 +892,57 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain6 in "domain.only"? no (end of list)
 >>> domain6 in "*.domain2.only"? no (end of list)
 >>> xyz@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain6 in "domain.only"? no (end of list)
 >>> domain6 in "*.domain2.only"? no (end of list)
 >>> xyz@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain6 in "*.domain4"? no (end of list)
 >>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain6 in "*.domain4"? no (end of list)
 >>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> xyz@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> xyz@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")


@@ -788,51 +950,62 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> using ACL "acl1"
 >>> processing "deny"
 LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain6 in "domain.only"? no (end of list)
 >>> domain6 in "*.domain2.only"? no (end of list)
 >>> abc@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain6 in "domain.only"? no (end of list)
 >>> domain6 in "*.domain2.only"? no (end of list)
 >>> abc@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain6 in "domain3"? no (end of list)
 >>> abc@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> domain6 in "domain3"? no (end of list)
 >>> abc@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> abc@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> abc@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"


@@ -840,50 +1013,61 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"
 >>> accept: condition test succeeded in ACL "acl1"
 >>> using ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 1

 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
 >>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 2

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 3

 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 4

 >>> check recipients = domain.only : *.domain2.only
 >>> domain7 in "domain.only"? no (end of list)
 >>> domain7 in "*.domain2.only"? no (end of list)
 >>> x@domain7 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = domain.only : *.domain2.only
 >>> domain7 in "domain.only"? no (end of list)
 >>> domain7 in "*.domain2.only"? no (end of list)
 >>> x@domain7 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 5

 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain7 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = abc@domain3 : xyz@*.domain4
 >>> x@domain7 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 6

 >>> check recipients = pqr@@
 >>> x@domain7 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = pqr@@
 >>> x@domain7 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 7

 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = :
 >>> y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 8

 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check senders = ^\$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 9

 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
 >>> domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 10

 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny"

+>>>   message: failed 11

 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
 >>> deny: condition test succeeded in ACL "acl1"

diff --git a/test/stderr/0325 b/test/stderr/0325
index f834f56c342dfa3f04681f9f0b9a1be69c797e85..727ee56b11d77770fb9ca564999a521d4e12c2a6 100644 (file)
--- a/test/stderr/0325
+++ b/test/stderr/0325
@@ -30,5 +30,6 @@ r4: $local_part_data = LOCAL PART DATA
 >>> a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
 >>> check local_parts = +test_local_parts
 >>> xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)
 >>> a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
 >>> check local_parts = +test_local_parts
 >>> xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)

+>>>   message: \$domain_data=$domain_data \$local_part_data=$local_part_data

 >>> deny: condition test succeeded in ACL "a1"
 LOG: H=[V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
 >>> deny: condition test succeeded in ACL "a1"
 LOG: H=[V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA

diff --git a/test/stderr/0342 b/test/stderr/0342
index c3c65f20a66e0cf6246afd9c02fba1ab495c6963..1e84be464feb6fffcd6194be8bc10c3ab100c01c 100644 (file)
--- a/test/stderr/0342
+++ b/test/stderr/0342
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_rcpt"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_rcpt"
 >>> processing "deny"

+>>>   message: unverifiable

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1

diff --git a/test/stderr/0386 b/test/stderr/0386
index c0f200668046979c0475bd4e8c6741315ec08bdb..b796773d86eaef856739f36d636e9b0edd86974d 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -40,6 +40,8 @@ check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "require"
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "require"

+l_message: Invalid sender
+  message: Couldn't verify the sender

 check verify = sender/defer_ok
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 check verify = sender/defer_ok
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y


@@ -64,6 +66,7 @@ routed by r1 router
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "deny"
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "deny"

+  message: No such user here

 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 SMTP>> 550 No such user here
 LOG: MAIN REJECT
 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 SMTP>> 550 No such user here
 LOG: MAIN REJECT


@@ -83,6 +86,8 @@ check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "require"
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "require"

+l_message: Invalid sender
+  message: Couldn't verify the sender

 check verify = sender/defer_ok
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 check verify = sender/defer_ok
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y


@@ -106,6 +111,7 @@ routed by r1 router
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "deny"
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "deny"

+  message: No such user here

 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 SMTP>> 550 No such user here
 LOG: MAIN REJECT
 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 SMTP>> 550 No such user here
 LOG: MAIN REJECT


@@ -152,6 +158,8 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2
 processing "warn"
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2
 processing "warn"

+  message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
+l_message: found in $dnslist_domain: $dnslist_text

 check dnslists = rbl.test.ex 
 DNS list check: rbl.test.ex
 new DNS lookup for 13.12.11.V4NET.rbl.test.ex
 check dnslists = rbl.test.ex 
 DNS list check: rbl.test.ex
 new DNS lookup for 13.12.11.V4NET.rbl.test.ex


@@ -315,6 +323,8 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl2"
 processing "warn"
 SMTP<< rcpt to:<2@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl2"
 processing "warn"

+  message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
+l_message: found in $dnslist_domain: $dnslist_text

 check dnslists = rbl.test.ex 
 DNS list check: rbl.test.ex
 using result of previous DNS lookup
 check dnslists = rbl.test.ex 
 DNS list check: rbl.test.ex
 using result of previous DNS lookup

diff --git a/test/stderr/0398 b/test/stderr/0398
index 0ad911345993e05ccc9dfe9f53728e4350e8f778..0acc6c21cc5879a6ac549b5a0bfb9f47c0a61ebc 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -146,6 +146,7 @@ wrote callout cache domain record:
 dbfn_write: key=qq@remote
 wrote negative callout cache address record
 ----------- end verify ------------
 dbfn_write: key=qq@remote
 wrote negative callout cache address record
 ----------- end verify ------------

+l_message: $acl_verify_message

 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown


@@ -223,6 +224,7 @@ dbfn_read: key=qq@remote
 callout cache: found address record
 callout cache: address record is negative
 ----------- end verify ------------
 callout cache: found address record
 callout cache: address record is negative
 ----------- end verify ------------

+l_message: $acl_verify_message

 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed

diff --git a/test/stderr/0422 b/test/stderr/0422
index c727372cc0a52de3804c8b63fa1a879a4f60b0db..36cfef60e851c07343d0b3e5a46b9c16f4e9ed7a 100644 (file)
--- a/test/stderr/0422
+++ b/test/stderr/0422
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"

+>>>   message: dnslist_value is $dnslist_value

 >>> check dnslists = rbl.test.ex=127.0.0.2
 >>> DNS list check: rbl.test.ex=127.0.0.2
 >>> new DNS lookup for 1.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.2
 >>> DNS list check: rbl.test.ex=127.0.0.2
 >>> new DNS lookup for 1.13.13.V4NET.rbl.test.ex


@@ -26,6 +27,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"

+>>>   message: dnslist_value is $dnslist_value

 >>> check dnslists = rbl.test.ex=127.0.0.2
 >>> DNS list check: rbl.test.ex=127.0.0.2
 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.2
 >>> DNS list check: rbl.test.ex=127.0.0.2
 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex

diff --git a/test/stderr/0423 b/test/stderr/0423
index 2fd0d33c615d58cc83d830e6645320de13e57ea6..47e674e5284b4ab1d75b83ef9c4ca36e5a6db532 100644 (file)
--- a/test/stderr/0423
+++ b/test/stderr/0423
@@ -8,5 +8,6 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> processing "deny"

+>>>   message: xxxxxxxxxxxxxx has refused this message because it looks like it is infected with the Sobig.E worm. See http://www.xxxx.xxx/xxxxxxxx/xxxx/xxxx/w32.sobig.e@xx.html for details. If you feel this determination is in error, please forward the entire message to postmaster@xxxxxxxxxxxxx.com and include code \"xx#1\" in the Subject

 >>> deny: condition test succeeded in ACL "connect"
 LOG: H=[V4NET.13.13.1] rejected connection in "connect" ACL: xxxxxxxxxxxxxx has refused this message because it looks like it is infected with the Sobig.E worm. See http://www.xxxx.xxx/xxxxxxxx/xxxx/xxxx/w32.sobig.e@xx.html for details. If you feel this determination is in error, please forward the entire message to postmaster@xxxxxxxxxxxxx.com and include code "xx#1" in the Subject
 >>> deny: condition test succeeded in ACL "connect"
 LOG: H=[V4NET.13.13.1] rejected connection in "connect" ACL: xxxxxxxxxxxxxx has refused this message because it looks like it is infected with the Sobig.E worm. See http://www.xxxx.xxx/xxxxxxxx/xxxx/xxxx/w32.sobig.e@xx.html for details. If you feel this determination is in error, please forward the entire message to postmaster@xxxxxxxxxxxxx.com and include code "xx#1" in the Subject

diff --git a/test/stderr/0513 b/test/stderr/0513
index 1a62e61650e1199d1cbb894b6b17832eee62f2bf..5ee113b7cc3b51103054ca6fb287d0c406eafce8 100644 (file)
--- a/test/stderr/0513
+++ b/test/stderr/0513
@@ -17,5 +17,6 @@
 >>> r1 router declined for x@mxt2.test.ex
 >>> no more routers
 >>> ----------- end verify ------------
 >>> r1 router declined for x@mxt2.test.ex
 >>> no more routers
 >>> ----------- end verify ------------

+>>>   message: >$acl_verify_message< ++++

 >>> defer: condition test succeeded in ACL "check_rcpt"
 LOG: H=(a.b.c.d) [1.2.3.4] F=<> temporarily rejected RCPT <x@mxt2.test.ex>: all relevant MX records point to non-existent hosts
 >>> defer: condition test succeeded in ACL "check_rcpt"
 LOG: H=(a.b.c.d) [1.2.3.4] F=<> temporarily rejected RCPT <x@mxt2.test.ex>: all relevant MX records point to non-existent hosts

diff --git a/test/stderr/0524 b/test/stderr/0524
index e466df52eb8adcfa880acbe3891bf047548940d0..d839bc3d3747932febe1491cd27f4016f078ca83 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -10,6 +10,7 @@
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"

+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")


@@ -17,6 +18,7 @@
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"

+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access


@@ -33,6 +35,7 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"

+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access


@@ -42,6 +45,7 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"

+>>>   message: CSA status is $csa_status

 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access

diff --git a/test/stderr/0569 b/test/stderr/0569
index b17c2ac20e5ad77c5e85292eed54d2409946bb93..ea01fa87a52e2e5f0574470618eaf6bb7fb0f502 100644 (file)
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -18,6 +18,7 @@
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"


@@ -43,6 +44,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found


@@ -66,6 +68,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found


@@ -89,6 +92,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found


@@ -112,6 +116,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"


@@ -137,6 +142,7 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
 >>> processing "require"

+>>>   message: ${if def:acl_m_message {$acl_m_message}}

 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
 >>> processing "accept"

diff --git a/test/stderr/1000 b/test/stderr/1000
index 6c0b60394b90c2d2e6d7b4f72dd93a40f6e41d47..faa237ea81e3ffa40b771d3caff38bcde9a6a1a9 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"

+>>> l_message: matched hostlist

 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 >>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
 >>> warn: condition test succeeded in ACL "check_connect"
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 >>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
 >>> warn: condition test succeeded in ACL "check_connect"


@@ -33,6 +34,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"

+>>> l_message: matched hostlist

 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:


@@ -55,6 +57,7 @@ LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected co
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
 >>> processing "warn"

+>>> l_message: matched hostlist

 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:

diff --git a/test/stderr/1002 b/test/stderr/1002
index c1a59fded5375c85eaa05710f2cda0100cf1dc4f..5a91a33c23475efde15876ac74a36a4d71a30313 100644 (file)
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
 >>> processing "require"

+>>>   message: domain doesn't match @ or @[]

 >>> check domains = @ : @[]
 >>> [::1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> check domains = @ : @[]
 >>> [::1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"


@@ -15,6 +16,7 @@
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_6"
 >>> processing "require"
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
 >>> using ACL "acl_rcpt_6"
 >>> processing "require"

+>>>   message: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1

 >>> check domains = <+ @mx_any/ignore=<;127.0.0.1;::1
 >>> ::1 in "<;127.0.0.1;::1"? yes (matched "::1")
 >>> 127.0.0.1 in "<;127.0.0.1;::1"? yes (matched "127.0.0.1")
 >>> check domains = <+ @mx_any/ignore=<;127.0.0.1;::1
 >>> ::1 in "<;127.0.0.1;::1"? yes (matched "::1")
 >>> 127.0.0.1 in "<;127.0.0.1;::1"? yes (matched "127.0.0.1")

diff --git a/test/stderr/2600 b/test/stderr/2600
index 57026026d4471df8e695e9c4cff1a6d0e89fafcd..a1adefa66023b3f1a837b66410f0cf9dc1164a47 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -155,6 +155,7 @@ host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"

+  message: relay not permitted

 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT


@@ -183,6 +184,7 @@ host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny"

+  message: relay not permitted

 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 deny: condition test succeeded in ACL "check_recipient"
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

diff --git a/test/stderr/3400 b/test/stderr/3400
index 0a24b05fb9ad704c58d0b9d889665b1448f94d99..529ce480ca07728e107beaadcfd3d269a395acf6 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -55,6 +55,7 @@ LOG: ETRN #abcd received from [10.0.0.2]
 >>> host in "10.0.0.0/24"? yes (matched "10.0.0.0/24")
 >>> require: condition test succeeded in ACL "check_etrn"
 >>> processing "warn"
 >>> host in "10.0.0.0/24"? yes (matched "10.0.0.0/24")
 >>> require: condition test succeeded in ACL "check_etrn"
 >>> processing "warn"

+>>> l_message: accepted ETRN $smtp_command_argument

 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
 >>> processing "accept"


@@ -85,6 +86,7 @@ LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_vrfy"
 LOG: H=(test.host) [10.0.0.1] rejected VRFY userx@test.ex: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_vrfy"
 LOG: H=(test.host) [10.0.0.1] rejected VRFY userx@test.ex: authentication required


@@ -92,6 +94,7 @@ LOG: H=(test.host) [10.0.0.1] rejected VRFY userx@test.ex: authentication requir
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_expn"
 LOG: H=(test.host) [10.0.0.1] rejected EXPN list@test.ex: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_expn"
 LOG: H=(test.host) [10.0.0.1] rejected EXPN list@test.ex: authentication required


@@ -100,6 +103,7 @@ LOG: ETRN abcd received from (test.host) [10.0.0.1]
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_etrn"
 LOG: H=(test.host) [10.0.0.1] rejected ETRN abcd: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_etrn"
 LOG: H=(test.host) [10.0.0.1] rejected ETRN abcd: authentication required


@@ -119,6 +123,7 @@ LOG: H=(test.host) [10.0.0.1] rejected ETRN abcd: authentication required
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@test.ex>: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@test.ex>: authentication required


@@ -143,6 +148,7 @@ LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@te
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"


@@ -167,6 +173,7 @@ LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@te
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"


@@ -186,12 +193,14 @@ LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@te
 >>> host in "+auth_relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> host in "+auth_relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: relay not permitted

 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> A=mylogin rejected RCPT <userx@cus.cam.ac.uk>: relay not permitted
 >>> using ACL "check_vrfy"
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> A=mylogin rejected RCPT <userx@cus.cam.ac.uk>: relay not permitted
 >>> using ACL "check_vrfy"
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_vrfy"
 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_vrfy"


@@ -208,6 +217,7 @@ LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> A=mylogin rejected RCPT
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_expn"
 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_expn"


@@ -226,6 +236,7 @@ LOG: ETRN #abcd received from (test.host) [10.0.0.1]
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_etrn"
 >>> check !authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_etrn"


@@ -234,6 +245,7 @@ LOG: ETRN #abcd received from (test.host) [10.0.0.1]
 >>> host in "10.0.0.0/24"? yes (matched "10.0.0.0/24")
 >>> require: condition test succeeded in ACL "check_etrn"
 >>> processing "warn"
 >>> host in "10.0.0.0/24"? yes (matched "10.0.0.0/24")
 >>> require: condition test succeeded in ACL "check_etrn"
 >>> processing "warn"

+>>> l_message: accepted ETRN $smtp_command_argument

 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>> processing "accept"
 >>> warn: condition test succeeded in ACL "check_etrn"
 LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>> processing "accept"


@@ -290,6 +302,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>> processing "accept"
 >>> check hosts = +auth_relay_hosts
 >>> host in "+auth_relay_hosts"? yes (matched "+auth_relay_hosts" - cached)
 >>> processing "accept"
 >>> check hosts = +auth_relay_hosts
 >>> host in "+auth_relay_hosts"? yes (matched "+auth_relay_hosts" - cached)

+>>>   message: authentication required

 >>> check authenticated = *
 >>> accept: condition test failed in ACL "check_recipient"
 >>> accept: endpass encountered - denying access
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "check_recipient"
 >>> accept: endpass encountered - denying access


@@ -328,6 +341,7 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu
 >>> processing "accept"
 >>> check hosts = +auth_relay_hosts
 >>> host in "+auth_relay_hosts"? yes (matched "+auth_relay_hosts" - cached)
 >>> processing "accept"
 >>> check hosts = +auth_relay_hosts
 >>> host in "+auth_relay_hosts"? yes (matched "+auth_relay_hosts" - cached)

+>>>   message: authentication required

 >>> check authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> check authenticated = *
 >>> mylogin in "*"? yes (matched "*")
 >>> accept: condition test succeeded in ACL "check_recipient"

diff --git a/test/stderr/3408 b/test/stderr/3408
index 9a59d31f340e0ce5e0dbd43394e702b1069f1d54..7538245581a8de93588d69b2da927bf7b8b049fc 100644 (file)
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -29,6 +29,7 @@
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check !authenticated = *
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex
 >>> check !authenticated = *
 >>> check dnslists = rbl.test.ex
 >>> DNS list check: rbl.test.ex


@@ -78,6 +79,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: host is listed in $dnslist_domain

 >>> check !authenticated = *
 >>> plain in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check !authenticated = *
 >>> plain in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"


@@ -96,6 +98,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "deny"

+>>>   message: unrouteable address

 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex

diff --git a/test/stderr/3410 b/test/stderr/3410
index 6dcb2c5db12f4cf6743ffee0140f942071cb783c..e129996a7872c4973b5ba7743c0c8491c38c09af 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -8,6 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"

+>>>   message: You must authenticate

 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access


@@ -25,6 +26,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"

+>>>   message: You must authenticate

 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
 >>> accept: condition test succeeded in ACL "acl_5_6_9"
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
 >>> accept: condition test succeeded in ACL "acl_5_6_9"

diff --git a/test/stderr/3500 b/test/stderr/3500
index e19c8c9e42b4b6829bc1adcf3452e13a67865ade..ee07be398693266b54dfc4f21f5a60fdc8fed874 100644 (file)
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -49,6 +49,7 @@
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)

+>>>   message: authentication required

 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"


@@ -86,6 +87,7 @@ LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect aut
 >>> processing "warn"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>> processing "warn"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")

+>>>   message: authentication-failed: $authentication_failed

 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "accept"
 >>> check hosts = 10.0.0.5
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "accept"
 >>> check hosts = 10.0.0.5