Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 0278

diff --git a/test/stderr/0278 b/test/stderr/0278
index c5b9261863ae8f9f27efd345723fa7d83a9249fd..0e32b4c920780324d97841f8f2605fe4b598b437 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -18,7 +18,7 @@ routing CALLER@test.ex
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
+CALLER in local_parts?

  list element: +never_localparts
   start sublist never_localparts
    CALLER in "never"?
  list element: +never_localparts
   start sublist never_localparts
    CALLER in "never"?


@@ -31,19 +31,19 @@ CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
    ╎list element: never1
    CALLER in "never1"? no (end of list)
   end sublist n1_localparts
    ╎list element: never1
    CALLER in "never1"? no (end of list)
   end sublist n1_localparts

- list element: ! +local_localparts
+ list element: !░+local_localparts

   start sublist local_localparts
    CALLER in "CALLER"?
    ╎list element: CALLER
    ╎CALLER in "CALLER"? yes (matched "CALLER")
   end sublist local_localparts
  data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
   start sublist local_localparts
    CALLER in "CALLER"?
    ╎list element: CALLER
    ╎CALLER in "CALLER"? yes (matched "CALLER")
   end sublist local_localparts
  data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'

- CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
+ CALLER in local_parts? no (matched "! +local_localparts")

 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
+CALLER in local_parts?

  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts
  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts


@@ -62,17 +62,17 @@ CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER

- CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
+ CALLER in local_parts? no (matched "!+local_localparts" - cached)

 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+local_localparts"?
+CALLER in local_parts?

  list element: +local_localparts
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER
  list element: +local_localparts
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER

- CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
+ CALLER in local_parts? yes (matched "+local_localparts" - cached)

 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID


@@ -110,15 +110,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>Headers received:
 
 qualify & rewrite recipients list

-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers

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

-I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+ F From: CALLER_NAME <CALLER@test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000


@@ -178,7 +178,7 @@ routing CALLER@test.ex
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
+CALLER in local_parts?

  list element: +never_localparts
   start sublist never_localparts
    CALLER in "never"?
  list element: +never_localparts
   start sublist never_localparts
    CALLER in "never"?


@@ -191,19 +191,19 @@ CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
    ╎list element: never1
    CALLER in "never1"? no (end of list)
   end sublist n1_localparts
    ╎list element: never1
    CALLER in "never1"? no (end of list)
   end sublist n1_localparts

- list element: ! +local_localparts
+ list element: !░+local_localparts

   start sublist local_localparts
    CALLER in "CALLER"?
    ╎list element: CALLER
    ╎CALLER in "CALLER"? yes (matched "CALLER")
   end sublist local_localparts
  data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
   start sublist local_localparts
    CALLER in "CALLER"?
    ╎list element: CALLER
    ╎CALLER in "CALLER"? yes (matched "CALLER")
   end sublist local_localparts
  data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'

- CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
+ CALLER in local_parts? no (matched "! +local_localparts")

 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
+CALLER in local_parts?

  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts
  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts


@@ -222,17 +222,17 @@ CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER

- CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
+ CALLER in local_parts? no (matched "!+local_localparts" - cached)

 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts

-CALLER in "+local_localparts"?
+CALLER in local_parts?

  list element: +local_localparts
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER
  list element: +local_localparts
   start sublist local_localparts
  cached yes match for +local_localparts
  cached lookup data = CALLER

- CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
+ CALLER in local_parts? yes (matched "+local_localparts" - cached)

 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID


@@ -328,7 +328,7 @@ routing unknown@test.ex
 --------> r1 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
 --------> r1 router <--------
 local_part=unknown domain=test.ex
 checking local_parts

-unknown in "+never_localparts : +n1_localparts : ! +local_localparts"?
+unknown in local_parts?

  list element: +never_localparts
   start sublist never_localparts
    unknown in "never"?
  list element: +never_localparts
   start sublist never_localparts
    unknown in "never"?


@@ -341,13 +341,13 @@ unknown in "+never_localparts : +n1_localparts : ! +local_localparts"?
    ╎list element: never1
    unknown in "never1"? no (end of list)
   end sublist n1_localparts
    ╎list element: never1
    unknown in "never1"? no (end of list)
   end sublist n1_localparts

- list element: ! +local_localparts
+ list element: !░+local_localparts

   start sublist local_localparts
    unknown in "CALLER"?
    ╎list element: CALLER
    unknown in "CALLER"? no (end of list)
   end sublist local_localparts
   start sublist local_localparts
    unknown in "CALLER"?
    ╎list element: CALLER
    unknown in "CALLER"? no (end of list)
   end sublist local_localparts

-unknown in "+never_localparts : +n1_localparts : ! +local_localparts"? yes (end of list)
+unknown in local_parts? yes (end of list)

 calling r1 router
 r1 router called for unknown@test.ex
   domain = test.ex
 calling r1 router
 r1 router called for unknown@test.ex
   domain = test.ex


@@ -359,7 +359,7 @@ r1 router declined for unknown@test.ex
 --------> r2 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
 --------> r2 router <--------
 local_part=unknown domain=test.ex
 checking local_parts

-unknown in "+never_localparts : +n2_localparts : !+local_localparts"?
+unknown in local_parts?

  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts
  list element: +never_localparts
   start sublist never_localparts
  cached no match for +never_localparts


@@ -378,13 +378,14 @@ unknown in "+never_localparts : +n2_localparts : !+local_localparts"?
   start sublist local_localparts
  cached no match for +local_localparts
  cached lookup data = NULL
   start sublist local_localparts
  cached no match for +local_localparts
  cached lookup data = NULL

-unknown in "+never_localparts : +n2_localparts : !+local_localparts"? yes (end of list)
+unknown in local_parts? yes (end of list)

 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex
 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex

-test.ex in "*"?
+test.ex in dnssec_require_domains? no (option unset)
+test.ex in dnssec_request_domains?

  list element: *
  list element: *

- test.ex in "*"? yes (matched "*")
+ test.ex in dnssec_request_domains? yes (matched "*")

 DNS lookup of test.ex (MX) using fakens
 DNS lookup of test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 DNS lookup of test.ex (MX) using fakens
 DNS lookup of test.ex (MX) gave NO_DATA
 returning DNS_NODATA


@@ -400,17 +401,17 @@ r2 router declined for unknown@test.ex
 --------> r3 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
 --------> r3 router <--------
 local_part=unknown domain=test.ex
 checking local_parts

-unknown in "+local_localparts"?
+unknown in local_parts?

  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts
  cached lookup data = NULL
  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts
  cached lookup data = NULL

-unknown in "+local_localparts"? no (end of list)
+unknown in local_parts? no (end of list)

 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=unknown domain=test.ex
 checking local_parts

-unknown in "+local_localparts : +expanded : +unexpanded"?
+unknown in local_parts?

  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts
  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts


@@ -427,12 +428,12 @@ unknown in "+local_localparts : +expanded : +unexpanded"?
    ╎list element: unexpanded
    unknown in "unexpanded"? no (end of list)
   end sublist unexpanded
    ╎list element: unexpanded
    unknown in "unexpanded"? no (end of list)
   end sublist unexpanded

-unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list)
+unknown in local_parts? no (end of list)

 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=unknown domain=test.ex
 checking local_parts

-unknown in "+local_localparts : +expanded : +unexpanded"?
+unknown in local_parts?

  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts
  list element: +local_localparts
   start sublist local_localparts
  cached no match for +local_localparts


@@ -447,7 +448,7 @@ unknown in "+local_localparts : +expanded : +unexpanded"?
   start sublist unexpanded
  cached no match for +unexpanded
  cached lookup data = NULL
   start sublist unexpanded
  cached no match for +unexpanded
  cached lookup data = NULL

-unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list)
+unknown in local_parts? no (end of list)

 r5 router skipped: local_parts mismatch
 no more routers
 search_tidyup called
 r5 router skipped: local_parts mismatch
 no more routers
 search_tidyup called