Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 5403

diff --git a/test/stderr/5403 b/test/stderr/5403
index 49d3574fe7b344abc3977390322606b8879b6997..8d6f97c9aee27f0c80a2d15780f39dd1ab0c6a22 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -11,6 +11,7 @@
 LOG: no host name found for IP address 1.2.3.4
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 LOG: no host name found for IP address 1.2.3.4
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "ar"
 >>> processing "warn"
 >>> check control = cutthrough_delivery
 >>> using ACL "ar"
 >>> processing "warn"
 >>> check control = cutthrough_delivery


@@ -39,6 +40,7 @@ LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=es
 LOG: no host name found for IP address 1.2.3.4
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 LOG: no host name found for IP address 1.2.3.4
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "ar"
 >>> processing "warn"
 >>> check control = cutthrough_delivery
 >>> using ACL "ar"
 >>> processing "warn"
 >>> check control = cutthrough_delivery


@@ -65,27 +67,29 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=127.0.0.1 address=127.0.0.1
 >>> routed by all router
 >>> Attempting full verification using callout
 >>>   name=127.0.0.1 address=127.0.0.1
 >>> routed by all router
 >>> Attempting full verification using callout

->>> callout cache: no domain record found for domain.com
->>> callout cache: no address record found for verify@domain.com/<CALLER@myhost.test.ex>
+>>> callout cache: disabled by no_cache

 >>> interface=ip4.ip4.ip4.ip4 port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> interface=ip4.ip4.ip4.ip4 port=1224
 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex

+>>> cmd buf flush 21 bytes

 >>>   SMTP<< 250 OK
 >>> 127.0.0.1 in hosts_require_auth? no (option unset)
 >>>   SMTP<< 250 OK
 >>> 127.0.0.1 in hosts_require_auth? no (option unset)

->>>   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
+>>>   SMTP>> MAIL FROM:<sender@myhost.test.ex>
+>>> cmd buf flush 35 bytes

 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<verify@domain.com>
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<verify@domain.com>

+>>> cmd buf flush 29 bytes

 >>>   SMTP<< 250 OK
 >>>   SMTP<< 250 OK

->>> wrote callout cache domain record:
->>>   result=1 postmaster=0 random=0
->>> wrote positive callout cache address record
+>>> holding verify callout open for cutthrough delivery

 >>> ----------- end verify ------------
 >>> warn: condition test succeeded in ACL "ar"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 >>>   SMTP>> QUIT
 >>> ----------- end verify ------------
 >>> warn: condition test succeeded in ACL "ar"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 >>>   SMTP>> QUIT

+>>>   SMTP<< 220 OK
+>>>   SMTP(close)>>

 >>> ----------- cutthrough shutdown (host-checking mode) ------------
 >>> ----------- cutthrough shutdown (host-checking mode) ------------

-LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com
+LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com