TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 0169

diff --git a/test/stderr/0169 b/test/stderr/0169
index 40297679c54a46a3f2cf51a7dad23c98634a67e7..55fd2bcb093293382ffe7b47ac47585d5682555e 100644 (file)
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -3,8 +3,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex 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
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -12,8 +10,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@myhost.test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@myhost.test.ex <--------

-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp

 appendfile transport entered
 appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
   file=TESTSUITE/test-mail/userx format=unix
 appendfile transport entered
 appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
   file=TESTSUITE/test-mail/userx format=unix


@@ -21,6 +17,7 @@ appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 

+de-tainting path 'TESTSUITE/test-mail/userx'

 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created


@@ -40,5 +37,5 @@ LOG: MAIN
   => userx <userx@myhost.test.ex> R=localuser T=appendfile
 LOG: MAIN
   Completed
   => userx <userx@myhost.test.ex> R=localuser T=appendfile
 LOG: MAIN
   Completed

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