[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Top Pagina
Delete this message
Reply to this message
Auteur: Philip Hazel
Datum:  
Aan: exim-cvs
Nieuwe Onderwerpen: Re: [exim-dev] [exim-cvs] cvs commit: exim/exim-src/src/route.c
Onderwerp: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src route.c exim/exim-test/stderr 0022 0085 0094 0275 0278 0279 0283 0303 0361 0362 0381 0386 0398 0402 0403 0404 0408 0414 0465
ph10 2006/07/14 15:00:17 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         route.c 
    exim-test/stderr     0022 0085 0094 0275 0278 0279 0283 0303 
                         0361 0362 0381 0386 0398 0402 0403 0404 
                         0408 0414 0465 0487 2201 2600 3210 3400 
                         5004 5005 5006 
  Log:
  Rejig debug output in route_finduser() to show more data, including the
  error from getpwnam() if it issues one.


  Revision  Changes    Path
  1.375     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.9       +20 -4     exim/exim-src/src/route.c
  1.3       +6 -0      exim/exim-test/stderr/0022
  1.2       +4 -0      exim/exim-test/stderr/0085
  1.4       +2 -0      exim/exim-test/stderr/0094
  1.2       +6 -0      exim/exim-test/stderr/0275
  1.2       +12 -2     exim/exim-test/stderr/0278
  1.2       +10 -3     exim/exim-test/stderr/0279
  1.2       +36 -0     exim/exim-test/stderr/0283
  1.3       +4 -0      exim/exim-test/stderr/0303
  1.2       +4 -0      exim/exim-test/stderr/0361
  1.3       +2 -0      exim/exim-test/stderr/0362
  1.4       +2 -0      exim/exim-test/stderr/0381
  1.3       +16 -4     exim/exim-test/stderr/0386
  1.3       +2 -0      exim/exim-test/stderr/0398
  1.2       +12 -4     exim/exim-test/stderr/0402
  1.2       +4 -0      exim/exim-test/stderr/0403
  1.4       +16 -4     exim/exim-test/stderr/0404
  1.2       +4 -0      exim/exim-test/stderr/0408
  1.2       +2 -0      exim/exim-test/stderr/0414
  1.4       +6 -0      exim/exim-test/stderr/0465
  1.3       +8 -2      exim/exim-test/stderr/0487
  1.2       +4 -1      exim/exim-test/stderr/2201
  1.3       +8 -0      exim/exim-test/stderr/2600
  1.3       +2 -0      exim/exim-test/stderr/3210
  1.5       +4 -1      exim/exim-test/stderr/3400
  1.2       +8 -2      exim/exim-test/stderr/5004
  1.4       +16 -0     exim/exim-test/stderr/5005
  1.2       +4 -0      exim/exim-test/stderr/5006


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.374
  retrieving revision 1.375
  diff -u -r1.374 -r1.375
  --- ChangeLog    13 Jul 2006 14:46:05 -0000    1.374
  +++ ChangeLog    14 Jul 2006 14:00:16 -0000    1.375
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.374 2006/07/13 14:46:05 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.375 2006/07/14 14:00:16 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -103,6 +103,9 @@

         The Auto-Submitted: header is standardised, whereas I don't think
         Precedence: ever was.
  +
  +PH/18 Refactored debugging code in route_finduser() to show more information,
  +      in particular, the error code if getpwnam() issues one.



Exim version 4.62

  Index: route.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/route.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- route.c    7 Feb 2006 11:19:00 -0000    1.8
  +++ route.c    14 Jul 2006 14:00:16 -0000    1.9
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/route.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/route.c,v 1.9 2006/07/14 14:00:16 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1077,7 +1077,12 @@
   BOOL
   route_finduser(uschar *s, struct passwd **pw, uid_t *return_uid)
   {
  -if (Ustrcmp(lastname, s) != 0)
  +BOOL cache_set = (Ustrcmp(lastname, s) == 0);
  +
  +DEBUG(D_uid) debug_printf("seeking password data for user \"%s\": %s\n", s,
  +  cache_set? "using cached result" : "cache not available");
  +
  +if (!cache_set)
     {
     int i = 0;


  @@ -1122,13 +1127,24 @@
       pwcopy.pw_shell = CS lastshell;
       lastpw = &pwcopy;
       }
  +
  +  else DEBUG(D_uid)
  +    {
  +    if (errno != 0) debug_printf("getpwnam(%s) failed: %s\n", s,
  +      strerror(errno));
  +    }
  +  }
  +
  +if (lastpw == NULL)
  +  {
  +  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
  +  return FALSE;
     }
   else
     {
  -  DEBUG(D_uid) debug_printf("finduser used cached passwd data for %s\n", s);
  +  DEBUG(D_uid) debug_printf("getpwnam() succeeded uid=%d gid=%d\n",
  +    lastpw->pw_uid, lastpw->pw_gid);
     }
  -
  -if (lastpw == NULL) return FALSE;


if (return_uid != NULL) *return_uid = lastpw->pw_uid;
if (pw != NULL) *pw = lastpw;

  Index: 0022
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0022,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0022    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0022    14 Jul 2006 14:00:16 -0000    1.3
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.9.8.7]
  @@ -66,6 +68,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.9.8.7]
  @@ -129,6 +133,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.9.8.7]


  Index: 0085
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0085,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0085    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0085    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = abc@???
   Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
  @@ -202,6 +204,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID


  Index: 0094
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0094,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0094    8 Mar 2006 10:49:18 -0000    1.3
  +++ 0094    14 Jul 2006 14:00:16 -0000    1.4
  @@ -67,6 +67,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.99.99.90]


  Index: 0275
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0275,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0275    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0275    14 Jul 2006 14:00:16 -0000    1.2
  @@ -3,6 +3,8 @@
     uid=uuuu gid=CALLER_GID pid=pppp
   configuration file is TESTSUITE/test-config
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
  @@ -102,6 +104,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -140,6 +144,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 0278
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0278,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0278    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0278    14 Jul 2006 14:00:16 -0000    1.2
  @@ -3,6 +3,8 @@
     uid=uuuu gid=CALLER_GID pid=pppp
   configuration file is TESTSUITE/test-config
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
  @@ -39,7 +41,8 @@
   cached lookup data = NULL
   CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
   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
   calling r3 router
   r3 router called for CALLER@???
     domain = test.ex
  @@ -60,6 +63,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -98,6 +103,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H
  @@ -151,7 +158,8 @@
   cached lookup data = NULL
   CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
   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
   calling r3 router
   r3 router called for CALLER@???
     domain = test.ex
  @@ -220,6 +228,8 @@
     uid=uuuu gid=CALLER_GID pid=pppp
   configuration file is TESTSUITE/test-config
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


  Index: 0279
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0279,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0279    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0279    14 Jul 2006 14:00:16 -0000    1.2
  @@ -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@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
  @@ -48,7 +51,8 @@
   --------> 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 @@
   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


  Index: 0283
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0283,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0283    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0283    14 Jul 2006 14:00:16 -0000    1.2
  @@ -1,19 +1,31 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=CALLER_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   LOG: MAIN
     <= CALLER@??? U=CALLER P=local S=sss
   created log directory TESTSUITE/spool/log
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   changed uid/gid: local delivery to somebody <somebody@???> transport=t1
     uid=EXIM_UID gid=EXIM_GID pid=pppp
   transport error EPIPE ignored
  @@ -24,19 +36,31 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   LOG: MAIN
     <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   changed uid/gid: local delivery to CALLER <CALLER@???> transport=t2
     uid=CALLER_UID gid=CALLER_GID pid=pppp
   LOG: MAIN
  @@ -54,18 +78,30 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=CALLER_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   LOG: MAIN
     <= CALLER@??? U=CALLER P=local S=sss
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_GID pid=pppp
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "root": cache not available
  +getpwnam() succeeded uid=uuuu gid=gggg
   LOG: MAIN PANIC
     User 0 set for t3 transport is on the never_users list
   LOG: MAIN


  Index: 0303
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0303,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0303    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0303    14 Jul 2006 14:00:16 -0000    1.3
  @@ -43,6 +43,8 @@
   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
  @@ -110,6 +112,8 @@
   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


  Index: 0361
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0361,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0361    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0361    14 Jul 2006 14:00:16 -0000    1.2
  @@ -12,6 +12,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -49,6 +51,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaY-0005vi-00
   reading spool file 10HmaY-0005vi-00-H


  Index: 0362
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0362,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0362    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0362    14 Jul 2006 14:00:16 -0000    1.3
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.0.0.0]


  Index: 0381
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0381,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0381    8 Mar 2006 10:49:18 -0000    1.3
  +++ 0381    14 Jul 2006 14:00:16 -0000    1.4
  @@ -1,6 +1,8 @@
   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


  Index: 0386
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0386,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0386    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0386    14 Jul 2006 14:00:16 -0000    1.3
  @@ -1,12 +1,15 @@
   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
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -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=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [V4NET.9.8.7]
  @@ -116,12 +119,15 @@
   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
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -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=CALLER_NAME
   sender address = NULL
   sender_fullhost = [V4NET.11.12.13]
  @@ -193,10 +199,13 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_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
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H
  @@ -348,10 +357,13 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_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
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaY-0005vi-00
   reading spool file 10HmaY-0005vi-00-H


  Index: 0398
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0398,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0398    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0398    14 Jul 2006 14:00:16 -0000    1.3
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local SMTP message from <CALLER@???>


  Index: 0402
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0402,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0402    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0402    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,8 +5,12 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -finduser used cached passwd data for CALLER
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +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=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -92,8 +96,12 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  -finduser used cached passwd data for CALLER
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 0403
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0403,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0403    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0403    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -43,6 +45,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 0404
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0404,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0404    28 Feb 2006 11:25:41 -0000    1.3
  +++ 0404    14 Jul 2006 14:00:16 -0000    1.4
  @@ -5,7 +5,10 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +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=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -141,7 +144,10 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H
  @@ -236,7 +242,10 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +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=CALLER_NAME
   sender address = 
   set_process_info: pppp accepting a local non-SMTP message from <>
  @@ -283,7 +292,10 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaY-0005vi-00
   reading spool file 10HmaY-0005vi-00-H


  Index: 0408
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0408,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0408    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0408    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -43,6 +45,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 0414
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0414,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0414    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0414    14 Jul 2006 14:00:16 -0000    1.2
  @@ -3,6 +3,8 @@
     uid=uuuu gid=CALLER_GID pid=pppp
   configuration file is TESTSUITE/test-config
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


  Index: 0465
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0465,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0465    8 Mar 2006 10:49:18 -0000    1.3
  +++ 0465    14 Jul 2006 14:00:16 -0000    1.4
  @@ -1,6 +1,8 @@
   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
  @@ -29,6 +31,8 @@
   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
  @@ -88,6 +92,8 @@
   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


  Index: 0487
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0487,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0487    8 Mar 2006 10:49:18 -0000    1.2
  +++ 0487    14 Jul 2006 14:00:16 -0000    1.3
  @@ -1,12 +1,15 @@
   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
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -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=CALLER_NAME
   sender address = NULL
    in hosts_connection_nolog? no (option unset)
  @@ -60,10 +63,13 @@
   Exim version x.yz ....
   changed uid/gid: forcing real = effective
     uid=uuuu gid=EXIM_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
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 2201
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/2201,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 2201    7 Feb 2006 10:47:31 -0000    1.1
  +++ 2201    14 Jul 2006 14:00:16 -0000    1.2
  @@ -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=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


  Index: 2600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/2600,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 2600    8 Mar 2006 10:49:18 -0000    1.2
  +++ 2600    14 Jul 2006 14:00:16 -0000    1.3
  @@ -111,6 +111,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [10.0.0.0]
  @@ -198,6 +200,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   sender_fullhost = [10.10.10.10]
  @@ -275,6 +279,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -314,6 +320,8 @@
   trusted user
   admin user
   skipping ACL configuration - not needed
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 3210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3210,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 3210    4 Apr 2006 09:48:50 -0000    1.2
  +++ 3210    14 Jul 2006 14:00:16 -0000    1.3
  @@ -3,6 +3,8 @@
     uid=uuuu gid=CALLER_GID pid=pppp
   configuration file is TESTSUITE/test-config
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


  Index: 3400
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3400,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 3400    8 Mar 2006 10:49:18 -0000    1.4
  +++ 3400    14 Jul 2006 14:00:16 -0000    1.5
  @@ -354,12 +354,15 @@
   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
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -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=CALLER_NAME
   sender address = NULL
   sender_fullhost = [10.0.0.5]


  Index: 5004
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/5004,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 5004    7 Feb 2006 10:47:31 -0000    1.1
  +++ 5004    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,7 +5,10 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +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=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -44,7 +47,10 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  -finduser used cached passwd data for CALLER
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
  +seeking password data for user "CALLER": using cached result
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H


  Index: 5005
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/5005,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 5005    9 Feb 2006 14:50:58 -0000    1.3
  +++ 5005    14 Jul 2006 14:00:16 -0000    1.4
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -43,6 +45,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H
  @@ -169,6 +173,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -206,6 +212,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaY-0005vi-00
   reading spool file 10HmaY-0005vi-00-H
  @@ -333,6 +341,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -370,6 +380,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaZ-0005vi-00
   reading spool file 10HmaZ-0005vi-00-H
  @@ -508,6 +520,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -545,6 +559,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmbA-0005vi-00
   reading spool file 10HmbA-0005vi-00-H


  Index: 5006
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/5006,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 5006    7 Feb 2006 10:47:31 -0000    1.1
  +++ 5006    14 Jul 2006 14:00:16 -0000    1.2
  @@ -5,6 +5,8 @@
   admin user
   changed uid/gid: privilege not needed
     uid=EXIM_UID gid=EXIM_GID pid=pppp
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
   sender address = CALLER@???
   set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
  @@ -43,6 +45,8 @@
   configuration file is TESTSUITE/test-config
   trusted user
   admin user
  +seeking password data for user "CALLER": cache not available
  +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   set_process_info: pppp delivering specified messages
   set_process_info: pppp delivering 10HmaX-0005vi-00
   reading spool file 10HmaX-0005vi-00-H