Move DSN support to mainline

[users/heiko/exim.git] / test / stderr / 0391

diff --git a/test/stderr/0391 b/test/stderr/0391
index 41f7035cbc81e58a53f6f28b835229e691abc9fb..31fd790e9b52d3133a34c032a6bc58503936cea8 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

+DSN: r1 propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]


@@ -30,7 +31,7 @@ processing "accept"
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y

-address match: subject=U@w.x.y pattern=*@*.x.y
+address match test: subject=U@w.x.y pattern=*@*.x.y

 w.x.y in "*.x.y"? yes (matched "*.x.y")
 U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
 LOG: address_rewrite MAIN
 w.x.y in "*.x.y"? yes (matched "*.x.y")
 U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
 LOG: address_rewrite MAIN


@@ -55,7 +56,9 @@ routed by r1 router
 ----------- end verify ------------
 sender U@W.x.y verified ok as U@x.y
 accept: condition test succeeded in ACL "acl_rcpt"
 ----------- end verify ------------
 sender U@W.x.y verified ok as U@x.y
 accept: condition test succeeded in ACL "acl_rcpt"

+end of ACL "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<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN