Logging: avoid claiming a host was used for an addr, when conn refused under TFO

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index 6d2746223d07d32930546a35b0ee7c5b05790330..729f872443541ec5f655bad18ed8207904ffe74e 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -14,10 +14,12 @@ LOG: smtp_connection MAIN
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<>
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<>

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"

-processing "require"
+processing "require" (TESTSUITE/test-config 20)

 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"


@@ -95,7 +97,7 @@ routed by r2 router
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"

-processing "require"
+processing "require" (TESTSUITE/test-config 23)

 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1
 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1


@@ -161,12 +163,14 @@ routed by r2 router
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 25)

 accept: condition test succeeded in ACL "rcpt"
 accept: condition test succeeded in ACL "rcpt"

+end of ACL "rcpt": ACCEPT

 SMTP>> 250 Accepted
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>