tidying

[users/jgh/exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 03b126df8512e5d36c099e04b96e1acfb40de068..4756eb62f982b1106e9f62b671f751462bae49fa 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -21,7 +21,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -47,11 +47,12 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 set transport t2
 finding IP address for 127.0.0.1
 calling host_find_byname
+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
@@ -62,7 +63,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL
 routed by r2 router
   envelope to: qq@remote
   transport: t2
@@ -70,7 +71,7 @@ routed by r2 router
 ----------- end verify ------------
 sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
-processing "warn"
+processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -96,10 +97,11 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
@@ -110,7 +112,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL
 routed by r2 router
   envelope to: qq@remote
   transport: t2
@@ -128,7 +130,7 @@ callout cache: no address record found for qq@remote
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
@@ -165,7 +167,7 @@ l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown
-processing "accept"
+processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -173,10 +175,9 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -184,7 +185,7 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
 deny: condition test failed in ACL "rcpt"
-processing "warn"
+processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -210,10 +211,11 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
@@ -224,7 +226,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL
 routed by r2 router
   envelope to: qq@remote
   transport: t2
@@ -247,7 +249,7 @@ l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
-processing "accept"
+processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -255,10 +257,9 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>