Logging: Add "D=" to more connection closure log lines. Bug 2434

[exim.git] / test / stderr / 0628

diff --git a/test/stderr/0628 b/test/stderr/0628
index ce0ca7c1130981561a4be44d5dfa4b8df592b6c7..215206a827c9507388a0f218e7ed1e4b6bdb844a 100644 (file)
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -22,15 +22,13 @@
 01:01:01 p1237  SMTP<< QUIT
 01:01:01 p1237  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1237  LOG: smtp_connection MAIN
 01:01:01 p1237  SMTP<< QUIT
 01:01:01 p1237  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1237  LOG: smtp_connection MAIN

-01:01:01 p1237    SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+01:01:01 p1237    SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT

 01:01:01 p1239  Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=p1239 D=fff9ffff
 01:01:01 p1239  macros_trusted overridden to true by whitelisting
 01:01:01 p1239  changed uid/gid: forcing real = effective
 01:01:01 p1239    uid=uuuu gid=EXIM_GID pid=p1239
 01:01:01 p1239  Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=p1239 D=fff9ffff
 01:01:01 p1239  macros_trusted overridden to true by whitelisting
 01:01:01 p1239  changed uid/gid: forcing real = effective
 01:01:01 p1239    uid=uuuu gid=EXIM_GID pid=p1239

-01:01:01 p1239  list element: PATH
-01:01:01 p1239  list element: PATH
-01:01:01 p1239  list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-01:01:01 p1239  list element: PATH
+01:01:01 p1239  environment after trimming:
+01:01:01 p1239   PATH=<munged>

 01:01:01 p1239  adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 01:01:01 p1239  configuration file is TESTSUITE/test-config
 01:01:01 p1239  trusted user
 01:01:01 p1239  adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 01:01:01 p1239  configuration file is TESTSUITE/test-config
 01:01:01 p1239  trusted user


@@ -138,7 +136,7 @@
 01:01:01 p1240  SMTP<< QUIT
 01:01:01 p1240  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1240  LOG: smtp_connection MAIN
 01:01:01 p1240  SMTP<< QUIT
 01:01:01 p1240  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1240  LOG: smtp_connection MAIN

-01:01:01 p1240    SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+01:01:01 p1240    SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT

 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  SMTP>>(close on process exit)
 01:01:01 p1240  >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  SMTP>>(close on process exit)
 01:01:01 p1240  >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>