Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 2202

diff --git a/test/stderr/2202 b/test/stderr/2202
index ba331d76a9a2000b44d9b1fff9063a21f8fb0a0e..2c595a6dd9d824f90cc87c4a85cbaa13a082eaf7 100644 (file)
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -30,19 +30,22 @@ SMTP<< rcpt to:<a@b>
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domain : ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domain : ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}

-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns"
-database lookup required for >:defer_never,mxh=cioce.test.again.dns
-dnsdb key: cioce.test.again.dns
+ search_open: dnsdb "NULL"
+ search_find: file="NULL"
+   key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns" opts=NULL
+ database lookup required for >:defer_never,mxh=cioce.test.again.dns
+ dnsdb key: cioce.test.again.dns

 DNS lookup of cioce.test.again.dns (MX) using fakens
 DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS lookup of cioce.test.again.dns (MX) using fakens
 DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH

-lookup failed
+DNS: no SOA record found for neg-TTL
+ writing neg-cache entry for cioce.test.again.dns-MX-xxxx, ttl -1
+ creating new cache entry
+ lookup failed

 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4
 DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4
 DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens


@@ -62,7 +65,9 @@ DNS lookup of cioce.test.again.dns (A) using fakens
 DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH

-get[host|ipnode]byname[2] returned 1 (HOST_NOT_FOUND)
+DNS: no SOA record found for neg-TTL
+ writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])


@@ -78,4 +83,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>