Fix logging of delivery port for callout lazy-close, when port specified by router

[users/jgh/exim.git] / test / stderr / 0085

diff --git a/test/stderr/0085 b/test/stderr/0085
index 675c6452c0e0a8c4c7500995a6fd451a3b34541b..fb6810575e1987be3daf77ade2a8de202232b1ee 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -5,6 +5,9 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
 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
@@ -48,7 +51,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
@@ -62,18 +65,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 calling smart1 router
@@ -117,7 +120,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
@@ -131,18 +134,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 checking require_files
@@ -151,7 +154,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex.files" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex.files"
@@ -204,6 +207,9 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
 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
@@ -247,7 +253,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
@@ -261,18 +267,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart1 router skipped: senders mismatch
 --------> fail_remote_domains router <--------
@@ -314,7 +320,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
@@ -328,18 +334,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart2 router skipped: senders mismatch
 no more routers