Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0021

diff --git a/test/stderr/0021 b/test/stderr/0021
index 18ed27f0c4a3a008d14de252a3230bff1cdc3d37..2f1b9a215b885b92e18c54748ea233e90fe48338 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -1,29 +1,5 @@
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -59,8 +35,6 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
-host in pipelining_connect_advertise_hosts?
- list element: 
 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)
@@ -110,9 +84,9 @@ ok@test1 in "ok@test1 : ok@test3"?
   test1 in "test1"? yes (matched "test1")
  ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender
-ok in "!bad"?
+ok in local_parts?
  list element: !bad
-ok in "!bad"? yes (end of list)
+ok in local_parts? yes (end of list)
 ----------- end verify ------------
 sender ok@test1 verified ok
 check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
@@ -180,35 +154,11 @@ LOG: PANIC
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -244,8 +194,6 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
-host in pipelining_connect_advertise_hosts?
- list element: 
 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)
@@ -276,9 +224,9 @@ ok@test3 in "ok@test1 : ok@test3"?
   test3 in "test3"? yes (matched "test3")
  ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender
-ok in "!bad"?
+ok in local_parts?
  list element: !bad
-ok in "!bad"? yes (end of list)
+ok in local_parts? yes (end of list)
 ----------- end verify ------------
 sender ok@test3 verified ok
 check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
@@ -336,28 +284,22 @@ end of ACL "rcpt": ACCEPT
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-x in "!bad"?
+x in local_parts?
  list element: !bad
-x in "!bad"? yes (end of list)
+x in local_parts? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
-1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 no recipients found in headers