X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/d8fe1c03b30ec7dba12669726e41b3b6f5303632..9604a84387b55efdc633dd7fb20db14a65c1e343:/test/stderr/0279

diff --git a/test/stderr/0279 b/test/stderr/0279
index 5a3b7a099..b42f8acc7 100644
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -6,6 +6,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
@@ -20,19 +21,20 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-address match: subject=CALLER@test.ex pattern=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)
 rr1 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-address match: subject=CALLER@test.ex pattern=never@test.ex
+address match test: subject=CALLER@test.ex pattern=never@test.ex
 CALLER@test.ex in "never@test.ex"? no (end of list)
-address match: subject=CALLER@test.ex pattern=never1@test.ex
+address match test: subject=CALLER@test.ex pattern=never1@test.ex
 CALLER@test.ex in "never1@test.ex"? no (end of list)
-address match: subject=CALLER@test.ex pattern=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 <--------
@@ -40,12 +42,12 @@ local_part=CALLER domain=test.ex
 checking senders
 cached no match for +never_addresses
 cached lookup data = NULL
-address match: subject=CALLER@test.ex pattern=never2@test.ex
+address match test: subject=CALLER@test.ex pattern=never2@test.ex
 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
+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 <--------
@@ -55,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
-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
@@ -64,12 +66,12 @@ set transport t1
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=CALLER
 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -78,6 +80,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
@@ -92,16 +95,16 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-address match: subject=user1@fun.1 pattern=user1@+funny_domains
+address match test: subject=user1@fun.1 pattern=user1@+funny_domains
 fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
 fun.1 in "+funny_domains"? yes (matched "+funny_domains")
 user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
 calling rr1 router
-rda_interpret (string): :fail: matched *@+funny_domains
-expanded: :fail: matched *@+funny_domains
+rda_interpret (string): ':fail: matched *@+funny_domains'
+expanded: ':fail: matched *@+funny_domains'
 file is not a filter file
 parse_forward_list: :fail: matched *@+funny_domains
 extract item: :fail: matched *@+funny_domains
 rr1 router forced address failure
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>