tidying

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index 1d2b22b961d99bf2ff5fedb6c9387c8650917c52..aa91bff38a4efe8cf862f1305619ca5c1d19cd22 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config


@@ -54,12 +55,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains

-domain1 in "+special_domains"?
+domain1 in domains?

  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1

- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)

 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)


@@ -79,7 +80,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains

-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?

  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?


@@ -99,7 +100,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains

-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)

 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1


@@ -134,12 +135,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains

-domain1 in "+special_domains"?
+domain1 in domains?

  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1

- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)

 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)


@@ -159,7 +160,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains

-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?

  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?


@@ -178,7 +179,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains

-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)

 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1