Merge branch 'master' into 4.next

[exim.git] / test / stderr / 3201

diff --git a/test/stderr/3201 b/test/stderr/3201
index 096248f45a920f6f0ddbe454f7f3629b958bc340..70d48576bf0374c45bfc504a66413caa564668f3 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [10.0.0.1]
@@ -21,32 +22,36 @@ 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)
 using ACL "connect1"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 18)
 check hosts = testdb;fail
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="fail" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=testdb key="fail"
-database lookup required for fail
-testdb lookup forced FAIL
-lookup failed
+host in "testdb;fail"?
+ list element: testdb;fail
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=testdb key="fail" opts=NULL
+ database lookup required for fail
+ testdb lookup forced FAIL
+ creating new cache entry
+ lookup failed
 host in "testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect1"
 end of ACL "connect1": implicit DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG: connection_reject MAIN REJECT
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1235
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [10.0.0.2]
@@ -63,22 +68,25 @@ 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)
 using ACL "connect2"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 21)
 check hosts = net-testdb;fail
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="fail" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=testdb key="fail"
-database lookup required for fail
-testdb lookup forced FAIL
-lookup failed
+host in "net-testdb;fail"?
+ list element: net-testdb;fail
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=testdb key="fail" opts=NULL
+ database lookup required for fail
+ testdb lookup forced FAIL
+ creating new cache entry
+ lookup failed
 host in "net-testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect2"
 end of ACL "connect2": implicit DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG: connection_reject MAIN REJECT
   H=[10.0.0.2] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>