Malware: make "sock" cmdline default usable. Bug 2111

[exim.git] / test / stderr / 0391

diff --git a/test/stderr/0391 b/test/stderr/0391
index 9ef82907441591cfcab197f9d3cc454b445af064..783db01c535bce88073cd3f70a8725ae637fbd01 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]


@@ -20,17 +21,19 @@ host in recipient_unqualified_hosts? no (option unset)
 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)
 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)

-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<U@W.x.y>
 smtp_setup_msg entered
 SMTP<< mail from:<U@W.x.y>

-SMTP>> 250 OK\r
+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:<B@a.b.c>
 using ACL "acl_rcpt"
 processing "accept"
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y
 SMTP<< rcpt to:<B@a.b.c>
 using ACL "acl_rcpt"
 processing "accept"
 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


@@ -54,10 +57,12 @@ routed by r1 router
   transport: <none>
 ----------- end verify ------------
 sender U@W.x.y verified ok as U@x.y
   transport: <none>
 ----------- end verify ------------
 sender U@W.x.y verified ok as U@x.y

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "acl_rcpt"
+end of ACL "acl_rcpt": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called