ARC: reset headers before signing for secondary MX. Bug 2886

[exim.git] / test / stderr / 3201

diff --git a/test/stderr/3201 b/test/stderr/3201
index 333afbc1f11af6bbff8b2a4f966524485fae8caf..601a9ec851b3cdcd6fde4bb6cd4711ac11281d8a 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -25,12 +25,13 @@ processing "deny" (TESTSUITE/test-config 18)
 check hosts = testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"
 check hosts = testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"

-  key="fail" partial=-1 affix=NULL starflags=0
+  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
 internal_search_find: file="NULL"
 LRU list:
 internal_search_find: file="NULL"

-  type=testdb key="fail"
+  type=testdb key="fail" opts=NULL

 database lookup required for fail
 testdb lookup forced FAIL
 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"
 lookup failed
 host in "testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect1"


@@ -39,7 +40,7 @@ SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -67,12 +68,13 @@ processing "deny" (TESTSUITE/test-config 21)
 check hosts = net-testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"
 check hosts = net-testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"

-  key="fail" partial=-1 affix=NULL starflags=0
+  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
 internal_search_find: file="NULL"
 LRU list:
 internal_search_find: file="NULL"

-  type=testdb key="fail"
+  type=testdb key="fail" opts=NULL

 database lookup required for fail
 testdb lookup forced FAIL
 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"
 lookup failed
 host in "net-testdb;fail"? no (end of list)
 deny: condition test failed in ACL "connect2"


@@ -81,4 +83,4 @@ SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.2] rejected connection in "connect" ACL
 search_tidyup called
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.2] rejected connection in "connect" ACL
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>