Build: fix Solaris

[exim.git] / test / stderr / 4052

diff --git a/test/stderr/4052 b/test/stderr/4052
index 3b9772c5c0df36a3faf50bc15ba52b9373c8bdf6..3de6f8289624d8590c78007dc18c35cce4b02211 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -3,12 +3,16 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss

+fresh-exec forking for local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> extchange@test.ex <--------
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> extchange@test.ex <--------

+local-accept-delivery forking for transport

 smtp transport entered
   extchange@test.ex
 hostlist:
 smtp transport entered
   extchange@test.ex
 hostlist:


@@ -17,9 +21,9 @@ checking status of 127.0.0.1
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable

-delivering 10HmbG-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
+delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)

 Transport port=25 replaced by host-specific port=1225
 Transport port=25 replaced by host-specific port=1225

-EHLO response bits from cache: cleartext 0x0220 crypted 0x0000
+EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000

 Using cached cleartext PIPE_CONNECT
   SMTP>> EHLO the.local.host.name
 using PIPELINING
 Using cached cleartext PIPE_CONNECT
   SMTP>> EHLO the.local.host.name
 using PIPELINING


@@ -29,17 +33,17 @@ not using DSN
   SMTP>> DATA
 cmd buf flush ddd bytes
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data
   SMTP>> DATA
 cmd buf flush ddd bytes
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data

-connected
+ connected

 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
          250-X_PIPE_CONNECT
 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
          250-X_PIPE_CONNECT

-         250-STARTTLS
+         250-SIZE

          250 ok
          250 ok

-EHLO cleartext extensions changed, 0x0220/0x0000 -> 0x0221/0x0000
-writing clr 0221/0000 cry 0000/0000
+EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
+writing clr 0160/0000 cry 0000/0000

 sync_responses expect mail
   SMTP<< 250 mail-from accepted
 sync_responses expect rcpt
 sync_responses expect mail
   SMTP<< 250 mail-from accepted
 sync_responses expect rcpt


@@ -57,12 +61,13 @@ no messages waiting for 127.0.0.1
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>

+local-accept-delivery forked for transport: npppp

 Leaving smtp transport
 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed
 Leaving smtp transport
 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 
 ******** SERVER ********