Merge branch 'master' into transp_logging_1031

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

diff --git a/test/stderr/5005 b/test/stderr/5005
index a471ce79a8cc500cd3984d88b9ab31d04ec1e5fd..e61cc77b927848916882ef2dc7aa4d97ed1dc17e 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -188,9 +188,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line


@@ -356,9 +356,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line


@@ -493,7 +493,7 @@ locked TESTSUITE/spool/db/retry.lockfile
 EXIM_DBOPEN(TESTSUITE/spool/db/retry)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
 EXIM_DBOPEN(TESTSUITE/spool/db/retry)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR

-address match: subject=userx@test.ex pattern=*
+address match test: subject=userx@test.ex pattern=*

 test.ex in "*"? yes (matched "*")
 userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0
 test.ex in "*"? yes (matched "*")
 userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0


@@ -535,9 +535,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line


@@ -665,7 +665,7 @@ locked TESTSUITE/spool/db/retry.lockfile
 EXIM_DBOPEN(TESTSUITE/spool/db/retry)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
 EXIM_DBOPEN(TESTSUITE/spool/db/retry)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR

-address match: subject=userx@test.ex pattern=*
+address match test: subject=userx@test.ex pattern=*

 test.ex in "*"? yes (matched "*")
 userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0
 test.ex in "*"? yes (matched "*")
 userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0