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

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

diff --git a/test/stderr/0414 b/test/stderr/0414
index 759e0f3bf681071dd8d8dee4e77919f91de7073a..f1edd1ae3b76248c41d5e231fd0a64d90cef4452 100644 (file)
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -3,6 +3,7 @@ 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
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME


@@ -19,32 +20,32 @@ local_part=x domain=b.domain
 checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
 search_find: file="TESTSUITE/aux-fixed/0414.list1"
 checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
 search_find: file="TESTSUITE/aux-fixed/0414.list1"

-  key="b.domain" partial=-1 affix=NULL starflags=0
+  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
 LRU list:
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"

-  type=lsearch key="b.domain"
+  type=lsearch key="b.domain" opts=NULL

 file lookup required for b.domain
   in TESTSUITE/aux-fixed/0414.list1
 lookup failed
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
 search_find: file="TESTSUITE/aux-fixed/0414.list2"
 file lookup required for b.domain
   in TESTSUITE/aux-fixed/0414.list1
 lookup failed
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
 search_find: file="TESTSUITE/aux-fixed/0414.list2"

-  key="b.domain" partial=-1 affix=NULL starflags=0
+  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
   0TESTSUITE/aux-fixed/0414.list2
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
 LRU list:
   0TESTSUITE/aux-fixed/0414.list2
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"

-  type=lsearch key="b.domain"
+  type=lsearch key="b.domain" opts=NULL

 file lookup required for b.domain
   in TESTSUITE/aux-fixed/0414.list2
 lookup yielded: b.domain-data
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
 file lookup required for b.domain
   in TESTSUITE/aux-fixed/0414.list2
 lookup yielded: b.domain-data
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")

-data from lookup saved for cache for +B: b.domain-data
+data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'

 b.domain in "+A : +B"? yes (matched "+B")
 b.domain in "+A : +B"? yes (matched "+B")

-data from lookup saved for cache for +C: b.domain-data
+data from lookup saved for cache for +C: key 'b.domain' value 'b.domain-data'

 b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------


@@ -77,20 +78,20 @@ checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0414.list1"
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0414.list1"

-  key="a.domain" partial=-1 affix=NULL starflags=0
+  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
   0TESTSUITE/aux-fixed/0414.list1
   0TESTSUITE/aux-fixed/0414.list2
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
 LRU list:
   0TESTSUITE/aux-fixed/0414.list1
   0TESTSUITE/aux-fixed/0414.list2
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"

-  type=lsearch key="a.domain"
+  type=lsearch key="a.domain" opts=NULL

 file lookup required for a.domain
   in TESTSUITE/aux-fixed/0414.list1
 lookup yielded: a.domain-data
 a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
 file lookup required for a.domain
   in TESTSUITE/aux-fixed/0414.list1
 lookup yielded: a.domain-data
 a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")

-data from lookup saved for cache for +A: a.domain-data
+data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'

 a.domain in "+A : +B"? yes (matched "+A")
 a.domain in "+A : +B"? yes (matched "+A")

-data from lookup saved for cache for +C: a.domain-data
+data from lookup saved for cache for +C: key 'a.domain' value 'a.domain-data'

 a.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 a.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------


@@ -99,13 +100,13 @@ checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0414.list2"
 search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0414.list2"

-  key="a.domain" partial=-1 affix=NULL starflags=0
+  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL

 LRU list:
   0TESTSUITE/aux-fixed/0414.list2
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
 LRU list:
   0TESTSUITE/aux-fixed/0414.list2
   0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"

-  type=lsearch key="a.domain"
+  type=lsearch key="a.domain" opts=NULL

 file lookup required for a.domain
   in TESTSUITE/aux-fixed/0414.list2
 lookup failed
 file lookup required for a.domain
   in TESTSUITE/aux-fixed/0414.list2
 lookup failed


@@ -131,4 +132,4 @@ routed by r3 router
   envelope to: x@a.domain
   transport: t1
 search_tidyup called
   envelope to: x@a.domain
   transport: t1
 search_tidyup called

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