Merge branch 'master' of ssh://git.exim.org/home/git/exim

[users/jgh/exim.git] / test / stderr / 0279

diff --git a/test/stderr/0279 b/test/stderr/0279
index e97c793f1ef2d69123e513636a4f3b3a478217a7..a56ebe9be2e4cbf082c17d9ced4c4b5442cefaaa 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -1,10 +1,13 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-finduser used cached passwd data for CALLER
+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=
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -17,17 +20,17 @@ 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")
 CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
@@ -37,7 +40,7 @@ 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)
@@ -48,7 +51,8 @@ r2 router skipped: senders mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking for local user
-finduser used cached passwd data for CALLER
+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
@@ -69,10 +73,13 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-finduser used cached passwd data for CALLER
+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=
 sender address = user1@fun.1
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -85,7 +92,7 @@ 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")