Callouts: fix recipient verify/random

[exim.git] / test / stderr / 5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index 2c1a986044b003d0a2c3699a7e5edcfd805c77c4..32754009b2ef4b48d76ec2a12ea262bd0639bd5d 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -3,6 +3,10 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------


@@ -23,6 +27,10 @@ no more routers
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------


@@ -41,6 +49,10 @@ q router forced address failure
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------


@@ -62,6 +74,10 @@ q router: defer for "ERROR cannot route this one (ERROR)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------


@@ -81,6 +97,10 @@ q router: defer for "DEFER cannot route this one (DEFER)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------


@@ -108,6 +128,10 @@ routed by q router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing PASS@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing PASS@some.host
 --------> b router <--------


@@ -147,6 +171,10 @@ routed by s router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------


@@ -166,6 +194,10 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------


@@ -220,6 +252,10 @@ routed by pm router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN

 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]


@@ -231,7 +267,9 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 some.name in helo_lookup_domains? no (end of list)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 some.name in helo_lookup_domains? no (end of list)

+host in dsn_advertise_hosts? no (option unset)

 host in pipelining_advertise_hosts? yes (matched "*")
 host in pipelining_advertise_hosts? yes (matched "*")

+host in chunking_advertise_hosts? no (end of list)

 processing "accept"
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 processing "accept"
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>