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

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Philip Hazel
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src exim.c exim/exim-test-orig/AutoTest runtest exim/exim-test-orig/AutoTest/stderr 078 079 080 119 172 247 287 313 317 329 335
ph10 2005/04/06 11:06:15 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         exim.c 
    exim-test-orig/AutoTest runtest 
    exim-test-orig/AutoTest/stderr 078 079 080 119 172 247 287 313 
                                   317 329 335 342 367 369 384 385 
                                   414 415 417 418 427 434 435 437 
                                   438 439 440 441 442 443 447 449 
                                   451 458 461 463 466 468 469 470 
                                   474 495 504 506 508 509 517 524 
                                   536 538 540 541 549 552 555 564 
                                   568 570 581 600 602 
  Log:
  Show command line arguments in debugging output, even without
  log_selector=+arguments.


  Revision  Changes    Path
  1.112     +4 -0      exim/exim-doc/doc-txt/ChangeLog
  1.18      +7 -3      exim/exim-src/src/exim.c
  1.6       +3 -1      exim/exim-test-orig/AutoTest/runtest
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/078
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/079
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/080
  1.4       +1 -0      exim/exim-test-orig/AutoTest/stderr/119
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/172
  1.3       +7 -0      exim/exim-test-orig/AutoTest/stderr/247
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/287
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/313
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/317
  1.2       +6 -0      exim/exim-test-orig/AutoTest/stderr/329
  1.2       +5 -0      exim/exim-test-orig/AutoTest/stderr/335
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/342
  1.2       +4 -0      exim/exim-test-orig/AutoTest/stderr/367
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/369
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/384
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/385
  1.2       +4 -0      exim/exim-test-orig/AutoTest/stderr/414
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stderr/415
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stderr/417
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/418
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/427
  1.2       +4 -0      exim/exim-test-orig/AutoTest/stderr/434
  1.2       +6 -0      exim/exim-test-orig/AutoTest/stderr/435
  1.6       +26 -0     exim/exim-test-orig/AutoTest/stderr/437
  1.2       +4 -0      exim/exim-test-orig/AutoTest/stderr/438
  1.2       +5 -0      exim/exim-test-orig/AutoTest/stderr/439
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stderr/440
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/441
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/442
  1.2       +5 -0      exim/exim-test-orig/AutoTest/stderr/443
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stderr/447
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stderr/449
  1.4       +3 -0      exim/exim-test-orig/AutoTest/stderr/451
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/458
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/461
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/463
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/466
  1.4       +2 -0      exim/exim-test-orig/AutoTest/stderr/468
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/469
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/470
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/474
  1.2       +4 -0      exim/exim-test-orig/AutoTest/stderr/495
  1.2       +8 -0      exim/exim-test-orig/AutoTest/stderr/504
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/506
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/508
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/509
  1.4       +8 -0      exim/exim-test-orig/AutoTest/stderr/517
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stderr/524
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/536
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/538
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/540
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stderr/541
  1.5       +1 -0      exim/exim-test-orig/AutoTest/stderr/549
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/552
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stderr/555
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/564
  1.3       +2 -0      exim/exim-test-orig/AutoTest/stderr/568
  1.2       +8 -0      exim/exim-test-orig/AutoTest/stderr/570
  1.4       +3 -0      exim/exim-test-orig/AutoTest/stderr/581
  1.2       +6 -0      exim/exim-test-orig/AutoTest/stderr/600
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/602


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- ChangeLog    5 Apr 2005 15:47:50 -0000    1.111
  +++ ChangeLog    6 Apr 2005 10:06:14 -0000    1.112
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.111 2005/04/05 15:47:50 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.112 2005/04/06 10:06:14 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -149,6 +149,10 @@
         I've just tested the patch: Authentication still works fine,
         unavailable mechs specified in the exim configuration are still
         caught, and the auth.log warnings about OTP are gone."
  +
  +PH/25 When debugging is enabled, the contents of the command line are added
  +      to the debugging output, even when log_selector=+arguments is not
  +      specified.



A note about Exim versions 4.44 and 4.50

  Index: exim.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exim.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- exim.c    22 Mar 2005 14:11:54 -0000    1.17
  +++ exim.c    6 Apr 2005 10:06:14 -0000    1.18
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/exim.c,v 1.17 2005/03/22 14:11:54 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/exim.c,v 1.18 2005/04/06 10:06:14 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -3237,8 +3237,8 @@
   Don't attempt it if logging is disabled, or if listing variables or if
   verifying/testing addresses or expansions. */


  -if ((log_extra_selector & LX_arguments) != 0 && really_exim
  -     && !list_options && !checking)
  +if (((debug_selector & D_any) != 0 || (log_extra_selector & LX_arguments) != 0)
  +      && really_exim && !list_options && !checking)
     {
     int i;
     uschar *p = big_buffer;
  @@ -3270,7 +3270,11 @@
         (p - big_buffer) - 4), printing, quote);
       while (*p) p++;
       }
  -  log_write(0, LOG_MAIN, "%s", big_buffer);
  +
  +  if ((log_extra_selector & LX_arguments) != 0)
  +    log_write(0, LOG_MAIN, "%s", big_buffer);
  +  else
  +    debug_printf("%s\n", big_buffer);
     }


/* Set the working directory to be the top-level spool directory. We don't rely

  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/runtest,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- runtest    27 Jan 2005 11:39:37 -0000    1.5
  +++ runtest    6 Apr 2005 10:06:14 -0000    1.6
  @@ -1,5 +1,5 @@
   #! /bin/sh
  -# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.5 2005/01/27 11:39:37 ph10 Exp $
  +# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.6 2005/04/06 10:06:14 ph10 Exp $


   # A script to run some automatic testing of Exim. This has been needed for
   # quite some time. I am finally thinking about it in February 1999.
  @@ -421,6 +421,8 @@
     s"test-mail/temp\.\d+\."test-mail/temp.pppp."; 


     # Pids in debugging output
  +  
  +  s/-MCQ (\d+)/-MCQ 9999/; 


     s/set_process_info:\s+\d+/set_process_info: 21680/;  



  Index: 078
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/078,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 078    8 Oct 2004 14:50:08 -0000    1.1
  +++ 078    6 Apr 2005 10:06:14 -0000    1.2
  @@ -4,6 +4,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/078
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/078 -d-all+transport -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=317
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/078
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/078 -d=0x10000000 -odi -Mc 10HmbP-0005vi-00
   trusted user
   admin user
   >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>


  Index: 079
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/079,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 079    8 Oct 2004 14:50:08 -0000    1.1
  +++ 079    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/079
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/079 -odi -d-all+route filter-ph10
   trusted user
   admin user
   LOG: MAIN
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/079
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/079 -d=0x2000000 -odi -Mc 10HmbX-0005vi-00
   trusted user
   admin user
   rda_interpret (file): /source/exim4/AutoTest/aux/079.F


  Index: 080
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/080,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 080    8 Oct 2004 14:50:08 -0000    1.1
  +++ 080    6 Apr 2005 10:06:14 -0000    1.2
  @@ -377,6 +377,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/080
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/080 -d -odi -bs -oMa 10.0.0.5
   trusted user
   admin user
   changed uid/gid: privilege not needed


  Index: 119
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/119,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 119    16 Feb 2005 16:28:37 -0000    1.3
  +++ 119    6 Apr 2005 10:06:14 -0000    1.4
  @@ -9,6 +9,7 @@
   --Malloc   236 8200 16799
   configuration file is /source/exim4/AutoTest/confs/119
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/119 -d-all+memory -odq ph10@???
   admin user
   --Malloc  8200 16400 16799
   ---0 Get     8


  Index: 172
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/172,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 172    8 Oct 2004 14:50:08 -0000    1.1
  +++ 172    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/172
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/172 -d-all+transport -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=306
  @@ -11,6 +12,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/172
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/172 -d=0x10000000 -odi -Mc 10HmbA-0005vi-00
   trusted user
   admin user
   >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>


  Index: 247
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/247,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 247    4 Nov 2004 12:19:49 -0000    1.2
  +++ 247    6 Apr 2005 10:06:14 -0000    1.3
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d-all+queue_run -v -qq
   admin user
   Single queue run
   LOG: queue_run MAIN
  @@ -34,6 +35,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 17 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d=0x100001 -MCP -MCQ 9999 5 -MC send_to_server 127.0.0.1 127.0.0.1 2 10HmaY-0005vi-00
   trusted user
   admin user
   delivering 10HmaY-0005vi-00 (queue run pid ppppp)
  @@ -59,6 +61,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d-all+queue_run -v -qq
   admin user
   Single queue run
   LOG: queue_run MAIN
  @@ -87,6 +90,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d=0x100001 -t -oem -oi -f <> -E10HmaZ-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -108,6 +112,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d-all+ident -v -qqf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qqf
  @@ -141,6 +146,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d=0x1001 -t -oem -oi -f <> -E10HmbA-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -153,6 +159,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/247
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 17 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/247 -d=0x1001 -MCP -MCQ 9999 5 -MC send_to_server 127.0.0.1 127.0.0.1 2 10HmbC-0005vi-00
   trusted user
   admin user
   delivering 10HmbC-0005vi-00 (queue run pid ppppp)


  Index: 287
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/287,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 287    8 Oct 2004 14:50:08 -0000    1.1
  +++ 287    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/287
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/287 -d-all+rewrite -brw User@???
   admin user
   LOG: address_rewrite MAIN
     "User@???" from sender: rewritten as "User@???" by rule 2


  Index: 313
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/313,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 313    19 Oct 2004 14:31:15 -0000    1.2
  +++ 313    6 Apr 2005 10:06:14 -0000    1.3
  @@ -107,6 +107,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/313
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/313 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -150,6 +151,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/313
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/313 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 317
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/317,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 317    19 Oct 2004 14:31:15 -0000    1.2
  +++ 317    6 Apr 2005 10:06:14 -0000    1.3
  @@ -65,6 +65,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/317
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/317 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -108,6 +109,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/317
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/317 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 329
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/329,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 329    8 Oct 2004 14:50:08 -0000    1.1
  +++ 329    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -odi -d-all+uid somebody
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -21,6 +22,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -d=0x20000000 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   changed uid/gid: local delivery to somebody <somebody@???> transport=t1
  @@ -40,6 +42,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -d=0x20000000 -odi -t -oem -oi -f <> -E10HmaY-0005vi-00
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -55,6 +58,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -d=0x20000000 -odi -Mc 10HmaZ-0005vi-00
   trusted user
   admin user
   changed uid/gid: local delivery to ph10 <ph10@???> transport=t2
  @@ -81,6 +85,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -odi -d-all+uid never
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -95,6 +100,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/329
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/329 -d=0x20000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN PANIC


  Index: 335
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/335,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 335    8 Oct 2004 14:50:08 -0000    1.1
  +++ 335    6 Apr 2005 10:06:14 -0000    1.2
  @@ -15,6 +15,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/335
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/335 -odi -N -d-all+receive -bs
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
  @@ -54,6 +55,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/335
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/335 -d=0x200000 -N -odi -Mc 10HmbX-0005vi-00
   trusted user
   admin user
   delivering 10HmbX-0005vi-00
  @@ -73,6 +75,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/335
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/335 -odi -N -d-all+local_scan -bs
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -97,6 +100,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/335
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/335 -d=0x2 -N -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   delivering 10HmaX-0005vi-00
  @@ -218,6 +222,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/335
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/335 -d-all+local_scan -odi -bs
   trusted user
   admin user
   LOG: smtp_connection MAIN


  Index: 342
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/342,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 342    8 Oct 2004 14:50:08 -0000    1.1
  +++ 342    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/342
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/342 -d-all+receive -odq -bs
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
  @@ -180,6 +181,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/342
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/342 -d-all+receive -odq -bs
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel


  Index: 367
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/367,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 367    8 Oct 2004 14:50:08 -0000    1.1
  +++ 367    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/367
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/367 -odi -d-all+route -N x@??? y@???
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=260
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/367
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/367 -d=0x2000001 -N -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   delivering 10HmaX-0005vi-00
  @@ -67,6 +69,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/367
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/367 -odi -d-all+route -N x@??? y@???
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=260
  @@ -75,6 +78,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/367
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/367 -d=0x2000001 -N -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   delivering 10HmaY-0005vi-00


  Index: 369
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/369,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 369    8 Oct 2004 14:50:08 -0000    1.1
  +++ 369    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/369
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/369 -d-all+receive -odq -t
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   sender address = ph10@???
  @@ -37,6 +38,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/369
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/369 -d-all+receive -odq -t
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   sender address = ph10@???


  Index: 384
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/384,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 384    8 Oct 2004 14:50:08 -0000    1.1
  +++ 384    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/384
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/384 -q -d-all+route
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp
  @@ -45,6 +46,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/384
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 17 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/384 -d=0x2000000 -MCP -MCQ 9999 5 -MC t1 127.0.0.1 127.0.0.1 2 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 385
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/385,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 385    8 Oct 2004 14:50:08 -0000    1.1
  +++ 385    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/385
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/385 -d-all+route -M 10HmaX-0005vi-00
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -44,6 +45,7 @@
Fixed never_users: 0
configuration file is /source/exim4/AutoTest/confs/385
log selectors = xxxxxxxx xxxxxxxx
+cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/385 -d=0x2000000 -MCP -MC t1 127.0.0.1 127.0.0.1 2 10HmaY-0005vi-00
trusted user
admin user
locking /source/exim4/AutoTest/spool/db/retry.lockfile

  Index: 414
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/414,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 414    8 Oct 2004 14:50:08 -0000    1.1
  +++ 414    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/414
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/414 -odi -d-all+retry ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=275
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/414
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/414 -d=0x800000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -54,6 +56,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/414
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/414 -q -d-all+retry
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp
  @@ -106,6 +109,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/414
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/414 -q -d-all+retry
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp


  Index: 415
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/415,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 415    8 Oct 2004 14:50:08 -0000    1.1
  +++ 415    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/415
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/415 -odi -d-all+retry ph10 ph99
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=257
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/415
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/415 -d=0x800000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -69,6 +71,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/415
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/415 -q -d-all+retry
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp


  Index: 417
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/417,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 417    8 Oct 2004 14:50:08 -0000    1.1
  +++ 417    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/417
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/417 -d-all+route -N -odi cms
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=264
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/417
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/417 -d=0x2000001 -N -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   delivering 10HmaX-0005vi-00
  @@ -157,6 +159,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/417
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/417 -qf -d-all+route
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf


  Index: 418
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/418,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 418    19 Oct 2004 14:31:15 -0000    1.2
  +++ 418    6 Apr 2005 10:06:14 -0000    1.3
  @@ -13,6 +13,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/418
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/418 -odi -d -N kilos@thishost
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -55,6 +56,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/418
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/418 -d=0xfbb95cfd -N -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 427
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/427,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 427    8 Oct 2004 14:50:08 -0000    1.1
  +++ 427    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/427
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/427 -q -d-all+route+dns
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp
  @@ -46,6 +47,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/427
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 18 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/427 -d=0x2000020 -MCS -MCP -MCQ 9999 5 -MC t1 127.0.0.1 127.0.0.1 2 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 434
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/434,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 434    8 Oct 2004 14:50:08 -0000    1.1
  +++ 434    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/434
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/434 -d-all+route -odi a1 b1 c1 d1 d2 d3
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/434
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/434 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -388,6 +390,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/434
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/434 -d=0x2000000 -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -397,6 +400,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/434
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/434 -d=0x2000000 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 435
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/435,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 435    8 Oct 2004 14:50:08 -0000    1.1
  +++ 435    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 19 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d-all+route -odi a1 b1 c1 d1 d2 d3 e1 f1 f2 f3 g1
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -849,6 +851,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d=0x2000000 -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -858,6 +861,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d=0x2000000 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -940,6 +944,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d-all+route -odi h1
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=265
  @@ -948,6 +953,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/435
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/435 -d=0x2000000 -odi -Mc 10HmaZ-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 437
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/437,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 437    27 Jan 2005 10:26:15 -0000    1.5
  +++ 437    6 Apr 2005 10:06:14 -0000    1.6
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -35,6 +36,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -55,6 +57,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -81,6 +84,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -117,6 +121,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -141,6 +146,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -174,6 +180,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -197,6 +204,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -239,6 +247,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -262,6 +271,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -300,6 +310,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -321,6 +332,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.3
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -352,6 +364,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.3
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -371,6 +384,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.4
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -402,6 +416,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.4
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -421,6 +436,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.4
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -465,6 +481,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.4
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -487,6 +504,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -525,6 +543,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -558,6 +577,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.3
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -596,6 +616,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.3
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -629,6 +650,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 12 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -DPEX=1s -d-all+verify -v -bs -oMa 10.0.0.3
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -667,6 +689,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.5
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -701,6 +724,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -v -bs -oMa 10.0.0.6
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -739,6 +763,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 12 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -odq -v -bs -oMa 10.0.0.7
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -774,6 +799,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/437
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 12 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/437 -d-all+verify -odq -v -bs -oMa 10.0.0.8
   trusted user
   admin user
   LOG: smtp_connection MAIN


  Index: 438
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/438,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 438    8 Oct 2004 14:50:08 -0000    1.1
  +++ 438    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/438
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/438 -d-all+route -odi aaaa bbbb cccc
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/438
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/438 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -320,6 +322,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/438
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/438 -d-all+route -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf
  @@ -566,6 +569,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/438
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/438 -d-all+route -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf


  Index: 439
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/439,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 439    8 Oct 2004 14:50:08 -0000    1.1
  +++ 439    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/439
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/439 -d-all+route -odi aaaa
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=267
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/439
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/439 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -129,6 +131,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/439
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/ 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/439 -d=0x2000000 -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   admin user
   LOG: MAIN
     <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=423
  @@ -137,6 +140,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/439
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/439 -d=0x2000000 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -186,6 +190,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/439
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/439 -d-all+route -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf


  Index: 440
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/440,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 440    8 Oct 2004 14:50:08 -0000    1.1
  +++ 440    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/440
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/440 -d-all+route -odi defer aaaa
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/440
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/440 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -144,6 +146,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/440
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/440 -d-all+route -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf


  Index: 441
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/441,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 441    8 Oct 2004 14:50:08 -0000    1.1
  +++ 441    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/441
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/441 -d-all+route -odi aaaa bbbb
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=242
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/441
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/441 -d=0x2000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 442
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/442,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 442    8 Oct 2004 14:50:08 -0000    1.1
  +++ 442    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/442
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/442 -d -bs -oMa 10.99.99.97
   trusted user
   admin user
   changed uid/gid: privilege not needed


  Index: 443
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/443,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 443    8 Oct 2004 14:50:08 -0000    1.1
  +++ 443    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/443
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/443 -d-all+filter -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=253
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/443
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/443 -d=0x200 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   running system filter
  @@ -25,6 +27,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/443
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/443 -d=0x200 -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -34,6 +37,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/443
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/443 -d=0x200 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   running system filter
  @@ -55,6 +59,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/443
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/443 -d-all+filter -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf


  Index: 447
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/447,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 447    19 Oct 2004 14:31:15 -0000    1.2
  +++ 447    6 Apr 2005 10:06:14 -0000    1.3
  @@ -126,6 +126,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/447
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 12 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/447 -d -odi -bs -oMa 10.11.12.13 ph10
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -205,6 +206,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/447
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/447 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10
  @@ -361,6 +363,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/447
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/447 -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10


  Index: 449
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/449,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 449    8 Oct 2004 14:50:08 -0000    1.1
  +++ 449    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/449
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/449 -d-all+acl+lists -bs -oMa 10.9.8.8
   trusted user
   admin user
   host in hosts_connection_nolog? no (option unset)
  @@ -104,6 +105,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/449
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/449 -d-all+acl+lists -odi -bs -oMa 10.9.8.8
   trusted user
   admin user
   host in hosts_connection_nolog? no (option unset)
  @@ -182,6 +184,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/449
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/449 -d=0x4004 -odi -Mc 10HmbF-0005vi-00
   trusted user
   admin user
   skipping ACL configuration - not needed


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 451    4 Nov 2004 12:19:49 -0000    1.3
  +++ 451    6 Apr 2005 10:06:14 -0000    1.4
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/451
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/451 -odi -d-deliver -M 10HmaX-0005vi-00
   admin user
   set_process_info: 21680 delivering specified messages
   set_process_info: 21680 delivering 10HmaX-0005vi-00
  @@ -192,6 +193,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/451
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/451 -d=0xfbb95ced -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -244,6 +246,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/451
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/451 -d=0xfbb95ced -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 458
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/458,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 458    22 Mar 2005 14:50:10 -0000    1.3
  +++ 458    6 Apr 2005 10:06:14 -0000    1.4
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/458
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/458 -d-all+transport -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=285
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/458
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/458 -d=0x10000000 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
  @@ -55,6 +57,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/458
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/458 -DFILTER= -d-all+transport -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=288
  @@ -63,6 +66,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/458
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -DFILTER= -C /source/exim4/AutoTest/confs/458 -d=0x10000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>


  Index: 461
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/461,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 461    8 Oct 2004 14:50:08 -0000    1.1
  +++ 461    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/461
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/461 -d -bs
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp


  Index: 463
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/463,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 463    8 Oct 2004 14:50:08 -0000    1.1
  +++ 463    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/463
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/463 -d -odi -bs
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp


  Index: 466
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/466,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 466    19 Oct 2004 14:31:15 -0000    1.2
  +++ 466    6 Apr 2005 10:06:14 -0000    1.3
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/466
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/466 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -49,6 +50,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/466
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/466 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 468
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/468,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 468    16 Feb 2005 16:28:37 -0000    1.3
  +++ 468    6 Apr 2005 10:06:14 -0000    1.4
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/468
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/468 -odi -d+expand ph10@??? mug99@??? usr rd+ph10 rd+mug99
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -107,6 +108,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/468
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/468 -d=0xfbb95dfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10


  Index: 469
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/469,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 469    19 Oct 2004 14:31:15 -0000    1.2
  +++ 469    6 Apr 2005 10:06:14 -0000    1.3
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/469
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/469 -N -odi -d ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -49,6 +50,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/469
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/469 -d=0xfbb95cfd -N -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 470
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/470,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 470    21 Dec 2004 14:38:02 -0000    1.3
  +++ 470    6 Apr 2005 10:06:14 -0000    1.4
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/470
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/470 -d -odi mug99
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -147,6 +148,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/470
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/470 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10
  @@ -239,6 +241,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/470
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/ 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/470 -d=0xfbb95cfd -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -290,6 +293,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/470
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/470 -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10


  Index: 474
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/474,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 474    19 Oct 2004 14:31:15 -0000    1.2
  +++ 474    6 Apr 2005 10:06:14 -0000    1.3
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/474
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/474 -odi -d ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -49,6 +50,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/474
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/474 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 495
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/495,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 495    8 Oct 2004 14:50:08 -0000    1.1
  +++ 495    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/495
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/495 -d-all+route+host_lookup -odi x@???
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=264
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/495
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/495 -d=0x2000800 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
  @@ -60,6 +62,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/495
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/495 -d=0x2000800 -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -69,6 +72,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/495
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/495 -d=0x2000800 -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 504
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/504,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 504    8 Oct 2004 14:50:08 -0000    1.1
  +++ 504    6 Apr 2005 10:06:14 -0000    1.2
  @@ -8,6 +8,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   listening on all interfaces (IPv6) port 1225
  @@ -29,6 +30,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   listening on all interfaces (IPv6) port 1225
  @@ -52,6 +54,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 "-DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   listening on all interfaces (IPv6) port 1225
  @@ -76,6 +79,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 "-DIFACE=local_interfaces = <;  0.0.0.0; 127.0.0.1.1228 ; ::0"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   listening on all interfaces (IPv6) port 1225
  @@ -100,6 +104,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 "-DIFACE=local_interfaces = <;  2001:630:200:8100:207:e9ff:fe5d:b693"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   listening on 2001:630:200:8100:207:e9ff:fe5d:b693 port 1225
  @@ -121,6 +126,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -oX 1224 -DPORT=daemon_smtp_port=1225:1226 "-DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   daemon_smtp_port overridden by -oX:
  @@ -145,6 +151,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -oX "<; 1224;1225;127.0.0.1" -DPORT=daemon_smtp_port=1225:1226 "-DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   daemon_smtp_port overridden by -oX:
  @@ -170,6 +177,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/504
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/504 -d -bd -DSERVER=server -oX "<; ::0.1225; 0.0.0.0.1225;0.0.0.0.1226"
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   local_interfaces overridden by -oX:


  Index: 506
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/506,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 506    8 Oct 2004 14:50:08 -0000    1.1
  +++ 506    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/506
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/506 -d -bs
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp


  Index: 508
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/508,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 508    8 Oct 2004 14:50:08 -0000    1.1
  +++ 508    6 Apr 2005 10:06:14 -0000    1.2
  @@ -14,6 +14,7 @@
   lookup yielded: spool
   configuration file is /source/exim4/AutoTest/confs/508
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/508 -q -d-all+lookup
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp


  Index: 509
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/509,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 509    8 Oct 2004 14:50:08 -0000    1.1
  +++ 509    6 Apr 2005 10:06:14 -0000    1.2
  @@ -8,6 +8,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/509
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/509 -d -DSERVER=server -bd -oX 1225
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   daemon_smtp_port overridden by -oX:
  @@ -31,6 +32,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/509
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/509 -d -DSERVER=server -bd -oX 1225 -oP /source/exim4/AutoTest/spool/exim-daemon.anotherpid
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   daemon_smtp_port overridden by -oX:


  Index: 517
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/517,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 517    12 Nov 2004 11:28:15 -0000    1.3
  +++ 517    6 Apr 2005 10:06:14 -0000    1.4
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d -odi nofile@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -49,6 +50,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages
  @@ -174,6 +176,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -216,6 +219,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages
  @@ -342,6 +346,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -384,6 +389,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d=0xfbb95cfd -odi -Mc 10HmaZ-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages
  @@ -518,6 +524,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -560,6 +567,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/517
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/517 -d=0xfbb95cfd -odi -Mc 10HmbA-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 524
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/524,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 524    4 Nov 2004 12:19:49 -0000    1.2
  +++ 524    6 Apr 2005 10:06:14 -0000    1.3
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/524
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/524 -d-all+transport -odi ph10
   admin user
   LOG: MAIN
     <= ph10@??? U=ph10 P=local S=263
  @@ -12,6 +13,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/524
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/524 -d=0x10000000 -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
  @@ -38,6 +40,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/524
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/524 -d-all+transport -q
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp


  Index: 536
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/536,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 536    19 Oct 2004 14:31:15 -0000    1.2
  +++ 536    6 Apr 2005 10:06:14 -0000    1.3
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/536
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/536 -d -odi ph10@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp
  @@ -49,6 +50,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/536
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/536 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 538
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/538,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 538    8 Oct 2004 14:50:08 -0000    1.1
  +++ 538    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/538
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/538 -d-all+verify -v -bs -oMa 10.0.0.1
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -54,6 +55,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/538
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/538 -d-all+verify -v -bs -oMa 10.0.0.2
   trusted user
   admin user
   LOG: smtp_connection MAIN


  Index: 540
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/540,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 540    8 Oct 2004 14:50:08 -0000    1.1
  +++ 540    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/540
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/540 -d -bs
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp


  Index: 541
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/541,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 541    8 Oct 2004 14:50:08 -0000    1.1
  +++ 541    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/541
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/541 -d -bs
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -39,6 +40,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/541
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/541 -DSTD=strip_trailing_dot -d -bs
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -103,6 +105,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/541
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/541 -d -bs
   trusted user
   admin user
   changed uid/gid: privilege not needed


  Index: 549
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/549,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 549    16 Feb 2005 16:28:37 -0000    1.4
  +++ 549    6 Apr 2005 10:06:14 -0000    1.5
  @@ -11,6 +11,7 @@
   --Malloc   236 8200 16799
   configuration file is /source/exim4/AutoTest/confs/549
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/549 -d+memory -odq r1@???
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp


  Index: 552
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/552,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 552    14 Jan 2005 10:25:33 -0000    1.1
  +++ 552    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/552
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/552 -DUSE_SENDER= -bs -d-all+verify -v
   trusted user
   admin user
   LOG: smtp_connection MAIN
  @@ -35,6 +36,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/552
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/552 -DUSE_SENDER= -bs -d-all+verify -v
   trusted user
   admin user
   LOG: smtp_connection MAIN


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/555,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 555    4 Nov 2004 12:19:49 -0000    1.2
  +++ 555    6 Apr 2005 10:06:14 -0000    1.3
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/555
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/555 -d-all+transport+process_info -q
   admin user
   set_process_info: 21680 running the queue (single queue run)
   LOG: queue_run MAIN
  @@ -60,6 +61,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/555
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/555 -d=0x10080000 -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 accepting a local non-SMTP message from <>
  @@ -71,6 +73,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/555
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/555 -d=0x10080000 -Mc 10HmaZ-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 564
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/564,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 564    8 Oct 2004 14:50:08 -0000    1.1
  +++ 564    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/564
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/564 -bs -d-all+route
   admin user
   LOG: smtp_connection MAIN
     SMTP connection from ph10


  Index: 568
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/568,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 568    19 Oct 2004 14:31:15 -0000    1.2
  +++ 568    6 Apr 2005 10:06:14 -0000    1.3
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/568
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 11 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/568 -d -bnq -odi -bs ph10
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -70,6 +71,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/568
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/568 -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   trusted user
   admin user
   finduser used cached passwd data for ph10


  Index: 570
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/570,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 570    8 Oct 2004 14:50:08 -0000    1.1
  +++ 570    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "Phil Q. Hazel" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name="Phil Q. Hazel"
  @@ -35,6 +36,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "John "Jack" Smith" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=John "Jack" Smith
  @@ -66,6 +68,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "John "Jack" Q. Smith" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=John "Jack" "Q." Smith
  @@ -97,6 +100,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "John (Jack) Q. Smith" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name="John (Jack) Q. Smith"
  @@ -128,6 +132,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "John ("Jack") Q. Smith" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=John ("Jack") "Q." Smith
  @@ -159,6 +164,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "John (\"Jack\") Q. Smith" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name="John (\"Jack\") Q. Smith"
  @@ -190,6 +196,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "Phil \"Q Hazel" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name="Phil \"Q Hazel"
  @@ -221,6 +228,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/570
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/570 -d-all+receive -F "Phil \"Q "X." Hazel" X
   trusted user
   admin user
   originator: uid=1169 gid=1169 login=ph10 name="Phil \"Q" "X." Hazel


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 581    24 Nov 2004 16:14:50 -0000    1.3
  +++ 581    6 Apr 2005 10:06:14 -0000    1.4
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/581
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/581 -d -q
   admin user
   Single queue run
   set_process_info: 21680 running the queue (single queue run)
  @@ -182,6 +183,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/581
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/581 -d=0xfbb95cfd -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   changed uid/gid: privilege not needed
  @@ -236,6 +238,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/581
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/581 -d=0xfbb95cfd -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   set_process_info: 21680 delivering specified messages


  Index: 600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/600,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 600    4 Jan 2005 16:36:28 -0000    1.1
  +++ 600    6 Apr 2005 10:06:14 -0000    1.2
  @@ -3,6 +3,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/600 -d-all+transport -qf
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf
  @@ -69,6 +70,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 13 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/600 -d=0x10000000 -t -oem -oi -f <> -E10HmaX-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -79,6 +81,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/600 -d=0x10000000 -Mc 10HmaY-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -96,6 +99,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 9 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/600 -d-all+transport -qf -DHARDLIMIT=hosts_max_try_hardlimit=2
   admin user
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf
  @@ -140,6 +144,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 14 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -DHARDLIMIT=hosts_max_try_hardlimit=2 -C /source/exim4/AutoTest/confs/600 -d=0x10000000 -t -oem -oi -f <> -E10HmaZ-0005vi-00
   trusted user
   admin user
   LOG: MAIN
  @@ -150,6 +155,7 @@
   Fixed never_users: 0
   configuration file is /source/exim4/AutoTest/confs/600
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest/spool 10 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -DHARDLIMIT=hosts_max_try_hardlimit=2 -C /source/exim4/AutoTest/confs/600 -d=0x10000000 -Mc 10HmbA-0005vi-00
   trusted user
   admin user
   LOG: MAIN


  Index: 602
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/602,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 602    16 Feb 2005 16:28:37 -0000    1.1
  +++ 602    6 Apr 2005 10:06:14 -0000    1.2
  @@ -6,6 +6,7 @@
     auxiliary group list: <none>
   configuration file is /source/exim4/AutoTest/confs/602
   log selectors = xxxxxxxx xxxxxxxx
  +cwd=/source/exim4/AutoTest 8 args: /source/exim4/AutoTest/exim -DEXIM_PATH=/source/exim4/AutoTest/exim -DDIR=/source/exim4/AutoTest -DCALLER=ph10 -C /source/exim4/AutoTest/confs/602 -d -bp
   admin user
   changed uid/gid: privilege not needed
     uid=42 gid=42 pid=pppp