git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use dsn_from for success-DSN messages. Bug 2404
[exim.git] / test / stderr / 0398
diff --git a/test/stderr/0398 b/test/stderr/0398
index f61f37457536ccd703ff0a840d4d6b609a163809..774f3801761ddaf1ea58e70646b0974fa7054dfd 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -49,8 +47,8 @@ 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
@@ -98,8 +96,8 @@ 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
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
@@ -118,17 +116,17 @@ routed by r2 router
   transport: t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags 0x2
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
-dbfn_read: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
+ dbfn_read: key=remote
 callout cache: found domain record for remote
-dbfn_read: key=qq@remote
+ dbfn_read: key=qq@remote
 callout cache: no address record found for qq@remote
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
@@ -144,23 +142,24 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
 cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP(close)>>
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags 0x42
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
-dbfn_write: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
+ dbfn_write: key=remote
 wrote callout cache domain record for remote:
   result=1 postmaster=0 random=0
-dbfn_write: key=qq@remote
+ dbfn_write: key=qq@remote
 wrote negative callout cache address record for qq@remote
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
@@ -211,8 +210,8 @@ 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
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
@@ -231,18 +230,18 @@ routed by r2 router
   transport: t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags 0x2
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
-dbfn_read: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
+ dbfn_read: key=remote
 callout cache: found domain record for remote
-dbfn_read: key=qq@remote
+ dbfn_read: key=qq@remote
 callout cache: found address record for qq@remote
 callout cache: address record is negative
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
@@ -262,4 +261,4 @@ SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository