Fix bounce generation under RFC 3461 request. Bug 2411

[exim.git] / test / stderr / 0361

diff --git a/test/stderr/0361 b/test/stderr/0361
index e95185570387bb5d7162f4a4cd0395ef6abb005f..64e47dff7b053225790f88334bc8d9083e3e5fbb 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -40,11 +40,11 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.pppp
-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |kilos@recurse.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
+DSN: Write SPOOL: -dsn_envid NULL
+DSN: Write SPOOL  :-dsn_ret 0
+DSN: Flags: 0x0
+DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
@@ -57,6 +57,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
@@ -71,7 +72,7 @@ Empty Tree
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=0 message_linecount=7
-DSN: set orcpt:   flags: 0
+DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
  locking TESTSUITE/spool/db/retry.lockfile
@@ -235,7 +236,7 @@ set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 DSN: processing router : r4
 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex
 DSN: Sender_address: CALLER@test.ex
-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: kilos@recurse.test.ex.test.ex
 DSN: Remote SMTP server supports DSN: 0
@@ -243,7 +244,7 @@ DSN: not sending DSN success message
 DSN: processing router : r3
 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex
 DSN: Sender_address: CALLER@test.ex
-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: kilos@recurse.test.ex.test.ex
 DSN: Remote SMTP server supports DSN: 0