Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / stderr / 3210

diff --git a/test/stderr/3210 b/test/stderr/3210
index b80a287385cbc20c98c925ef521704aa335fc6c8..312fdc371b505fef05039c29e686e1f3ba04fb11 100644 (file)
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -3,9 +3,9 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

-DSN: r1 propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


@@ -20,10 +20,10 @@ local_part=userx domain=test.ex
 checking domains
 search_open: testdb "NULL"
 search_find: file="NULL"
 checking domains
 search_open: testdb "NULL"
 search_find: file="NULL"

-  key="defer" partial=-1 affix=NULL starflags=0
+  key="defer" 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="defer"
+  type=testdb key="defer" opts=NULL

 database lookup required for defer
 testdb lookup forced DEFER
 lookup deferred: testdb lookup forced DEFER
 database lookup required for defer
 testdb lookup forced DEFER
 lookup deferred: testdb lookup forced DEFER


@@ -32,4 +32,4 @@ test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
 test.ex in "! +local_domains"? list match deferred for ! +local_domains
 domains check lookup or other defer
 search_tidyup called
 test.ex in "! +local_domains"? list match deferred for ! +local_domains
 domains check lookup or other defer
 search_tidyup called

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