X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/0381?ds=sidebyside

diff --git a/test/stderr/0381 b/test/stderr/0381
index 20ba8f7eb..550e2dab9 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -41,12 +25,12 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
@@ -60,7 +44,8 @@ SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex
-list element: *.gov.uk.test.ex
+host in "*.gov.uk.test.ex"?
+ list element: *.gov.uk.test.ex
 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
@@ -82,22 +67,25 @@ Forward DNS security status: unverified
 sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
 	([V4NET.99.99.97] helo=test ident=CALLER)
-host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
+  host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 check hosts = !*.gov.uk.test.ex
-list element: !*.gov.uk.test.ex
-host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
+host in "!*.gov.uk.test.ex"?
+ list element: !*.gov.uk.test.ex
+  host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 19)
 check hosts = *.co.uk.test.ex
-list element: *.co.uk.test.ex
-host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
+host in "*.co.uk.test.ex"?
+ list element: *.co.uk.test.ex
+  host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 20)
 check hosts = !*.co.uk.test.ex
-list element: !*.co.uk.test.ex
-host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
+host in "!*.co.uk.test.ex"?
+ list element: !*.co.uk.test.ex
+  host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 accept: condition test succeeded in ACL "check_rcpt"
@@ -106,6 +94,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>