Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stderr / 3201

diff --git a/test/stderr/3201 b/test/stderr/3201
index 0dd94ca5412ca099e86ddf12b965888d225c0846..70d48576bf0374c45bfc504a66413caa564668f3 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config


@@ -23,16 +24,18 @@ host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect1"
 processing "deny" (TESTSUITE/test-config 18)
 check hosts = testdb;fail
 using ACL "connect1"
 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 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"?
+ 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
 host in "testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect1"
 end of ACL "connect1": implicit DENY


@@ -42,6 +45,7 @@ LOG: connection_reject MAIN REJECT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> 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=p1235
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config


@@ -66,16 +70,18 @@ host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect2"
 processing "deny" (TESTSUITE/test-config 21)
 check hosts = net-testdb;fail
 using ACL "connect2"
 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 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"?
+ 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
 host in "net-testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect2"
 end of ACL "connect2": implicit DENY