Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0279

diff --git a/test/stderr/0279 b/test/stderr/0279
index d1fcc99c07714ea9e231d936a5f5b32fb9621ed8..b42f8acc7d41ee97a6a9c90c24c3b8f4b87a9e0c 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -34,6 +34,7 @@ CALLER@test.ex in "never1@test.ex"? no (end of list)
 address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
 test.ex in "test.ex"? yes (matched "test.ex")
 CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
 address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
 test.ex in "test.ex"? yes (matched "test.ex")
 CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")

+data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'test.ex'

 CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
 r1 router skipped: senders mismatch
 --------> r2 router <--------
 CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
 r1 router skipped: senders mismatch
 --------> r2 router <--------


@@ -46,7 +47,7 @@ cached no match for +n1_addresses
 cached lookup data = NULL
 CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
 cached yes match for +local_addresses
 cached lookup data = NULL
 CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
 cached yes match for +local_addresses

-cached lookup data = NULL
+cached lookup data = test.ex

 CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
 r2 router skipped: senders mismatch
 --------> r3 router <--------
 CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
 r2 router skipped: senders mismatch
 --------> r3 router <--------


@@ -56,7 +57,7 @@ seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders
 cached yes match for +local_addresses
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders
 cached yes match for +local_addresses

-cached lookup data = NULL
+cached lookup data = test.ex

 CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
 calling r3 router
 r3 router called for CALLER@test.ex
 CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
 calling r3 router
 r3 router called for CALLER@test.ex


@@ -65,7 +66,7 @@ set transport t1
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=CALLER
+  domain_data=NULL local_part_data=CALLER

 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1