Testsuite: pid tracking

[exim.git] / test / stderr / 3400

diff --git a/test/stderr/3400 b/test/stderr/3400
index da04b7f3737ba2991e1d181bcae4725e0cf01a0d..836dab2026ff5bdf3a6fb087da610b436c8eb949 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -14,6 +14,7 @@
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> accept: condition test succeeded in ACL "check_connect"
 >>> end of ACL "check_connect": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 67)
@@ -47,7 +48,7 @@
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> list in "userx"? no (end of list)
 >>> no more routers
-LOG: ETRN #abcd received from [10.0.0.2]
+LOG: ETRN #abcd received from (test) [10.0.0.2]
 >>> using ACL "check_etrn"
 >>> processing "deny" (TESTSUITE/test-config 53)
 >>> check hosts = +auth_hosts
@@ -60,7 +61,7 @@ LOG: ETRN #abcd received from [10.0.0.2]
 >>> processing "warn" (TESTSUITE/test-config 57)
 >>> l_message: accepted ETRN $smtp_command_argument
 >>> warn: condition test succeeded in ACL "check_etrn"
-LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
+LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd
 >>> processing "accept" (TESTSUITE/test-config 58)
 >>> accept: condition test succeeded in ACL "check_etrn"
 >>> end of ACL "check_etrn": ACCEPT
@@ -390,14 +391,14 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu
 >>> host in chunking_advertise_hosts? no (end of list)
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -438,23 +439,23 @@ host in "10.0.0.1"? no (end of list)
 host in "10.0.0.4"? no (end of list)
 host in "10.0.0.3 : 10.0.0.4"? no (end of list)
 host in auth_advertise_hosts? yes (matched "10.0.0.5")
-Evaluating advertise_condition for mylogin athenticator
-Evaluating advertise_condition for PLAIN athenticator
-Evaluating advertise_condition for EXPLAIN athenticator
-Evaluating advertise_condition for EXPANDED athenticator
-Evaluating advertise_condition for EXPANDFAIL athenticator
-Evaluating advertise_condition for DEFER athenticator
-Evaluating advertise_condition for LOGIN athenticator
+Evaluating advertise_condition for mylogin mylogin athenticator
+Evaluating advertise_condition for plain PLAIN athenticator
+Evaluating advertise_condition for extended_plain EXPLAIN athenticator
+Evaluating advertise_condition for expanded_prompt_plain EXPANDED athenticator
+Evaluating advertise_condition for expanded_prompt_plain_fail EXPANDFAIL athenticator
+Evaluating advertise_condition for defer DEFER athenticator
+Evaluating advertise_condition for login LOGIN athenticator
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
-250-SIZE 52428800
-250-8BITMIME
-250-ETRN
-250-VRFY
-250-EXPN
-250-PIPELINING
-250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
-250 HELP
+       250-SIZE 52428800
+       250-8BITMIME
+       250-ETRN
+       250-VRFY
+       250-EXPN
+       250-PIPELINING
+       250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+       250 HELP
 SMTP<< auth mylogin dXNlcnggc2VjcmV0
 auth input decode: 'userx secret'
 mylogin authenticator server_condition:
@@ -468,4 +469,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>