Fix bounce generation under RFC 3461 request. Bug 2411

[exim.git] / test / stderr / 2610

diff --git a/test/stderr/2610 b/test/stderr/2610
index 69ff1213ca77a790e447a958db9040c3968444fc..f9e073f2f83011fa15d6519bf3dcf98877d1c233 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -1,6 +1,7 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+dropping to exim gid; retaining priv uid
 search_open: mysql "NULL"
 search_find: file="NULL"
   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
@@ -313,10 +314,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmaX-0005vi-00
        for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |ph10@myhost.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Write SPOOL: -dsn_envid NULL
+DSN: Write SPOOL  :-dsn_ret 0
+DSN: Flags: 0x0
+DSN: **** SPOOL_OUT - address: <ph10@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
@@ -330,6 +331,7 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -344,7 +346,7 @@ Empty Tree
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=7
-DSN: set orcpt:   flags: 0
+DSN: set orcpt:   flags: 0x0
 Delivery address list:
   ph10@myhost.test.ex 
  locking TESTSUITE/spool/db/retry.lockfile
@@ -456,7 +458,7 @@ end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: ph10@myhost.test.ex
 DSN: Sender_address: CALLER@myhost.test.ex
-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: ph10@myhost.test.ex
 DSN: Remote SMTP server supports DSN: 0