Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0279

diff --git a/test/stderr/0279 b/test/stderr/0279
index 1885579cbe51cc0ee04807117b855d852f5c2c8b..bbd8765683c4ab9345d76b23971d40366898c5b8 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -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
 seeking password data for user "CALLER": cache not available
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available


@@ -21,15 +22,15 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-CALLER@test.ex in "user1@+funny_domains"?
+CALLER@test.ex in senders?

  list element: user1@+funny_domains
  address match test: subject=CALLER@test.ex pattern=user1@+funny_domains
  list element: user1@+funny_domains
  address match test: subject=CALLER@test.ex pattern=user1@+funny_domains

-CALLER@test.ex in "user1@+funny_domains"? no (end of list)
+CALLER@test.ex in senders? no (end of list)

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

-CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"?
+CALLER@test.ex in senders?

  list element: +never_addresses
   start sublist never_addresses
    CALLER@test.ex in "never@test.ex"?
  list element: +never_addresses
   start sublist never_addresses
    CALLER@test.ex in "never@test.ex"?


@@ -44,7 +45,7 @@ CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"?
    ╎address match test: subject=CALLER@test.ex pattern=never1@test.ex
    CALLER@test.ex in "never1@test.ex"? no (end of list)
   end sublist n1_addresses
    ╎address match test: subject=CALLER@test.ex pattern=never1@test.ex
    CALLER@test.ex in "never1@test.ex"? no (end of list)
   end sublist n1_addresses

- list element: ! +local_addresses
+ list element: !░+local_addresses

   start sublist local_addresses
    CALLER@test.ex in "CALLER@test.ex"?
    ╎list element: CALLER@test.ex
   start sublist local_addresses
    CALLER@test.ex in "CALLER@test.ex"?
    ╎list element: CALLER@test.ex


@@ -55,12 +56,12 @@ CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"?
    ╎CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
   end sublist local_addresses
  data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'CALLER@test.ex'
    ╎CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
   end sublist local_addresses
  data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'CALLER@test.ex'

- CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
+ CALLER@test.ex in senders? no (matched "! +local_addresses")

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

-CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"?
+CALLER@test.ex in senders?

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


@@ -80,7 +81,7 @@ CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"?
   start sublist local_addresses
  cached yes match for +local_addresses
  cached lookup data = CALLER@test.ex
   start sublist local_addresses
  cached yes match for +local_addresses
  cached lookup data = CALLER@test.ex

- CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
+ CALLER@test.ex in senders? no (matched "!+local_addresses" - cached)

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


@@ -88,12 +89,12 @@ checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders

-CALLER@test.ex in "+local_addresses"?
+CALLER@test.ex in senders?

  list element: +local_addresses
   start sublist local_addresses
  cached yes match for +local_addresses
  cached lookup data = CALLER@test.ex
  list element: +local_addresses
   start sublist local_addresses
  cached yes match for +local_addresses
  cached lookup data = CALLER@test.ex

- CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
+ CALLER@test.ex in senders? yes (matched "+local_addresses" - cached)

 calling r3 router
 r3 router called for CALLER@test.ex
   domain = test.ex
 calling r3 router
 r3 router called for CALLER@test.ex
   domain = test.ex


@@ -108,6 +109,7 @@ routed by r3 router
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available


@@ -130,7 +132,7 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-user1@fun.1 in "user1@+funny_domains"?
+user1@fun.1 in senders?

  list element: user1@+funny_domains
  address match test: subject=user1@fun.1 pattern=user1@+funny_domains
  fun.1 in "+funny_domains"?
  list element: user1@+funny_domains
  address match test: subject=user1@fun.1 pattern=user1@+funny_domains
  fun.1 in "+funny_domains"?


@@ -141,7 +143,7 @@ user1@fun.1 in "user1@+funny_domains"?
    ╎ fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
    end sublist funny_domains
   fun.1 in "+funny_domains"? yes (matched "+funny_domains")
    ╎ fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
    end sublist funny_domains
   fun.1 in "+funny_domains"? yes (matched "+funny_domains")

- user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
+ user1@fun.1 in senders? yes (matched "user1@+funny_domains")

 calling rr1 router
 rda_interpret (string): ':fail: matched *@+funny_domains'
 expanded: ':fail: matched *@+funny_domains'
 calling rr1 router
 rda_interpret (string): ':fail: matched *@+funny_domains'
 expanded: ':fail: matched *@+funny_domains'