Cancel in-progress or reject requeted cutthrough when fakereject. Bug 1475

[users/heiko/exim.git] / test / stderr / 3500

diff --git a/test/stderr/3500 b/test/stderr/3500
index 87179790de0466df40cd158eec2719baccf81e2e..e19c8c9e42b4b6829bc1adcf3452e13a67865ade 100644 (file)
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -28,7 +28,7 @@
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890

->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:

 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""


@@ -37,26 +37,26 @@
 >>> processing "warn"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> processing "warn"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)

->>> warn: condition test failed
+>>> warn: condition test failed in ACL "check_recipient"

 >>> processing "accept"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> processing "accept"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"

 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"

 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")
 >>> processing "deny"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")

->>> deny: condition test failed
+>>> deny: condition test failed in ACL "check_recipient"

 >>> processing "accept"
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> processing "accept"
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"

 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss
 >>> host in hosts_connection_nolog? no (option unset)


@@ -76,7 +76,7 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890

->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:

 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""


@@ -86,10 +86,10 @@ 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")

->>> warn: condition test succeeded
+>>> warn: condition test succeeded in ACL "check_recipient"

 >>> processing "accept"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>> processing "accept"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"

 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaZ-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaZ-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss