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

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Philip Hazel
Date:  
À: exim-cvs
Sujet: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src README.UPDATING exim/exim-src/src deliver.c structs.h exim/exim-src/src/routers queryprogram.c redirect.c exim/exim-src/src/tran
ph10 2005/04/28 14:06:35 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src             README.UPDATING 
    exim-src/src         deliver.c structs.h 
    exim-src/src/routers queryprogram.c redirect.c 
    exim-src/src/transports smtp.c 
    exim-test-orig/AutoTest/aux 079.F 180.filter 344.Filter 
    exim-test-orig/AutoTest/confs 029 133 166 177 335 
    exim-test-orig/AutoTest/log 025 029 079 081 085 132 133 138 
                                159 162 177 179 180 200 201 202 
                                217 232 235 236 237 238 240 244 
                                246 247 253 256 292 308 315 331 
                                332 335 343 344 359 374 397 412 
                                414 415 424 427 431 434 435 451 
                                495 497 499 526 530 537 553 555 
                                556 578 580 581 599 600 605 606 
                                608 
    exim-test-orig/AutoTest/mail 025.ph10 029.ph10 079.ph10 
                                 085.ph10 133.forwarder 138.ph10 
                                 177.ph10 179.ph10 180.ph10 
                                 201.copied 240.ph10 253.ph10 
                                 256.ph10 292.lmn 308.ph10 
                                 335.exbounce 344.ph10 359.ph10 
                                 434.ph10 435.ph10 497.ph10 
                                 526.ph10 605.ph10 
    exim-test-orig/AutoTest/msglog 237.10HmaX-0005vi-00 
                                   580.10HmaY-0005vi-00 
    exim-test-orig/AutoTest/scripts 166 605 
    exim-test-orig/AutoTest/stderr 079 166 246 247 315 414 415 427 
                                   434 435 451 495 555 578 581 600 
    exim-test-orig/AutoTest/stdout 414 415 427 553 556 580 581 
  Added files:
    exim-test-orig/AutoTest/log 166 
    exim-test-orig/AutoTest/mail 166.ph10 
  Log:
  Remove details of errors in bounce and delay warning messages, unless
  explicitly specified (e.g. :fail:) or a message from a remote host.


  Revision  Changes    Path
  1.128     +14 -0     exim/exim-doc/doc-txt/ChangeLog
  1.7       +4 -0      exim/exim-src/README.UPDATING
  1.14      +42 -51    exim/exim-src/src/deliver.c
  1.4       +5 -1      exim/exim-src/src/routers/queryprogram.c
  1.10      +7 -2      exim/exim-src/src/routers/redirect.c
  1.5       +1 -0      exim/exim-src/src/structs.h
  1.11      +50 -33    exim/exim-src/src/transports/smtp.c
  1.2       +2 -2      exim/exim-test-orig/AutoTest/aux/079.F
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/180.filter
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/344.Filter
  1.2       +1 -1      exim/exim-test-orig/AutoTest/confs/029
  1.2       +2 -2      exim/exim-test-orig/AutoTest/confs/133
  1.2       +11 -69    exim/exim-test-orig/AutoTest/confs/166
  1.2       +1 -1      exim/exim-test-orig/AutoTest/confs/177
  1.2       +1 -1      exim/exim-test-orig/AutoTest/confs/335
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/025
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/029
  1.2       +9 -9      exim/exim-test-orig/AutoTest/log/079
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/081
  1.3       +5 -5      exim/exim-test-orig/AutoTest/log/085
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/132
  1.2       +8 -8      exim/exim-test-orig/AutoTest/log/133
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/138
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/159
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/162
  1.1       +6 -0      exim/exim-test-orig/AutoTest/log/166 (new)
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/177
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/179
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/180
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/200
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/201
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/202
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/217
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/232
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/235
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/236
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/237
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/238
  1.2       +9 -9      exim/exim-test-orig/AutoTest/log/240
  1.3       +6 -6      exim/exim-test-orig/AutoTest/log/244
  1.2       +76 -76    exim/exim-test-orig/AutoTest/log/246
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/247
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/253
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/256
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/292
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/308
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/315
  1.2       +6 -6      exim/exim-test-orig/AutoTest/log/331
  1.2       +8 -8      exim/exim-test-orig/AutoTest/log/332
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/335
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/343
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/344
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/359
  1.2       +11 -11    exim/exim-test-orig/AutoTest/log/374
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/397
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/412
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/414
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/415
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/424
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/427
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/431
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/434
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/435
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/451
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/495
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/497
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/499
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/526
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/530
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/537
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/553
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/555
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/556
  1.2       +6 -6      exim/exim-test-orig/AutoTest/log/578
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/580
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/581
  1.2       +16 -16    exim/exim-test-orig/AutoTest/log/599
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/600
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/605
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/606
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/608
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/025.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/029.ph10
  1.2       +3 -16     exim/exim-test-orig/AutoTest/mail/079.ph10
  1.2       +0 -5      exim/exim-test-orig/AutoTest/mail/085.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/133.forwarder
  1.2       +0 -1      exim/exim-test-orig/AutoTest/mail/138.ph10
  1.1       +32 -0     exim/exim-test-orig/AutoTest/mail/166.ph10 (new)
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/177.ph10
  1.2       +0 -1      exim/exim-test-orig/AutoTest/mail/179.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/180.ph10
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/201.copied
  1.2       +3 -3      exim/exim-test-orig/AutoTest/mail/240.ph10
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/253.ph10
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/256.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/292.lmn
  1.2       +0 -1      exim/exim-test-orig/AutoTest/mail/308.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/335.exbounce
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/344.ph10
  1.2       +0 -3      exim/exim-test-orig/AutoTest/mail/359.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/434.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/435.ph10
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/497.ph10
  1.2       +0 -7      exim/exim-test-orig/AutoTest/mail/526.ph10
  1.2       +0 -2      exim/exim-test-orig/AutoTest/mail/605.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/msglog/237.10HmaX-0005vi-00
  1.2       +1 -1      exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00
  1.2       +4 -0      exim/exim-test-orig/AutoTest/scripts/166
  1.2       +1 -1      exim/exim-test-orig/AutoTest/scripts/605
  1.3       +1 -1      exim/exim-test-orig/AutoTest/stderr/079
  1.2       +36 -0     exim/exim-test-orig/AutoTest/stderr/166
  1.2       +53 -53    exim/exim-test-orig/AutoTest/stderr/246
  1.4       +4 -4      exim/exim-test-orig/AutoTest/stderr/247
  1.3       +4 -4      exim/exim-test-orig/AutoTest/stderr/315
  1.3       +6 -6      exim/exim-test-orig/AutoTest/stderr/414
  1.3       +8 -8      exim/exim-test-orig/AutoTest/stderr/415
  1.3       +1 -1      exim/exim-test-orig/AutoTest/stderr/427
  1.3       +3 -3      exim/exim-test-orig/AutoTest/stderr/434
  1.3       +6 -6      exim/exim-test-orig/AutoTest/stderr/435
  1.5       +3 -3      exim/exim-test-orig/AutoTest/stderr/451
  1.3       +2 -2      exim/exim-test-orig/AutoTest/stderr/495
  1.4       +2 -2      exim/exim-test-orig/AutoTest/stderr/555
  1.2       +3 -3      exim/exim-test-orig/AutoTest/stderr/578
  1.5       +2 -2      exim/exim-test-orig/AutoTest/stderr/581
  1.3       +2 -2      exim/exim-test-orig/AutoTest/stderr/600
  1.2       +3 -3      exim/exim-test-orig/AutoTest/stdout/414
  1.2       +4 -4      exim/exim-test-orig/AutoTest/stdout/415
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/427
  1.2       +3 -3      exim/exim-test-orig/AutoTest/stdout/553
  1.2       +4 -4      exim/exim-test-orig/AutoTest/stdout/556
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/580
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/581


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- ChangeLog    27 Apr 2005 13:29:32 -0000    1.127
  +++ ChangeLog    28 Apr 2005 13:06:32 -0000    1.128
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.127 2005/04/27 13:29:32 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.128 2005/04/28 13:06:32 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -248,6 +248,20 @@
   PH/41 $message_linecount is a new variable that contains the total number of
         lines in the message. Compare $body_linecount, which is the count for the
         body only.
  +
  +PH/42 Exim no longer gives details of delivery errors for specific addresses in
  +      bounce and delay warning messages, except in certain special cases, which
  +      are as follows:
  +
  +      (a) An SMTP error message from a remote host;
  +      (b) A message specified in a :fail: redirection;
  +      (c) A message specified in a "fail" command in a system filter;
  +      (d) A message specified in a FAIL return from the queryprogram router;
  +      (e) A message specified by the cannot_route_message router option.
  +
  +      In these cases only, Exim does include the error details in bounce and
  +      warning messages. There are also a few cases where bland messages such
  +      as "unrouteable address" or "local delivery error" are given.



A note about Exim versions 4.44 and 4.50

  Index: README.UPDATING
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/README.UPDATING,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- README.UPDATING    6 Apr 2005 16:26:42 -0000    1.6
  +++ README.UPDATING    28 Apr 2005 13:06:32 -0000    1.7
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/README.UPDATING,v 1.6 2005/04/06 16:26:42 ph10 Exp $
  +$Cambridge: exim/exim-src/README.UPDATING,v 1.7 2005/04/28 13:06:32 ph10 Exp $


This document contains detailed information about incompatibilities that might
be encountered when upgrading from one release of Exim to another. The
@@ -49,6 +49,10 @@
uses prefixes or suffixes on addresses that could be used for callouts, and you
want the affixes to be retained, you must make sure that rcpt_include_affixes
is set on the transport.
+
+3. Bounce and delay warning messages no longer contain details of delivery
+errors, except for explicit messages (e.g. generated by :fail:) and SMTP
+responses from remote hosts.


Version 4.50

  Index: deliver.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- deliver.c    7 Apr 2005 15:40:50 -0000    1.13
  +++ deliver.c    28 Apr 2005 13:06:32 -0000    1.14
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/deliver.c,v 1.13 2005/04/07 15:40:50 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/deliver.c,v 1.14 2005/04/28 13:06:32 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -4180,7 +4180,6 @@
     printed = US"an undisclosed address";
     yield = FALSE;
     }
  -
   else if (!testflag(addr, af_pfr) || addr->parent == NULL)
     printed = addr->address;


@@ -4217,7 +4216,6 @@



  -
   /*************************************************
   *         Print error for an address             *
   *************************************************/
  @@ -4227,53 +4225,62 @@
   introducing newlines. All lines are indented by 4; the initial printing
   position must be set before calling.


  +This function used always to print the error. Nowadays we want to restrict it
  +to cases such as SMTP errors from a remote host, and errors from :fail: and
  +filter "fail". We no longer pass other information willy-nilly in bounce and
  +warning messages. Text in user_message is always output; text in message only
  +if the af_pass_message flag is set.
  +
   Arguments:
  -  addr         points to the address
  +  addr         the address
     f            the FILE to print on
  +  s            some leading text


   Returns:       nothing
   */


   static void
  -print_address_error(address_item *addr, FILE *f)
  +print_address_error(address_item *addr, FILE *f, uschar *t)
   {
  +int count = Ustrlen(t);
   uschar *s = (addr->user_message != NULL)? addr->user_message : addr->message;
  -if (addr->basic_errno > 0)
  -  {
  -  fprintf(f, "%s%s", strerror(addr->basic_errno),
  -    (s == NULL)? "" : ":\n    ");
  -  }
  -if (s == NULL)
  +
  +if (addr->user_message != NULL)
  +  s = addr->user_message;
  +else
     {
  -  if (addr->basic_errno <= 0) fprintf(f, "unknown error");
  +  if (!testflag(addr, af_pass_message) || addr->message == NULL) return;
  +  s = addr->message;
     }
  -else
  +
  +fprintf(f, "\n    %s", t);
  +
  +while (*s != 0)
     {
  -  int count = 0;
  -  while (*s != 0)
  +  if (*s == '\\' && s[1] == 'n')
  +    {
  +    fprintf(f, "\n    ");
  +    s += 2;
  +    count = 0;
  +    }
  +  else
       {
  -    if (*s == '\\' && s[1] == 'n')
  +    fputc(*s, f);
  +    count++;
  +    if (*s++ == ':' && isspace(*s) && count > 45)
         {
  -      fprintf(f, "\n    ");
  -      s += 2;
  +      fprintf(f, "\n   ");  /* sic (because space follows) */
         count = 0;
         }
  -    else
  -      {
  -      fputc(*s, f);
  -      count++;
  -      if (*s++ == ':' && isspace(*s) && count > 45)
  -        {
  -        fprintf(f, "\n   ");  /* sic (because space follows) */
  -        count = 0;
  -        }
  -      }
       }
     }
   }




  +
  +
  +
   /*************************************************
   *     Check list of addresses for duplication    *
   *************************************************/
  @@ -4994,6 +5001,7 @@
           case RECIP_FAIL_FILTER:
           new->message =
             (filter_message == NULL)? US"delivery cancelled" : filter_message;
  +        setflag(new, af_pass_message);
           goto RECIP_QUEUE_FAILED;   /* below */



@@ -6182,26 +6190,15 @@

         /* Process the addresses, leaving them on the msgchain if they have a
         file name for a return message. (There has already been a check in
  -      post_process_one() for the existence of data in the message file.) */
  +      post_process_one() for the existence of data in the message file.) A TRUE
  +      return from print_address_information() means that the address is not
  +      hidden. */


         paddr = &msgchain;
         for (addr = msgchain; addr != NULL; addr = *paddr)
           {
           if (print_address_information(addr, f, US"  ", US"\n    ", US""))
  -          {
  -          /* A TRUE return from print_address_information() means that the
  -          address is not hidden. If there is a return file, it has already
  -          been checked to ensure it is not empty. Omit the bland "return
  -          message generated" error, but otherwise include error information. */
  -
  -          if (addr->return_file < 0 ||
  -              addr->message == NULL ||
  -              Ustrcmp(addr->message, "return message generated") != 0)
  -            {
  -            fprintf(f, "\n    ");
  -            print_address_error(addr, f);
  -            }
  -          }
  +          print_address_error(addr, f, US"");


           /* End the final line for the address */


  @@ -6703,21 +6700,15 @@
               (addr_defer->next == NULL)? "is": "are");
             }


  -        /* List the addresses. For any that are hidden, don't give the delay
  -        reason, because it might expose that which is hidden. Also, do not give
  -        "retry time not reached" because that isn't helpful. */
  +        /* List the addresses, with error information if allowed */


           fprintf(f, "\n");
           while (addr_defer != NULL)
             {
             address_item *addr = addr_defer;
             addr_defer = addr->next;
  -          if (print_address_information(addr, f, US"  ", US"\n    ", US"") &&
  -              addr->basic_errno > ERRNO_RETRY_BASE)
  -            {
  -            fprintf(f, "\n    Delay reason: ");
  -            print_address_error(addr, f);
  -            }
  +          if (print_address_information(addr, f, US"  ", US"\n    ", US""))
  +            print_address_error(addr, f, US"Delay reason: ");
             fprintf(f, "\n");
             }
           fprintf(f, "\n");


  Index: structs.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/structs.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- structs.h    17 Feb 2005 11:58:26 -0000    1.4
  +++ structs.h    28 Apr 2005 13:06:32 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/structs.h,v 1.4 2005/02/17 11:58:26 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/structs.h,v 1.5 2005/04/28 13:06:32 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -498,6 +498,7 @@
   #define af_verify_callout      0x00400000 /* for cached sender verify: callout was specified */
   #define af_include_affixes     0x00800000 /* delivered with affixes in RCPT */
   #define af_cert_verified       0x01000000 /* delivered with verified TLS cert */
  +#define af_pass_message        0x02000000 /* pass message in bounces */


/* These flags must be propagated when a child is created */


  Index: queryprogram.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/routers/queryprogram.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- queryprogram.c    6 Apr 2005 14:40:24 -0000    1.3
  +++ queryprogram.c    28 Apr 2005 13:06:32 -0000    1.4
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/routers/queryprogram.c,v 1.3 2005/04/06 14:40:24 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/routers/queryprogram.c,v 1.4 2005/04/28 13:06:32 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -416,7 +416,11 @@
     if (strcmpic(rword, US"decline") == 0) return DECLINE;
     if (strcmpic(rword, US"pass") == 0) return PASS;
     addr->message = string_copy(rdata);                /* data is a message */
  -  if (strcmpic(rword, US"fail") == 0) return FAIL;
  +  if (strcmpic(rword, US"fail") == 0)
  +    {
  +    setflag(addr, af_pass_message);
  +    return FAIL;
  +    }
     if (strcmpic(rword, US"freeze") == 0) addr->special_action = SPECIAL_FREEZE;
     else if (strcmpic(rword, US"defer") != 0)
       {


  Index: redirect.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/routers/redirect.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- redirect.c    6 Apr 2005 14:40:24 -0000    1.9
  +++ redirect.c    28 Apr 2005 13:06:32 -0000    1.10
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/routers/redirect.c,v 1.9 2005/04/06 14:40:24 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/routers/redirect.c,v 1.10 2005/04/28 13:06:32 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -655,8 +655,13 @@
     if ((xrc = sort_errors_and_headers(rblock, addr, verify, &addr_prop)) != OK)
       return xrc;
     add_generated(rblock, addr_new, addr, generated, &addr_prop, &ugid, pw);
  -  if (addr->message == NULL) addr->message = US"forced rejection";
  -    else addr->user_message = addr->message;
  +  if (addr->message == NULL)
  +    addr->message = US"forced rejection";
  +  else
  +    {
  +    addr->user_message = addr->message;
  +    setflag(addr, af_pass_message);
  +    }
     return FAIL;


     /* As in the case of a system filter, a freeze does not happen after a manual


  Index: smtp.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- smtp.c    7 Apr 2005 10:54:54 -0000    1.10
  +++ smtp.c    28 Apr 2005 13:06:32 -0000    1.11
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.10 2005/04/07 10:54:54 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.11 2005/04/28 13:06:32 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -313,10 +313,11 @@
   status means that an address is not currently being processed.


   Arguments:
  -  addrlist     points to a chain of addresses
  -  errno_value  to put in each address's errno field
  -  msg          to put in each address's message field
  -  rc           to put in each address's transport_return field
  +  addrlist       points to a chain of addresses
  +  errno_value    to put in each address's errno field
  +  msg            to put in each address's message field
  +  rc             to put in each address's transport_return field
  +  pass_message   if TRUE, set the "pass message" flag in the address


If errno_value has the special value ERRNO_CONNECTTIMEOUT, ETIMEDOUT is put in
the errno field, and RTEF_CTOUT is ORed into the more_errno field, to indicate
@@ -326,7 +327,8 @@
*/

   static
  -void set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc)
  +void set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc,
  +  BOOL pass_message)
   {
   address_item *addr;
   int orvalue = 0;
  @@ -340,7 +342,11 @@
     if (addr->transport_return < PENDING) continue;
     addr->basic_errno = errno_value;
     addr->more_errno |= orvalue;
  -  if (msg != NULL) addr->message = msg;
  +  if (msg != NULL)
  +    {
  +    addr->message = msg;
  +    if (pass_message) setflag(addr, af_pass_message);
  +    }
     addr->transport_return = rc;
     }
   }
  @@ -358,18 +364,19 @@
   chosen.


   Arguments:
  -  host         the current host, to get its name for messages
  -  errno_value  pointer to the errno value
  -  more_errno   from the top address for use with ERRNO_FILTER_FAIL
  -  buffer       the SMTP response buffer
  -  yield        where to put a one-digit SMTP response code
  -  message      where to put an errror message
  +  host           the current host, to get its name for messages
  +  errno_value    pointer to the errno value
  +  more_errno     from the top address for use with ERRNO_FILTER_FAIL
  +  buffer         the SMTP response buffer
  +  yield          where to put a one-digit SMTP response code
  +  message        where to put an errror message
  +  pass_message   set TRUE if message is an SMTP response


  -Returns:       TRUE if an SMTP "QUIT" command should be sent, else FALSE
  +Returns:         TRUE if an SMTP "QUIT" command should be sent, else FALSE
   */


static BOOL check_response(host_item *host, int *errno_value, int more_errno,
- uschar *buffer, int *yield, uschar **message)
+ uschar *buffer, int *yield, uschar **message, BOOL *pass_message)
{
uschar *pl = US"";

  @@ -444,8 +451,9 @@
   if (buffer[0] != 0)
     {
     uschar *s = string_printing(buffer);
  -  *message = US string_sprintf("SMTP error from remote mailer after %s%s: "
  +  *message = US string_sprintf("SMTP error from remote mail server after %s%s: "
       "host %s [%s]: %s", pl, smtp_command, host->name, host->address, s);
  +  *pass_message = TRUE;
     *yield = buffer[0];
     return TRUE;
     }
  @@ -623,7 +631,7 @@
       uschar *message = string_sprintf("SMTP timeout while connected to %s [%s] "
         "after RCPT TO:<%s>", host->name, host->address,
         transport_rcpt_address(addr, include_affixes));
  -    set_errno(addrlist, save_errno, message, DEFER);
  +    set_errno(addrlist, save_errno, message, DEFER, FALSE);
       retry_add_item(addr, addr->address_retry_key, 0);
       host->update_waiting = FALSE;
       return -1;
  @@ -646,9 +654,10 @@
     else
       {
       addr->message =
  -      string_sprintf("SMTP error from remote mailer after RCPT TO:<%s>: "
  +      string_sprintf("SMTP error from remote mail server after RCPT TO:<%s>: "
           "host %s [%s]: %s", transport_rcpt_address(addr, include_affixes),
           host->name, host->address, string_printing(buffer));
  +    setflag(addr, af_pass_message);
       deliver_msglog("%s %s\n", tod_stamp(tod_log), addr->message);


       /* The response was 5xx */
  @@ -699,8 +708,9 @@
     {
     int code;
     uschar *msg;
  +  BOOL pass_message;
     if (pending_DATA > 0 || (yield & 1) != 0) return -3;
  -  (void)check_response(host, &errno, 0, buffer, &code, &msg);
  +  (void)check_response(host, &errno, 0, buffer, &code, &msg, &pass_message);
     DEBUG(D_transport) debug_printf("%s\nerror for DATA ignored: pipelining "
       "is in use and there were no good recipients\n", msg);
     }
  @@ -782,6 +792,7 @@
   BOOL completed_address = FALSE;
   BOOL esmtp = TRUE;
   BOOL pending_MAIL;
  +BOOL pass_message = FALSE;
   smtp_inblock inblock;
   smtp_outblock outblock;
   int max_rcpt = tblock->max_addresses;
  @@ -822,7 +833,7 @@
     {
     uschar *message = string_sprintf("failed to expand helo_data: %s",
       expand_string_message);
  -  set_errno(addrlist, 0, message, DEFER);
  +  set_errno(addrlist, 0, message, DEFER, FALSE);
     return ERROR;
     }


  @@ -842,7 +853,7 @@
         {
         uschar *message = string_sprintf("failed to expand "
           "authenticated_sender: %s", expand_string_message);
  -      set_errno(addrlist, 0, message, DEFER);
  +      set_errno(addrlist, 0, message, DEFER, FALSE);
         return ERROR;
         }
       }
  @@ -861,7 +872,7 @@
     if (inblock.sock < 0)
       {
       set_errno(addrlist, (errno == ETIMEDOUT)? ERRNO_CONNECTTIMEOUT : errno,
  -      NULL, DEFER);
  +      NULL, DEFER, FALSE);
       return DEFER;
       }


@@ -1186,7 +1197,7 @@

               case ERROR:
               yield = ERROR;
  -            set_errno(addrlist, 0, string_copy(buffer), DEFER);
  +            set_errno(addrlist, 0, string_copy(buffer), DEFER, FALSE);
               goto SEND_QUIT;
               }


  @@ -1202,7 +1213,8 @@
       {
       yield = DEFER;
       set_errno(addrlist, ERRNO_AUTHFAIL,
  -      string_sprintf("authentication required but %s", fail_reason), DEFER);
  +      string_sprintf("authentication required but %s", fail_reason), DEFER,
  +      FALSE);
       goto SEND_QUIT;
       }
     }
  @@ -1228,7 +1240,8 @@


     if (!rc)
       {
  -    set_errno(addrlist->next, addrlist->basic_errno, addrlist->message, DEFER);
  +    set_errno(addrlist->next, addrlist->basic_errno, addrlist->message, DEFER,
  +      FALSE);
       yield = ERROR;
       goto SEND_QUIT;
       }
  @@ -1368,7 +1381,8 @@
       }
     if (badaddr != NULL)
       {
  -    set_errno(addrlist, 0, badaddr->message, FAIL);
  +    set_errno(addrlist, 0, badaddr->message, FAIL,
  +      testflag(badaddr, af_pass_message));
       ok = FALSE;
       }
     }
  @@ -1597,7 +1611,7 @@
     save_errno = errno;
     message = NULL;
     send_quit = check_response(host, &save_errno, addrlist->more_errno,
  -    buffer, &code, &message);
  +    buffer, &code, &message, &pass_message);
     goto FAILED;


     SEND_FAILED:
  @@ -1632,11 +1646,11 @@
       {
       if (code == '5')
         {
  -      set_errno(addrlist, save_errno, message, FAIL);
  +      set_errno(addrlist, save_errno, message, FAIL, pass_message);
         }
       else
         {
  -      set_errno(addrlist, save_errno, message, DEFER);
  +      set_errno(addrlist, save_errno, message, DEFER, pass_message);
         yield = DEFER;
         }
       }
  @@ -1662,7 +1676,7 @@
       {
       yield = (save_errno == ERRNO_CHHEADER_FAIL ||
                save_errno == ERRNO_FILTER_FAIL)? ERROR : DEFER;
  -    set_errno(addrlist, save_errno, message, DEFER);
  +    set_errno(addrlist, save_errno, message, DEFER, pass_message);
       }


     /* Otherwise we have a message-specific error response from the remote
  @@ -1683,7 +1697,8 @@
       {
       if (mua_wrapper) code = '5';  /* Force hard failure in wrapper mode */


  -    set_errno(addrlist, save_errno, message, (code == '5')? FAIL : DEFER);
  +    set_errno(addrlist, save_errno, message, (code == '5')? FAIL : DEFER,
  +      pass_message);


       /* If there's an errno, the message contains just the identity of
       the host. */
  @@ -1747,6 +1762,7 @@
           ))
       {
       uschar *msg;
  +    BOOL pass_message;


       if (send_rset)
         {
  @@ -1760,7 +1776,8 @@
                     ob->command_timeout)))
           {
           int code;
  -        send_quit = check_response(host, &errno, 0, buffer, &code, &msg);
  +        send_quit = check_response(host, &errno, 0, buffer, &code, &msg,
  +          &pass_message);
           if (!send_quit)
             {
             DEBUG(D_transport) debug_printf("%s\n", msg);
  @@ -1806,7 +1823,7 @@


       /* If RSET failed and there are addresses left, they get deferred. */


  -    else set_errno(first_addr, errno, msg, DEFER);
  +    else set_errno(first_addr, errno, msg, DEFER, FALSE);
       }
     }


  @@ -2449,7 +2466,7 @@
       if (dont_deliver)
         {
         host_item *host2;
  -      set_errno(addrlist, 0, NULL, OK);
  +      set_errno(addrlist, 0, NULL, OK, FALSE);
         for (addr = addrlist; addr != NULL; addr = addr->next)
           {
           addr->host_used = host;


  Index: 079.F
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/079.F,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 079.F    8 Oct 2004 14:04:55 -0000    1.1
  +++ 079.F    28 Apr 2005 13:06:32 -0000    1.2
  @@ -39,11 +39,11 @@
   endif   


if $h_subject contains "fail this" then
- fail text "subject was\t\"$h_subject:\""
+ fail text "subject was\t\"$h_subject:\" (filter fail)"
endif

if $h_subject contains "defer this" then
- defer text "subject was\t\"$h_subject:\""
+ defer text "subject was\t\"$h_subject:\" (filter defer)"
endif

if $h_subject contains "freeze this" then

  Index: 180.filter
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/180.filter,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 180.filter    8 Oct 2004 14:04:55 -0000    1.1
  +++ 180.filter    28 Apr 2005 13:06:32 -0000    1.2
  @@ -19,7 +19,7 @@
   if $h_subject contains "fail this" then 
     mail to mug99 text "failing $local_part@$domain" 
       subject "auto fail message" 
  -  fail text "subject was \"$h_subject:\""
  +  fail text "subject was \"$h_subject:\" (filter fail)"
   endif   


if $h_subject contains "freeze this" then

  Index: 344.Filter
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/344.Filter,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 344.Filter    8 Oct 2004 14:04:55 -0000    1.1
  +++ 344.Filter    28 Apr 2005 13:06:32 -0000    1.2
  @@ -1,5 +1,5 @@
   # Exim filter


if $recipients contains failure then
- fail "this message is a failure"
+ fail "this message is a failure (filter fail)"
endif

  Index: 029
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/029,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 029    8 Oct 2004 14:49:15 -0000    1.1
  +++ 029    28 Apr 2005 13:06:32 -0000    1.2
  @@ -26,7 +26,7 @@
     driver = redirect
     domains = ! +local_domains
     allow_fail
  -  data = :fail: unrouteable mail domain "$domain"
  +  data = :fail: unrouteable mail domain "$domain" (:fail:) 


   localuser:
     driver = accept


  Index: 133
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/133,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 133    8 Oct 2004 14:49:15 -0000    1.1
  +++ 133    28 Apr 2005 13:06:32 -0000    1.2
  @@ -36,7 +36,7 @@
     driver = redirect
     domains = ! +local_domains
     allow_fail 
  -  data = :fail: unrouteable mail domain "$domain"            
  +  data = :fail: unrouteable mail domain "$domain" (:fail:)           


   forward:
     driver = redirect
  @@ -51,7 +51,7 @@
     driver = redirect
     allow_defer
     allow_fail 
  -  data = :fail: Address unknown
  +  data = :fail: Address unknown (:fail:)
     local_parts = unknown
     retry_use_local_part



  Index: 166
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/166,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 166    8 Oct 2004 14:49:15 -0000    1.1
  +++ 166    28 Apr 2005 13:06:32 -0000    1.2
  @@ -1,25 +1,3 @@
  -#!!# This file is output from the convert4r4 script, which tries
  -#!!# to convert Exim 3 configurations into Exim 4 configurations.
  -#!!# However, is is not perfect, especially with non-simple
  -#!!# configurations. You must check it before running it.
  -
  -
  -#!!# These options specify the Access Control Lists (ACLs) that
  -#!!# are used for incoming SMTP messages - after the RCPT and DATA
  -#!!# commands, respectively.
  -
  -acl_smtp_rcpt = check_recipient
  -acl_smtp_data = check_message
  -
  -#!!# This setting defines a named domain list called
  -#!!# local_domains, created from the old options that
  -#!!# referred to local domains. It will be referenced
  -#!!# later on by the syntax "+local_domains".
  -#!!# Other domain and host lists may follow.
  -
  -domainlist local_domains = test.ex
  -
  -
   # Exim test configuration 166


# Macros are set externally in order to get the path
@@ -32,48 +10,16 @@

# ----- Main settings -----

+domainlist local_domains = test.ex

  -
  -#!!#######################################################!!#
  -#!!# This new section of the configuration contains ACLs #!!#
  -#!!# (Access Control Lists) derived from the Exim 3      #!!#
  -#!!# policy control options.                             #!!#
  -#!!#######################################################!!#
  -
  -#!!# These ACLs are crudely constructed from Exim 3 options.
  -#!!# They are almost certainly not optimal. You should study
  -#!!# them and rewrite as necessary.
  -
  -begin acl
  -
  -#!!# ACL that is used after the RCPT command
  -check_recipient:
  -  # Exim 3 had no checking on -bs messages
  -  accept  hosts = :
  -  accept  domains = +local_domains
  -  deny    message = relay not permitted
  -
  -#!!# ACL that is used after the DATA command
  -check_message:
  -  accept
  -
  -
  -# ----- Authentication -----
  -
  -# End
  -
  -# ----- Rewrite -----
  -
  -
  -#!!#######################################################!!#
  -#!!# Here follow routers created from the old routers,   #!!#
  -#!!# for handling non-local domains.                     #!!#
  -#!!#######################################################!!#
  +# ----- Routers -----


begin routers

-
-# ----- Routers -----
+b:
+ driver = accept
+ senders = :
+ transport = local_delivery

   q:
     driver = queryprogram
  @@ -93,14 +39,6 @@
     transport = smtp
     no_more


  -
  -#!!#######################################################!!#
  -#!!# Here follow routers created from the old directors, #!!#
  -#!!# for handling local domains.                         #!!#
  -#!!#######################################################!!#
  -
  -# ----- Directors -----
  -
   pm:
     driver = accept
     local_parts = postmaster
  @@ -121,10 +59,14 @@
   null:
     driver = appendfile
     file = /dev/null
  +  
  +local_delivery:
  +  driver = appendfile
  +  file = DIR/test-mail/$local_part
  +  user = CALLER   



# ----- Retry -----
-

begin retry


  Index: 177
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/177,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 177    8 Oct 2004 14:49:15 -0000    1.1
  +++ 177    28 Apr 2005 13:06:32 -0000    1.2
  @@ -33,7 +33,7 @@
     driver = redirect
     domains = ! +local_domains
     allow_fail 
  -  data = :fail: unrouteable mail domain "$domain"
  +  data = :fail: unrouteable mail domain "$domain" (:fail:)


   check2:
     driver = accept


  Index: 335
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/335,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 335    8 Oct 2004 14:49:15 -0000    1.1
  +++ 335    28 Apr 2005 13:06:32 -0000    1.2
  @@ -33,7 +33,7 @@
     driver = redirect
     local_parts = bounce 
     allow_fail 
  -  data = :fail: bounced 
  +  data = :fail: bounced (:fail:)


   r1:  
     driver = accept


Index: 166
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=306
1999-03-02 09:44:33 10HmaX-0005vi-00 ** FAIL cannot route this one (FAIL)@some.host <"FAIL cannot route this one (FAIL)"@???> R=q: cannot route this one (FAIL)
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1171
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=b T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

  Index: 025
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/025,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 025    8 Oct 2004 14:49:31 -0000    1.1
  +++ 025    28 Apr 2005 13:06:33 -0000    1.2
  @@ -5,7 +5,7 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 => >ph10 <page+ph10@???> R=userforward T=address_reply
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1146
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1085
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  @@ -16,7 +16,7 @@
   1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 => >ph10 (page+ph10@???) <page+ph@???> R=userforward T=address_reply
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1197
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1136
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed


  Index: 029
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/029,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 029    8 Oct 2004 14:49:31 -0000    1.1
  +++ 029    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,8 +8,8 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=273
  -1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "badbad.ex"
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1053
  +1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "badbad.ex" (:fail:)
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1062
   1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  @@ -23,8 +23,8 @@
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=274
  -1999-03-02 09:44:33 10HmbF-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "domain2.ex"
  -1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1057
  +1999-03-02 09:44:33 10HmbF-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "domain2.ex" (:fail:)
  +1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1066
   1999-03-02 09:44:33 10HmbG-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed


  Index: 079
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/079,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 079    8 Oct 2004 14:49:31 -0000    1.1
  +++ 079    28 Apr 2005 13:06:33 -0000    1.2
  @@ -5,9 +5,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=284
   1999-03-02 09:44:33 10HmaY-0005vi-00 "should fail this" first delivery
  -1999-03-02 09:44:33 10HmaY-0005vi-00 cancelled by system filter: subject was    "should fail this"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 cancelled by system filter: subject was    "should fail this" (filter fail)
   1999-03-02 09:44:33 10HmaY-0005vi-00 => mug999 <system-filter> R=users T=appendfile
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1238
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1280
   1999-03-02 09:44:33 10HmaZ-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  @@ -33,7 +33,7 @@
   1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=310
   1999-03-02 09:44:33 10HmbE-0005vi-00 "should give filter error (1)" first delivery
   1999-03-02 09:44:33 10HmbE-0005vi-00 ** |cat <filter-pipe@???> R=userfilter: delivery to pipe forbidden
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1170
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1139
   1999-03-02 09:44:33 10HmbF-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
  @@ -41,7 +41,7 @@
   1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=310
   1999-03-02 09:44:33 10HmbG-0005vi-00 "should give filter error (2)" first delivery
   1999-03-02 09:44:33 10HmbG-0005vi-00 ** /tmp/junk <filter-file@???> R=userfilter: delivery to file forbidden
  -1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=exim P=local S=1175
  +1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=exim P=local S=1144
   1999-03-02 09:44:33 10HmbH-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbH-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
  @@ -50,7 +50,7 @@
   1999-03-02 09:44:33 10HmbI-0005vi-00 "should give filter error (3)" first delivery
   1999-03-02 09:44:33 10HmbI-0005vi-00 == filter-lookup@??? R=userfilter defer (-17): error in filter file: failed to expand "${lookup{$local_part}lsearch{/etc/passwd}{$value}fail}" in deliver command: lookup expansions are not permitted
   1999-03-02 09:44:33 10HmbI-0005vi-00 ** filter-lookup@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1299
  +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1115
   1999-03-02 09:44:33 10HmbJ-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbJ-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
  @@ -59,7 +59,7 @@
   1999-03-02 09:44:33 10HmbK-0005vi-00 "should give filter error (4)" first delivery
   1999-03-02 09:44:33 10HmbK-0005vi-00 == filter-exists@??? R=userfilter defer (-17): error in filter file: failed to expand "${if exists{/tmp/junk}{abc}{def}}" in deliver command: File existence tests are not permitted
   1999-03-02 09:44:33 10HmbK-0005vi-00 ** filter-exists@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=exim P=local S=1281
  +1999-03-02 09:44:33 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=exim P=local S=1115
   1999-03-02 09:44:33 10HmbL-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbL-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
  @@ -68,7 +68,7 @@
   1999-03-02 09:44:33 10HmbM-0005vi-00 "should give filter error (5)" first delivery
   1999-03-02 09:44:33 10HmbM-0005vi-00 == filter-readfile@??? R=userfilter defer (-17): error in filter file: failed to expand "${readfile{/some/file}}" in deliver command: file insertions are not permitted
   1999-03-02 09:44:33 10HmbM-0005vi-00 ** filter-readfile@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=exim P=local S=1272
  +1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=exim P=local S=1121
   1999-03-02 09:44:33 10HmbN-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbN-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
  @@ -77,7 +77,7 @@
   1999-03-02 09:44:33 10HmbO-0005vi-00 "should give filter error (6)" first delivery
   1999-03-02 09:44:33 10HmbO-0005vi-00 == filter-run@??? R=userfilter defer (-17): error in filter file: failed to expand "${run{/some/script}}" in deliver command: running a command is not permitted
   1999-03-02 09:44:33 10HmbO-0005vi-00 ** filter-run@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbP-0005vi-00 <= <> R=10HmbO-0005vi-00 U=exim P=local S=1255
  +1999-03-02 09:44:33 10HmbP-0005vi-00 <= <> R=10HmbO-0005vi-00 U=exim P=local S=1106
   1999-03-02 09:44:33 10HmbP-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbP-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
  @@ -121,7 +121,7 @@
   1999-03-02 09:44:33 10HmbU-0005vi-00 == readfile@??? R=fail_read_filter defer (-17): error in filter file: failed to expand "${readfile{/source/exim4/AutoTest/test.private}}" in filter file: failed to open /source/exim4/AutoTest/test.private: Permission denied (euid=1169 egid=1169)
   1999-03-02 09:44:33 10HmbU-0005vi-00 => mug999 <system-filter> R=users T=appendfile
   1999-03-02 09:44:33 10HmbU-0005vi-00 ** readfile@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1330
  +1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1096
   1999-03-02 09:44:33 10HmbV-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
   1999-03-02 09:44:33 10HmbV-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
   1999-03-02 09:44:33 10HmbV-0005vi-00 Completed


  Index: 081
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/081,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 081    8 Oct 2004 14:49:31 -0000    1.1
  +++ 081    28 Apr 2005 13:06:33 -0000    1.2
  @@ -18,14 +18,14 @@
   1999-03-02 09:44:33 10HmbC-0005vi-00 plain authenticator failed H=127.0.0.1 [127.0.0.1] 535 Sorry, authentication failed
   1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=force T=smtp_force defer (-42): authentication required but authentication attempt(s) failed
   1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1140
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmbD-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=267
   1999-03-02 09:44:33 10HmbE-0005vi-00 == ph10@??? R=force T=smtp_force defer (-42): authentication required but server did not advertise AUTH support
   1999-03-02 09:44:33 10HmbE-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1145
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmbF-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmbF-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed


  Index: 085
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/085,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 085    5 Nov 2004 16:53:28 -0000    1.2
  +++ 085    28 Apr 2005 13:06:33 -0000    1.3
  @@ -4,7 +4,7 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
   1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <ph10@???> R=userforward defer (-30): pipe_transport unset in userforward router
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1258 T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1197 T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes"
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
  @@ -26,7 +26,7 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
   1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <ph10@???> R=userforward defer (-30): pipe_transport unset in userforward router
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1258 T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes"
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1197 T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes"
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
  @@ -57,7 +57,7 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
   1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <ph10@???> R=userforward defer (-30): pipe_transport unset in userforward router
  -1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=834 T="Warning: message 10HmaX-0005vi-00 delayed by 10 minutes"
  +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=773 T="Warning: message 10HmaX-0005vi-00 delayed by 10 minutes"
   1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
  @@ -67,12 +67,12 @@
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
   1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (110): Connection timed out
  -1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=695 T="Warning: message 10HmbB-0005vi-00 delayed by 0 minutes"
  +1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=656 T="Warning: message 10HmbB-0005vi-00 delayed by 0 minutes"
   1999-03-02 09:44:33 10HmbG-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (111): Connection refused
  -1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=700 T="Warning: message 10HmbD-0005vi-00 delayed by 0 minutes"
  +1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=663 T="Warning: message 10HmbD-0005vi-00 delayed by 0 minutes"
   1999-03-02 09:44:33 10HmbH-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


  Index: 132
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/132,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 132    8 Oct 2004 14:49:31 -0000    1.1
  +++ 132    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1104
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1051
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp
  @@ -22,7 +22,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1108
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1055
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 133
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/133,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 133    8 Oct 2004 14:49:31 -0000    1.1
  +++ 133    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,24 +1,24 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=249
   1999-03-02 09:44:33 10HmaX-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** forwarder2@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1104
  -1999-03-02 09:44:33 10HmaY-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1005
  +1999-03-02 09:44:33 10HmaY-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
   1999-03-02 09:44:33 10HmaY-0005vi-00 abcd@???: error ignored
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1027
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1036
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => forwarder <forwarder@???> R=smart T=local_delivery
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=279
   1999-03-02 09:44:33 10HmbA-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
  -1999-03-02 09:44:33 10HmbA-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown
  +1999-03-02 09:44:33 10HmbA-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** forwarder2@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1073
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z"
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=974
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
   1999-03-02 09:44:33 10HmbB-0005vi-00 abcd@???: error ignored
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=996
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1005
   1999-03-02 09:44:33 10HmbC-0005vi-00 => forwarder <forwarder@???> R=smart T=local_delivery
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed


  Index: 138
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/138,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 138    8 Oct 2004 14:49:31 -0000    1.1
  +++ 138    28 Apr 2005 13:06:33 -0000    1.2
  @@ -6,7 +6,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=307
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** reply2@??? R=reply T=reply2: Expansion of "Re: $h_subject:" in reply2 transport contains non-printing character 8
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1150
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1061
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=caller T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 159
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/159,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 159    8 Oct 2004 14:49:31 -0000    1.1
  +++ 159    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,6 +2,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 == include@??? R=alias defer (-17): error in redirect data: included files not permitted
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-17): error in redirect data: ":defer: forced to defer" is not permitted
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** /dev/null <file@???> R=alias T=appendfile: delivery to file forbidden
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1063
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1032
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)


  Index: 162
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/162,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 162    8 Oct 2004 14:49:31 -0000    1.1
  +++ 162    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=263
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1182
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1187
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp


  Index: 177
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/177,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 177    8 Oct 2004 14:49:31 -0000    1.1
  +++ 177    28 Apr 2005 13:06:33 -0000    1.2
  @@ -16,9 +16,9 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=272
   1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=scanned-ok S=398 id=E10HmbB-0005vi-00@???
  -1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "non-local.example"
  +1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? R=fail_remote_domains: unrouteable mail domain "non-local.example" (:fail:)
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=all T=appendfile
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1216
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1225
   1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=all T=appendfile
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed


  Index: 179
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/179,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 179    8 Oct 2004 14:49:31 -0000    1.1
  +++ 179    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,7 +2,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by ph10
   1999-03-02 09:44:33 10HmaX-0005vi-00 unfrozen by ph10
   1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by ph10
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1093
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1053
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=all T=appendfile
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 180
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/180,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 180    8 Oct 2004 14:49:31 -0000    1.1
  +++ 180    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,10 +1,10 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=316
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=filter: subject was "fail this"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=filter: subject was "fail this" (filter fail)
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=415
   1999-03-02 09:44:33 10HmaY-0005vi-00 => mug99 <mug99@???> R=all_L T=appendfile
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 => >mug99 <ph10@???> R=filter T=autoreply
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1094
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1108
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=all_L T=appendfile
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 200
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/200,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 200    8 Oct 2004 14:49:31 -0000    1.1
  +++ 200    28 Apr 2005 13:06:33 -0000    1.2
  @@ -16,7 +16,7 @@
   <<< QUIT
   250 OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@??? R=smartuser T=lmtp: LMTP error after MAIL FROM:<ph10@???>: 550 Don't like that sender
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1167
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1082
   1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  @@ -86,7 +86,7 @@
   1999-03-02 09:44:33 10HmbC-0005vi-00 == tom@??? R=smartuser T=lmtp defer (-44): LMTP error after RCPT TO:<tom@???>: 450 This one is delayed on RCPT
   1999-03-02 09:44:33 10HmbC-0005vi-00 ** dick@??? R=smartuser T=lmtp: LMTP error after RCPT TO:<dick@???>: 550 This one is unknown on RCPT
   1999-03-02 09:44:33 10HmbC-0005vi-00 -> harry <harry@???> R=smartuser T=lmtp
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1253
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1102
   1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=277
  @@ -136,7 +136,7 @@
   1999-03-02 09:44:33 10HmbE-0005vi-00 == tom@??? R=smartuser T=lmtp defer (-44): LMTP error after RCPT TO:<tom@???>: 450 This one is delayed on RCPT
   1999-03-02 09:44:33 10HmbE-0005vi-00 ** dick@??? R=smartuser T=lmtp: LMTP error after RCPT TO:<dick@???>: 550 This one is unknown on RCPT
   1999-03-02 09:44:33 10HmbE-0005vi-00 == harry@??? R=smartuser T=lmtp defer (-1): LMTP timeout after end of data (288 bytes written)
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1145
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1057
   1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=277


  Index: 201
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/201,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 201    8 Oct 2004 14:49:31 -0000    1.1
  +++ 201    28 Apr 2005 13:06:33 -0000    1.2
  @@ -39,7 +39,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=smartuser T=lmtp ST=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** jack@??? R=smartuser T=lmtp: LMTP error after end of data: 550 Number 2 fails
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp ST=local_delivery
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1115
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1062
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=bounces T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  @@ -83,7 +83,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=smartuser T=lmtp ST=local_delivery (mailbox /source/exim4/AutoTest/test-mail/ is not a regular file)
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** jack@??? R=smartuser T=lmtp: LMTP error after end of data: 550 Number 2 fails
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp ST=local_delivery (mailbox /source/exim4/AutoTest/test-mail/ is not a regular file)
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1105
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1052
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=bounces T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 202
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/202,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 202    8 Oct 2004 14:49:31 -0000    1.1
  +++ 202    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,7 +2,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=all T=local_delivery: message is too big (transport limit = 50)
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** jack@??? R=all T=local_delivery: message is too big (transport limit = 50)
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** jill@??? R=all T=local_delivery: message is too big (transport limit = 50)
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1274
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1136
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=bounce
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 217
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/217,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 217    8 Oct 2004 14:49:31 -0000    1.1
  +++ 217    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1159
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1164
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf



  Index: 232
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/232,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 232    8 Oct 2004 14:49:31 -0000    1.1
  +++ 232    28 Apr 2005 13:06:33 -0000    1.2
  @@ -3,8 +3,8 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => philip@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 ** philip@domain1 R=others T=smtp: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Don't like that sender
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1161
  +1999-03-02 09:44:33 10HmaY-0005vi-00 ** philip@domain1 R=others T=smtp: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Don't like that sender
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1166
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed


  Index: 235
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/235,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 235    8 Oct 2004 14:49:31 -0000    1.1
  +++ 235    28 Apr 2005 13:06:33 -0000    1.2
  @@ -14,7 +14,7 @@
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by timeout_frozen_after
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1023
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=981
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** unknown@???: Unrouteable address
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 236
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/236,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 236    8 Oct 2004 14:49:31 -0000    1.1
  +++ 236    28 Apr 2005 13:06:33 -0000    1.2
  @@ -7,7 +7,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by root
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by timeout_frozen_after
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1023
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=981
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** unknown@???: Unrouteable address
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 237
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/237,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 237    8 Oct 2004 14:49:31 -0000    1.1
  +++ 237    28 Apr 2005 13:06:33 -0000    1.2
  @@ -3,8 +3,8 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.direct@???: Unrouteable address
   1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=defer defer (-1): don't do this yet
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ok <ok@???> R=ok T=succeed
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mailer after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1292
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1297
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  @@ -13,8 +13,8 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.direct@???: Unrouteable address
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=defer defer (-1): don't do this yet
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ok <ok@???> R=ok T=succeed
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mailer after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1292
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1297
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmbA-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed


  Index: 238
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/238,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 238    5 Nov 2004 16:53:28 -0000    1.2
  +++ 238    28 Apr 2005 13:06:33 -0000    1.3
  @@ -3,7 +3,7 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=282
   1999-03-02 09:44:33 10HmaY-0005vi-00 == philip@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == philip@domain1 R=others T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<philip@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == philip@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<philip@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
   1999-03-02 09:44:33 10HmaY-0005vi-00 == philip@domain1 routing defer (-51): retry time not reached
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 removed by ph10
  @@ -17,11 +17,11 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
   1999-03-02 09:44:33 10HmbA-0005vi-00 == phil@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => phil@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmbA-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmbA-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
   1999-03-02 09:44:33 10HmbA-0005vi-00 => phil@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]*
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph@domain1 routing defer (-51): retry time not reached
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp


  Index: 240
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/240,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 240    8 Oct 2004 14:49:31 -0000    1.1
  +++ 240    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,21 +1,21 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=278
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP error from remote mailer after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph@domain1 F=<ph10@???> R=others T=smtp: SMTP error from remote mailer after initial connection: host 127.0.0.1 [127.0.0.1]: 550 Go away
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1128
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph@domain1 F=<ph10@???> R=others T=smtp: SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 550 Go away
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1133
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> F=<> R=all T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=262
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph@domain1 F=<ph10@???> R=others T=smtp: SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 550 Go away
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** phil@domain2 F=<ph10@???> R=others T=smtp: SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 550 Go away
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1261
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph@domain1 F=<ph10@???> R=others T=smtp: SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 550 Go away
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** phil@domain2 F=<ph10@???> R=others T=smtp: SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk: host 127.0.0.1 [127.0.0.1]: 550 Go away
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1271
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> F=<> R=all T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 244
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/244,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 244    5 Nov 2004 16:53:28 -0000    1.2
  +++ 244    28 Apr 2005 13:06:33 -0000    1.3
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 -> tom@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 == dick@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** harry@??? F=<ph10@???> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1173
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1093
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 removed by ph10
  @@ -20,18 +20,18 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 -> tom@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmbA-0005vi-00 == dick@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440-Here's a whole long message, in several lines,\n440-just for testing that nothing breaks when\n440-we do this\n440 Temporary error
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** harry@??? F=<ph10@???> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1204
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1093
   1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 removed by ph10
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=266
  -1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? F=<ph10@???> R=smartuser T=lmtp: SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
  +1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? F=<ph10@???> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
   1999-03-02 09:44:33 10HmbC-0005vi-00 == jack@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
  -1999-03-02 09:44:33 10HmbC-0005vi-00 == jill@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mailer after RCPT TO:<jill@???>: host 127.0.0.1 [127.0.0.1]: 450 Receiver temporarily bad
  +1999-03-02 09:44:33 10HmbC-0005vi-00 == jill@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<jill@???>: host 127.0.0.1 [127.0.0.1]: 450 Receiver temporarily bad
   1999-03-02 09:44:33 10HmbC-0005vi-00 ** tom@??? F=<ph10@???> R=smartuser T=lmtp: LMTP error after DATA: 550-I don't like this user\n550 Bad user
   1999-03-02 09:44:33 10HmbC-0005vi-00 => dick@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmbC-0005vi-00 ** harry@??? F=<ph10@???> R=smartuser T=lmtp: SMTP error from remote mailer after RCPT TO:<harry@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1448
  +1999-03-02 09:44:33 10HmbC-0005vi-00 ** harry@??? F=<ph10@???> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<harry@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1387
   1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed


  Index: 246
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/246,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 246    8 Oct 2004 14:49:31 -0000    1.1
  +++ 246    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1075
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1080
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  @@ -12,110 +12,110 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == b@??? R=client T=send_to_server defer (110): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<b@???>
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@??? R=client T=send_to_server defer (110): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<b@???>
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbA-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
  -1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
  +1999-03-02 09:44:33 10HmbA-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
  +1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1218
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1228
   1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbC-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbD-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mailer after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
  -1999-03-02 09:44:33 10HmbD-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 2
  +1999-03-02 09:44:33 10HmbD-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
  +1999-03-02 09:44:33 10HmbD-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 2
   1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 1
  -1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1212
  +1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 1
  +1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1222
   1999-03-02 09:44:33 10HmbF-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbF-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbG-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mailer after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
  -1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
  -1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=exim P=local S=1077
  +1999-03-02 09:44:33 10HmbG-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
  +1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
  +1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=exim P=local S=1082
   1999-03-02 09:44:33 10HmbH-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbH-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbI-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbI-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
  -1999-03-02 09:44:33 10HmbI-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
  -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1220
  +1999-03-02 09:44:33 10HmbI-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
  +1999-03-02 09:44:33 10HmbI-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
  +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1230
   1999-03-02 09:44:33 10HmbJ-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbJ-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbK-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbK-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  -1999-03-02 09:44:33 10HmbK-0005vi-00 == b@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  +1999-03-02 09:44:33 10HmbK-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  +1999-03-02 09:44:33 10HmbK-0005vi-00 == b@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
   1999-03-02 09:44:33 10HmbL-0005vi-00 <= ph10@??? U=ph10 P=local S=235
  -1999-03-02 09:44:33 10HmbL-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** c@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** d@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** e@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** f@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** g@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<g@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** h@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<h@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** i@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<i@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** j@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<j@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** k@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<k@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** l@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<l@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** m@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<m@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** n@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<n@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** o@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<o@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** p@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<p@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** q@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<q@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** r@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<r@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** s@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<s@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** t@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<t@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** u@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<u@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** v@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<v@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** w@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<w@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<x@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** y@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<y@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** z@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<z@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** aa@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<aa@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** bb@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<bb@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** cc@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<cc@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** dd@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<dd@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ee@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ee@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ff@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ff@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** gg@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<gg@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** hh@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<hh@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ii@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ii@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** jj@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<jj@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** kk@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<kk@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ll@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ll@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** mm@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<mm@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** nn@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<nn@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** oo@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<oo@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** pp@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<pp@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** qq@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<qq@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** rr@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<rr@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ss@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ss@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** tt@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<tt@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** uu@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<uu@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** vv@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<vv@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** ww@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ww@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** xx@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<xx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** yy@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<yy@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbL-0005vi-00 ** zz@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<zz@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=7413
  +1999-03-02 09:44:33 10HmbL-0005vi-00 == a@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** c@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** d@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** e@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** f@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** g@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<g@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** h@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<h@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** i@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<i@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** j@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<j@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** k@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<k@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** l@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<l@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** m@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<m@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** n@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** o@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<o@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** p@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<p@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** q@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<q@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** r@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<r@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** s@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<s@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** t@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<t@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** u@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<u@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** v@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<v@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** w@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<w@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<x@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** y@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<y@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** z@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<z@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** aa@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<aa@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** bb@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<bb@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** cc@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<cc@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** dd@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<dd@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ee@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ee@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ff@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ff@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** gg@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<gg@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** hh@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<hh@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ii@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ii@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** jj@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<jj@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** kk@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<kk@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ll@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ll@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** mm@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<mm@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** nn@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<nn@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** oo@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<oo@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** pp@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<pp@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** qq@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<qq@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** rr@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<rr@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ss@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ss@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** tt@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<tt@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** uu@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<uu@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** vv@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<vv@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** ww@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ww@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** xx@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<xx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** yy@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<yy@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbL-0005vi-00 ** zz@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<zz@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=7668
   1999-03-02 09:44:33 10HmbM-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbM-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbN-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 10HmbN-0005vi-00 Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
   1999-03-02 09:44:33 10HmbN-0005vi-00 == a@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
  -1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   1999-03-02 09:44:33 10HmbN-0005vi-00 == c@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
   1999-03-02 09:44:33 10HmbN-0005vi-00 == d@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
   1999-03-02 09:44:33 10HmbN-0005vi-00 == e@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
  -1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1067
  +1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1072
   1999-03-02 09:44:33 10HmbO-0005vi-00 ** ph10@??? R=bounce: just discard
   1999-03-02 09:44:33 10HmbO-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbO-0005vi-00 Completed


  Index: 247
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/247,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 247    8 Oct 2004 14:49:31 -0000    1.1
  +++ 247    28 Apr 2005 13:06:33 -0000    1.2
  @@ -9,8 +9,8 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=260
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=260
   1999-03-02 09:44:33 Start queue run: pid=pppp -qq
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1097
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1102
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (111): Connection refused
  @@ -20,8 +20,8 @@
   1999-03-02 09:44:33 10HmbB-0005vi-00 ** ph10@??? F=<> R=bounce: just discard
   1999-03-02 09:44:33 10HmbB-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1097
  +1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1102
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbC-0005vi-00 => c@??? F=<ph10@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]*
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed


  Index: 253
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/253,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 253    8 Oct 2004 14:49:31 -0000    1.1
  +++ 253    28 Apr 2005 13:06:33 -0000    1.2
  @@ -13,7 +13,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == hdefer@??? <list4@???> R=halias defer (-1): not just yet
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? <list2@???> R=alias defer (-1): not just yet
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@???> R=alias T=address_file defer (13): Permission denied: failed to create directories for /no/such: Permission denied
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1408
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1306
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


  Index: 256
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/256,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 256    8 Oct 2004 14:49:31 -0000    1.1
  +++ 256    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=257
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** /a/b/c </a/b/c@???> R=notallowed: delivery to file forbidden
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/p/q/r <|/p/q/r@???> R=notallowed: delivery to pipe forbidden
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1187
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1125
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=bounces T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 292
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/292,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 292    8 Oct 2004 14:49:31 -0000    1.1
  +++ 292    28 Apr 2005 13:06:33 -0000    1.2
  @@ -7,8 +7,8 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= pqr@??? U=ph10 P=local S=232
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10@??? P=<pqr=ph10+myhost.test.ex@???> R=r3 T=t3 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => phil@??? P=<pqr=phil+myhost.test.ex@???> R=r3 T=t3 H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail@??? P=<pqr=fail+myhost.test.ex@???> R=r3 T=t3: SMTP error from remote mailer after RCPT TO:<fail@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1078
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail@??? P=<pqr=fail+myhost.test.ex@???> R=r3 T=t3: SMTP error from remote mail server after RCPT TO:<fail@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1083
   1999-03-02 09:44:33 10HmbA-0005vi-00 => lmn <lmn@???> P=<> R=r0 T=t0
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 308
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/308,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 308    8 Oct 2004 14:49:31 -0000    1.1
  +++ 308    28 Apr 2005 13:06:33 -0000    1.2
  @@ -26,7 +26,7 @@
   1999-03-02 09:44:33 10HmbE-0005vi-00 => postmaster <postmaster@???> R=r3 T=t1
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** nmlist@???: syntax error in redirection data
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1053
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1016
   1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=r3 T=t1
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed


  Index: 315
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/315,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 315    8 Oct 2004 14:49:31 -0000    1.1
  +++ 315    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=253
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1091
   1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
  @@ -8,8 +8,8 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=253
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1076
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1081
   1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: retry timeout exceeded


  Index: 331
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/331,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 331    8 Oct 2004 14:49:31 -0000    1.1
  +++ 331    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,11 +2,11 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1220
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1230
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  @@ -15,13 +15,13 @@
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1220
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1230
   1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 332
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/332,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 332    8 Oct 2004 14:49:31 -0000    1.1
  +++ 332    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,12 +1,12 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 => f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1220
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1230
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp
  @@ -15,15 +15,15 @@
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=235
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=all T=smtp: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1498
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1518
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp


  Index: 335
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/335,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 335    8 Oct 2004 14:49:31 -0000    1.1
  +++ 335    28 Apr 2005 13:06:33 -0000    1.2
  @@ -33,8 +33,8 @@
   1999-03-02 09:44:33 10HmbH-0005vi-00 local_scan() function timed out - message temporarily rejected (size 29)
   1999-03-02 09:44:33 10HmbI-0005vi-00 local_scan() function timed out - message temporarily rejected (size 30)
   1999-03-02 09:44:33 10HmbU-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=460
  -1999-03-02 09:44:33 10HmbU-0005vi-00 ** bounce@??? R=r0: bounced
  -1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1196
  +1999-03-02 09:44:33 10HmbU-0005vi-00 ** bounce@??? R=r0: bounced (:fail:)
  +1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1205
   1999-03-02 09:44:33 10HmbV-0005vi-00 => exbounce <exbounce@???> R=r1 T=local_delivery
   1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbU-0005vi-00 Completed


  Index: 343
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/343,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 343    8 Oct 2004 14:49:31 -0000    1.1
  +++ 343    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=312
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: Too many "Received" headers - suspected mail loop
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph99@???: Too many "Received" headers - suspected mail loop
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1245
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1137
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> P=<> R=r1 T=t1
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 344
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/344,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 344    8 Oct 2004 14:49:31 -0000    1.1
  +++ 344    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=285
  -1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by system filter: this message is a failure
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1101
  +1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by system filter: this message is a failure (filter fail)
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1115
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> U=ph10 P=local S=244
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 cancelled by system filter: this message is a failure
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 cancelled by system filter: this message is a failure (filter fail)
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 359
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/359,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 359    8 Oct 2004 14:49:31 -0000    1.1
  +++ 359    28 Apr 2005 13:06:33 -0000    1.2
  @@ -3,6 +3,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** 55@??? R=all T=local_delivery: message is too big (transport limit = 55)
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** 1k@??? R=all T=local_delivery: message is too big (transport limit = 1024)
   1999-03-02 09:44:33 10HmaX-0005vi-00 == 44litres@??? R=all T=local_delivery defer (-1): invalid message_size_limit in local_delivery transport: invalid integer "44litres"
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2248
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2108
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=bounce T=bounce
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed


  Index: 374
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/374,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 374    8 Oct 2004 14:49:31 -0000    1.1
  +++ 374    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,7 +2,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1143
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  @@ -10,7 +10,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1148
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  @@ -18,7 +18,7 @@
   1999-03-02 09:44:33 10HmbB-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
   1999-03-02 09:44:33 10HmbB-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
   1999-03-02 09:44:33 10HmbB-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1160
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  @@ -30,16 +30,16 @@
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** z@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** y@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1445
  +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1052
   1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=242
  -1999-03-02 09:44:33 10HmbF-0005vi-00 == a@??? R=remote T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
  -1999-03-02 09:44:33 10HmbF-0005vi-00 == b@??? R=remote T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
  +1999-03-02 09:44:33 10HmbF-0005vi-00 == a@??? R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
  +1999-03-02 09:44:33 10HmbF-0005vi-00 == b@??? R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
   1999-03-02 09:44:33 10HmbF-0005vi-00 ** b@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbF-0005vi-00 ** a@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1305
  +1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1315
   1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
  @@ -47,7 +47,7 @@
   1999-03-02 09:44:33 10HmbH-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
   1999-03-02 09:44:33 10HmbH-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
   1999-03-02 09:44:33 10HmbH-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=exim P=local S=1133
  +1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
  @@ -55,7 +55,7 @@
   1999-03-02 09:44:33 10HmbJ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
   1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
   1999-03-02 09:44:33 10HmbJ-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=exim P=local S=1148
  +1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmbK-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
  @@ -63,7 +63,7 @@
   1999-03-02 09:44:33 10HmbL-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
   1999-03-02 09:44:33 10HmbL-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
   1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=1160
  +1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=1017
   1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
  @@ -75,7 +75,7 @@
   1999-03-02 09:44:33 10HmbN-0005vi-00 ** z@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbN-0005vi-00 ** y@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmbN-0005vi-00 ** x@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1445
  +1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1052
   1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <ph10@???> R=null
   1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbN-0005vi-00 Completed


  Index: 397
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/397,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 397    8 Oct 2004 14:49:31 -0000    1.1
  +++ 397    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0): SMTP error from remote mailer after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0): SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 412
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/412,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 412    8 Oct 2004 14:49:31 -0000    1.1
  +++ 412    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r0 defer (-1): ".forward" is not an absolute path
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1023
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r0 defer (-1): ".forward" is not an absolute path
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored


  Index: 414
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/414,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 414    8 Oct 2004 14:49:31 -0000    1.1
  +++ 414    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,8 +1,8 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=275
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 End queue run: pid=pppp
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 415
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/415,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 415    8 Oct 2004 14:49:31 -0000    1.1
  +++ 415    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=257
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 424
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/424,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 424    27 Jan 2005 10:56:38 -0000    1.2
  +++ 424    28 Apr 2005 13:06:33 -0000    1.3
  @@ -17,7 +17,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [10.11.12.14]: Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1033
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: Unrouteable address
   1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed


  Index: 427
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/427,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 427    8 Oct 2004 14:49:31 -0000    1.1
  +++ 427    28 Apr 2005 13:06:33 -0000    1.2
  @@ -7,7 +7,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@??? R=r2 defer (-1): host lookup did not complete
  -1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
  +1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
   1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@??? routing defer (-51): retry time not reached
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (-53): retry time not reached for any host
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 431
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/431,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 431    8 Oct 2004 14:49:31 -0000    1.1
  +++ 431    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@??? R=smartuser T=lmtp: LMTP error after MAIL FROM:<ph10@???>: 550 Don't like that sender
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1156
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=exim P=local S=1071
   1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  @@ -20,6 +20,6 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 == lp4@??? R=smartuser T=lmtp defer (-44): LMTP error after RCPT TO:<lp4@???>: 450 This one is delayed on RCPT
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** lp5@??? R=smartuser T=lmtp: LMTP error after RCPT TO:<lp5@???>: 550 This one is unknown on RCPT
   1999-03-02 09:44:33 10HmbA-0005vi-00 -> lp6 <lp6@???> R=smartuser T=lmtp
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1236
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1086
   1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <ph10@???> R=bounces
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed


  Index: 434
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/434,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 434    8 Oct 2004 14:49:31 -0000    1.1
  +++ 434    28 Apr 2005 13:06:33 -0000    1.2
  @@ -9,9 +9,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** b1@??? R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
   1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
   1999-03-02 09:44:33 10HmaX-0005vi-00 => d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mailer after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@??? R=ut4 T=ut4: SMTP error from remote mailer after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1201
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@??? R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1206
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=real T=real
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf


  Index: 435
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/435,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 435    8 Oct 2004 14:49:31 -0000    1.1
  +++ 435    28 Apr 2005 13:06:33 -0000    1.2
  @@ -9,7 +9,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 => f1 <f1@???> P=<ph10@???> R=real T=real
   1999-03-02 09:44:33 10HmaX-0005vi-00 => f2 <f2@???> P=<ph10@???> R=real T=real
   1999-03-02 09:44:33 10HmaX-0005vi-00 => f3 <f3@???> P=<ph10@???> R=real T=real
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1134
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1139
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> P=<> R=real T=real
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/451,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 451    8 Oct 2004 14:49:31 -0000    1.1
  +++ 451    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.0 [10.0.0.0]: Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1052
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1026
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=r0
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 495
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/495,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 495    8 Oct 2004 14:49:31 -0000    1.1
  +++ 495    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=264
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@??? R=r1 T=t1: SMTP error from remote mailer after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1135
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1140
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=r0
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 497
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/497,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 497    8 Oct 2004 14:49:31 -0000    1.1
  +++ 497    28 Apr 2005 13:06:33 -0000    1.2
  @@ -12,13 +12,13 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=316
   1999-03-02 09:44:33 10HmbB-0005vi-00 ** save ph10-extra <restrict-ph10@???> R=r1 T=t1: delivery to file forbidden
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1135
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1104
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=rb T=t2
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=296
   1999-03-02 09:44:33 10HmbD-0005vi-00 ** save inbox <restrict-ph10@???> R=r1 T=t1: delivery to file forbidden
  -1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1110
  +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1079
   1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=rb T=t2
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed


  Index: 499
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/499,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 499    8 Oct 2004 14:49:31 -0000    1.1
  +++ 499    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=251
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y R=r1 T=t1: SMTP error from remote mailer after HELO myhost.test.ex: host 127.0.0.1 [127.0.0.1]: 550 No
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1099
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y R=r1 T=t1: SMTP error from remote mail server after HELO myhost.test.ex: host 127.0.0.1 [127.0.0.1]: 550 No
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1104
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 526
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/526,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 526    8 Oct 2004 14:49:31 -0000    1.1
  +++ 526    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=277
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 defer (-17): error in filter file: \n not followed by space or valid header name in "h1: the first added header\nh2: the second added header\n continued on another line\nh3 the third added header is missing a colon" in mail command
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1282
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1015
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r2 T=t1
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 530
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/530,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 530    8 Oct 2004 14:49:31 -0000    1.1
  +++ 530    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4]: Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1033
   1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp


  Index: 537
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/537,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 537    8 Oct 2004 14:49:31 -0000    1.1
  +++ 537    28 Apr 2005 13:06:33 -0000    1.2
  @@ -13,7 +13,7 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
   1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1058
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1005
   1999-03-02 09:44:33 10HmbB-0005vi-00 ** ph10@??? R=r1 T=t1: retry time not reached for any host after a long failure period
   1999-03-02 09:44:33 10HmbB-0005vi-00 Frozen (delivery error message)
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed


  Index: 553
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/553,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 553    8 Oct 2004 14:49:31 -0000    1.1
  +++ 553    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,8 +1,8 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=285
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mailer after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
   1999-03-02 09:44:33 End queue run: pid=pppp -qf
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (-44): SMTP error from remote mailer after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/555,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 555    8 Oct 2004 14:49:31 -0000    1.1
  +++ 555    28 Apr 2005 13:06:33 -0000    1.2
  @@ -3,8 +3,8 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=292
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph2@??? R=r1 T=t1 defer (0): SMTP delivery explicitly queued
   1999-03-02 09:44:33 Start queue run: pid=pppp
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph1@??? R=r1 T=t1: SMTP error from remote mailer after RCPT TO:<ph1@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1193
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph1@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<ph1@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1198
   1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused


  Index: 556
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/556,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 556    8 Oct 2004 14:49:31 -0000    1.1
  +++ 556    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=276
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@??? R=r1 T=t1 defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error


  Index: 578
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/578,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 578    8 Oct 2004 14:49:31 -0000    1.1
  +++ 578    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,16 +8,16 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=291
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=282
  -1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
  -1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
  +1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
  +1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=305
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=288
   1999-03-02 09:44:33 10HmbC-0005vi-00 => pm@??? <postmaster@???> R=r9 T=t1 H=127.0.0.1 [127.0.0.1]


  Index: 580
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/580,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 580    8 Oct 2004 14:49:31 -0000    1.1
  +++ 580    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=256
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1154
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1159
   1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/581,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 581    8 Oct 2004 14:49:31 -0000    1.1
  +++ 581    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=256
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
   1999-03-02 09:44:33 Start queue run: pid=pppp
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after end of data (266 bytes written)
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1164
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1014
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection reset by peer
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (104): Connection reset by peer: 127.0.0.1 [127.0.0.1]


  Index: 599
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/599,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 599    21 Dec 2004 11:12:13 -0000    1.1
  +++ 599    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,20 +1,20 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=242
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph11@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph12@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph13@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph14@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph15@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph16@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph17@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph18@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph19@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph20@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph21@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph22@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph23@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph24@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph25@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, i
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph11@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph12@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph13@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph14@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph15@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph16@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph17@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph18@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph19@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph20@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph21@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph22@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph23@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph24@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph25@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=18801
   1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused


  Index: 600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/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    28 Apr 2005 13:06:33 -0000    1.2
  @@ -8,7 +8,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.4 [127.0.0.4]: Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1098
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=r0
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  @@ -21,7 +21,7 @@
   1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.2 [127.0.0.2]: Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
   1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1098
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=r0
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 605
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/605,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 605    22 Mar 2005 14:50:10 -0000    1.1
  +++ 605    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=267
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 defer (-1): failed to expand "${lookup ldap user="cn=xxx,o=yyy,c=UK" pass=xxxxxxxx ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}": missing or misplaced { or }
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1218
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r0 T=t1
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 606
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/606,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 606    6 Apr 2005 15:26:52 -0000    1.1
  +++ 606    28 Apr 2005 13:06:33 -0000    1.2
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=242
   1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] U=exim F=<ph10@???> temporarily rejected RCPT <hazel@???>
  -1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mailer after RCPT TO:<hazel@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary local problem - please try later
  +1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<hazel@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary local problem - please try later
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtp S=436 id=E10HmaX-0005vi-00@???
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLSv1:AES256-SHA:256 S=442 id=E10HmaX-0005vi-00@???
   1999-03-02 09:44:33 10HmaY-0005vi-00 => philip <philip@???> R=r0 T=t2


  Index: 608
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/608,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 608    7 Apr 2005 10:54:54 -0000    1.1
  +++ 608    28 Apr 2005 13:06:33 -0000    1.2
  @@ -2,7 +2,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1129
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
   1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
   1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded


  Index: 166.ph10
  ====================================================================
  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from exim by myhost.test.ex with local (Exim x.yz)
      id 10HmaY-0005vi-00
      for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@???
  Auto-Submitted: auto-generated
  From: Mail Delivery System <Mailer-Daemon@???>
  To: ph10@???
  Subject: Mail delivery failed: returning message to sender
  Message-Id: <E10HmaY-0005vi-00@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

    "FAIL cannot route this one (FAIL)"@???
      cannot route this one (FAIL)


------ This is a copy of the message, including all the headers. ------

  Return-path: <ph10@???>
  Received: from ph10 by myhost.test.ex with local (Exim x.yz)
      id 10HmaX-0005vi-00
      for "FAIL cannot route this one (FAIL)"@???; Tue, 2 Mar 1999 09:44:33 +0000
  Message-Id: <E10HmaX-0005vi-00@???>
  From: Philip Hazel <ph10@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


Test message


  Index: 025.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/025.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 025.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 025.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -55,7 +55,6 @@


     pipe to |callpager
       generated by page+ph10@???
  -    "callpager" command not found for address_pipe transport


------ This is a copy of the message, including all the headers. ------

  @@ -127,7 +126,6 @@
     pipe to |callpager
       generated by page+ph10@???
       (ultimately generated from page+ph@???)
  -    "callpager" command not found for address_pipe transport


------ This is a copy of the message, including all the headers. ------


  Index: 029.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/029.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 029.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 029.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -67,7 +67,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph10@???
  -    unrouteable mail domain "badbad.ex"
  +    unrouteable mail domain "badbad.ex" (:fail:)


------ This is a copy of the message, including all the headers. ------

@@ -150,7 +150,7 @@
recipients. This is a permanent error. The following address(es) failed:

     ph10@???
  -    unrouteable mail domain "domain2.ex"
  +    unrouteable mail domain "domain2.ex" (:fail:)


------ This is a copy of the message, including all the headers. ------


  Index: 079.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/079.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 079.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 079.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -35,11 +35,11 @@
   recipients. This is a permanent error. The following address(es) failed:


     mug99@???
  -    subject was    "should fail this"
  +    subject was    "should fail this" (filter fail)
     abcd@???
  -    subject was    "should fail this"
  +    subject was    "should fail this" (filter fail)
     ph10@???
  -    subject was    "should fail this"
  +    subject was    "should fail this" (filter fail)


------ This is a copy of the message, including all the headers. ------

@@ -108,7 +108,6 @@

     pipe to |cat
       generated by filter-pipe@???
  -    delivery to pipe forbidden


------ This is a copy of the message, including all the headers. ------

@@ -145,7 +144,6 @@

     save to /tmp/junk
       generated by filter-file@???
  -    delivery to file forbidden


------ This is a copy of the message, including all the headers. ------

@@ -181,8 +179,6 @@
recipients. This is a permanent error. The following address(es) failed:

     filter-lookup@???
  -    error in filter file: failed to expand "${lookup{$local_part}lsearch{/etc/passwd}{$value}fail}" in deliver command:
  -    lookup expansions are not permitted: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------

@@ -218,8 +214,6 @@
recipients. This is a permanent error. The following address(es) failed:

     filter-exists@???
  -    error in filter file: failed to expand "${if exists{/tmp/junk}{abc}{def}}" in deliver command:
  -    File existence tests are not permitted: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------

@@ -255,8 +249,6 @@
recipients. This is a permanent error. The following address(es) failed:

     filter-readfile@???
  -    error in filter file: failed to expand "${readfile{/some/file}}" in deliver command:
  -    file insertions are not permitted: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------

@@ -292,8 +284,6 @@
recipients. This is a permanent error. The following address(es) failed:

     filter-run@???
  -    error in filter file: failed to expand "${run{/some/script}}" in deliver command:
  -    running a command is not permitted: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------

@@ -378,9 +368,6 @@
recipients. This is a permanent error. The following address(es) failed:

     readfile@???
  -    error in filter file: failed to expand "${readfile{/source/exim4/AutoTest/test.private}}" in filter file:
  -    failed to open /source/exim4/AutoTest/test.private:
  -    Permission denied (euid=1169 egid=1169): retry timeout exceeded


------ This is a copy of the message, including all the headers. ------


  Index: 085.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/085.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 085.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 085.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -23,7 +23,6 @@


     pipe to |/non/existing/file
       generated by ph10@???
  -    Delay reason: pipe_transport unset in userforward router
     defer@???
       Delay reason: This address has been forced to defer.


@@ -90,7 +89,6 @@

     pipe to |/non/existing/file
       generated by ph10@???
  -    Delay reason: pipe_transport unset in userforward router
     defer@???
       Delay reason: This address has been forced to defer.


@@ -122,7 +120,6 @@

     pipe to |/non/existing/file
       generated by ph10@???
  -    Delay reason: pipe_transport unset in userforward router
     defer@???
       Delay reason: This address has been forced to defer.


  @@ -178,7 +175,6 @@
   warnmsg_recipients      = ph10@???


     xxxx@???
  -    Delay reason: Connection timed out


Final stuff.

  @@ -204,7 +200,6 @@
   warnmsg_recipients      = ph10@???


     yyyy@???
  -    Delay reason: Connection refused


Final stuff.


  Index: 133.forwarder
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/133.forwarder,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 133.forwarder    8 Oct 2004 14:49:42 -0000    1.1
  +++ 133.forwarder    28 Apr 2005 13:06:34 -0000    1.2
  @@ -21,7 +21,7 @@


     unknown@???
       (generated from forwarder@???)
  -    Address unknown
  +    Address unknown (:fail:)


------ This is a copy of the message, including all the headers. ------

@@ -57,7 +57,7 @@

     unknown@???
       (generated from forwarder@???)
  -    Address unknown
  +    Address unknown (:fail:)


------ This is a copy of the message's headers. ------


  Index: 138.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/138.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 138.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 138.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -36,7 +36,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     reply2@???
  -    Expansion of "Re: $h_subject:" in reply2 transport contains non-printing character 8


------ This is a copy of the message, including all the headers. ------


  Index: 177.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/177.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 177.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 177.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -51,7 +51,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph10@???
  -    unrouteable mail domain "non-local.example"
  +    unrouteable mail domain "non-local.example" (:fail:)


------ This is a copy of the message, including all the headers. ------


  Index: 179.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/179.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 179.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 179.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -16,7 +16,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     someone@somewhere
  -    delivery cancelled by administrator


------ This is a copy of the message, including all the headers. ------


  Index: 180.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/180.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 180.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 180.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -16,7 +16,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph10@???
  -    subject was "fail this"
  +    subject was "fail this" (filter fail)


------ This is a copy of the message, including all the headers. ------


  Index: 201.copied
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/201.copied,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 201.copied    8 Oct 2004 14:49:42 -0000    1.1
  +++ 201.copied    28 Apr 2005 13:06:34 -0000    1.2
  @@ -33,7 +33,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     jack@???
  -    LMTP error after end of data: 550 Number 2 fails


------ This is a copy of the message, including all the headers. ------

@@ -68,7 +67,6 @@
recipients. This is a permanent error. The following address(es) failed:

     jack@???
  -    LMTP error after end of data: 550 Number 2 fails


------ This is a copy of the message, including all the headers. ------


  Index: 240.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/240.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 240.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 240.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -17,7 +17,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph@domain1
  -    SMTP error from remote mailer after initial connection:
  +    SMTP error from remote mail server after initial connection:
       host 127.0.0.1 [127.0.0.1]: 550 Go away


------ This is a copy of the message, including all the headers. ------
@@ -52,10 +52,10 @@
recipients. This is a permanent error. The following address(es) failed:

     phil@domain2
  -    SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk:
  +    SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk:
       host 127.0.0.1 [127.0.0.1]: 550 Go away
     ph@domain1
  -    SMTP error from remote mailer after HELO xoanon.csi.cam.ac.uk:
  +    SMTP error from remote mail server after HELO xoanon.csi.cam.ac.uk:
       host 127.0.0.1 [127.0.0.1]: 550 Go away


------ This is a copy of the message, including all the headers. ------

  Index: 253.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/253.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 253.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 253.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -61,8 +61,6 @@


     save to /no/such/file
       generated by file@???
  -    Delay reason: Permission denied:
  -    failed to create directories for /no/such: Permission denied
     defer@???
       (generated from list2@???)
       Delay reason: not just yet


  Index: 256.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/256.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 256.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 256.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -18,10 +18,8 @@


     pipe to |/p/q/r
       generated by |/p/q/r@???
  -    delivery to pipe forbidden
     save to /a/b/c
       generated by /a/b/c@???
  -    delivery to file forbidden


------ This is a copy of the message, including all the headers. ------


  Index: 292.lmn
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/292.lmn,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 292.lmn    8 Oct 2004 14:49:42 -0000    1.1
  +++ 292.lmn    28 Apr 2005 13:06:34 -0000    1.2
  @@ -20,7 +20,7 @@
   address(es) failed:


     fail@???
  -    SMTP error from remote mailer after RCPT TO:<fail@???>:
  +    SMTP error from remote mail server after RCPT TO:<fail@???>:
       host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK


------ This is a copy of the message, including all the headers. ------

  Index: 308.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/308.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 308.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 308.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -29,7 +29,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     nmlist@???
  -    syntax error in redirection data


------ This is a copy of the message, including all the headers. ------


  Index: 335.exbounce
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/335.exbounce,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 335.exbounce    8 Oct 2004 14:49:42 -0000    1.1
  +++ 335.exbounce    28 Apr 2005 13:06:34 -0000    1.2
  @@ -20,7 +20,7 @@
   address(es) failed:


     bounce@???
  -    bounced
  +    bounced (:fail:)


------ This is a copy of the message, including all the headers. ------


  Index: 344.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/344.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 344.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 344.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -16,7 +16,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     failure@???
  -    this message is a failure
  +    this message is a failure (filter fail)


------ This is a copy of the message, including all the headers. ------


  Index: 359.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/359.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 359.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 359.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -18,11 +18,8 @@
   recipients. This is a permanent error. The following address(es) failed:


     1k@???
  -    message is too big (transport limit = 1024)
     55@???
  -    message is too big (transport limit = 55)
     50@???
  -    message is too big (transport limit = 50)


------ This is a copy of the message, including all the headers. ------


  Index: 434.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/434.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 434.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 434.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -19,7 +19,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     d3@???
  -    SMTP error from remote mailer after RCPT TO:<d3@???>:
  +    SMTP error from remote mail server after RCPT TO:<d3@???>:
       host 127.0.0.1 [127.0.0.1]: 550 hard error
     b1@???
       local delivery failed


  Index: 435.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/435.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 435.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 435.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -18,7 +18,7 @@
   recipients. This is a permanent error. The following address(es) failed:


     e1@???
  -    SMTP error from remote mailer after RCPT TO:<e1@???>:
  +    SMTP error from remote mail server after RCPT TO:<e1@???>:
       host 127.0.0.1 [127.0.0.1]: 550 hard error


------ This is a copy of the message, including all the headers. ------

  Index: 497.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/497.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 497.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 497.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -33,7 +33,6 @@


     save to ph10-extra
       generated by restrict-ph10@???
  -    delivery to file forbidden


------ This is a copy of the message, including all the headers. ------

@@ -70,7 +69,6 @@

     save to inbox
       generated by restrict-ph10@???
  -    delivery to file forbidden


------ This is a copy of the message, including all the headers. ------


  Index: 526.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/526.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 526.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 526.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -45,13 +45,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph10@???
  -    error in filter file: 
  -     not followed by space or valid header name in "h1:
  -    the first added header
  -    h2: the second added header
  -     continued on another line
  -    h3 the third added header is missing a colon" in mail command:
  -    retry timeout exceeded


------ This is a copy of the message, including all the headers. ------


  Index: 605.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/605.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 605.ph10    22 Mar 2005 14:50:10 -0000    1.1
  +++ 605.ph10    28 Apr 2005 13:06:34 -0000    1.2
  @@ -16,8 +16,6 @@
   recipients. This is a permanent error. The following address(es) failed:


     ph10@???
  -    failed to expand "${lookup ldap user="cn=xxx,o=yyy,c=UK" pass=xxxxxxxx ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}":
  -    missing or misplaced { or }: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------


  Index: 237.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/237.10HmaX-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 237.10HmaX-0005vi-00    8 Oct 2004 14:49:49 -0000    1.1
  +++ 237.10HmaX-0005vi-00    28 Apr 2005 13:06:34 -0000    1.2
  @@ -3,5 +3,5 @@
   1999-03-02 09:44:33 routing failed for fail.direct@???: Unrouteable address
   1999-03-02 09:44:33 defer@??? R=defer defer (-1): don't do this yet
   1999-03-02 09:44:33 ok@???: succeed transport succeeded
  -1999-03-02 09:44:33 SMTP error from remote mailer after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  -1999-03-02 09:44:33 fail.transport@??? R=fail_transport T=fail: SMTP error from remote mailer after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  +1999-03-02 09:44:33 SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
  +1999-03-02 09:44:33 fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused


  Index: 580.10HmaY-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 580.10HmaY-0005vi-00    8 Oct 2004 14:49:50 -0000    1.1
  +++ 580.10HmaY-0005vi-00    28 Apr 2005 13:06:34 -0000    1.2
  @@ -1,3 +1,3 @@
  -1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=exim P=local S=1154
  +1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=exim P=local S=1159
   1999-03-02 09:44:33 127.0.0.1 [127.0.0.1]: Connection refused
   1999-03-02 09:44:33 ph10@??? R=r1 T=t1 defer (111): Connection refused


  Index: 166
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/166,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 166    8 Oct 2004 14:49:52 -0000    1.1
  +++ 166    28 Apr 2005 13:06:34 -0000    1.2
  @@ -25,3 +25,7 @@
   0
   exim -d-all+route -bt '"REDIRECT postmaster@???'
   ****
  +0
  +exim -odi '"FAIL cannot route this one (FAIL)"@???'
  +Test message
  +****


  Index: 605
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/605,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 605    22 Mar 2005 14:50:10 -0000    1.1
  +++ 605    28 Apr 2005 13:06:34 -0000    1.2
  @@ -1,3 +1,3 @@
  -0 hide LDAP password in bounce message after expansion failure
  +0 hide LDAP password in message after expansion failure
   exim -odi ph10
   ****


  Index: 079
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/079,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 079    6 Apr 2005 10:06:14 -0000    1.2
  +++ 079    28 Apr 2005 13:06:34 -0000    1.3
  @@ -18,7 +18,7 @@
   admin user
   rda_interpret (file): /source/exim4/AutoTest/aux/079.F
   expanded: /source/exim4/AutoTest/aux/079.F
  -1713 bytes read from /source/exim4/AutoTest/aux/079.F
  +1742 bytes read from /source/exim4/AutoTest/aux/079.F
   data is an Exim filter program
   Filter: start of processing
   Filter: end of processing


  Index: 166
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/166,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 166    8 Oct 2004 14:50:08 -0000    1.1
  +++ 166    28 Apr 2005 13:06:34 -0000    1.2
  @@ -8,6 +8,10 @@
   admin user

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DECLINE cannot route this one (DECLINE)"@???
+--------> b router <--------
+local_part=decline cannot route this one (decline) domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=DECLINE cannot route this one (DECLINE) domain=some.host
checking domains
@@ -27,6 +31,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FAIL cannot route this one (FAIL)"@???
+--------> b router <--------
+local_part=fail cannot route this one (fail) domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=FAIL cannot route this one (FAIL) domain=some.host
checking domains
@@ -44,6 +52,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ERROR cannot route this one (ERROR)"@???
+--------> b router <--------
+local_part=error cannot route this one (error) domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=ERROR cannot route this one (ERROR) domain=some.host
checking domains
@@ -64,6 +76,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DEFER cannot route this one (DEFER)"@???
+--------> b router <--------
+local_part=defer cannot route this one (defer) domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=DEFER cannot route this one (DEFER) domain=some.host
checking domains
@@ -82,6 +98,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@???
+--------> b router <--------
+local_part=accept transport = other_smtp hosts=ten-1.test.ex domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=ACCEPT transport = other_smtp hosts=ten-1.test.ex domain=some.host
checking domains
@@ -108,6 +128,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing PASS@???
+--------> b router <--------
+local_part=pass domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=PASS domain=some.host
checking domains
@@ -147,6 +171,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FREEZE cannot route this one (FREEZE)"@???
+--------> b router <--------
+local_part=freeze cannot route this one (freeze) domain=some.host
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=FREEZE cannot route this one (FREEZE) domain=some.host
checking domains
@@ -165,6 +193,10 @@
admin user
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   routing "REDIRECT postmaster@???
  +--------> b router <--------
  +local_part=redirect postmaster@??? domain=some.host
  +checking senders
  +b router skipped: senders mismatch
   --------> q router <--------
   local_part=REDIRECT postmaster@??? domain=some.host
   checking domains
  @@ -183,6 +215,10 @@
     transport: <none>

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing postmaster@???
+--------> b router <--------
+local_part=postmaster domain=test.ex
+checking senders
+b router skipped: senders mismatch
--------> q router <--------
local_part=postmaster domain=test.ex
checking domains

  Index: 246
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/246,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 246    8 Oct 2004 14:50:08 -0000    1.1
  +++ 246    28 Apr 2005 13:06:34 -0000    1.2
  @@ -116,111 +116,111 @@
     SMTP<< 403 Sorry temp data error
     SMTP>> QUIT
   LOG: MAIN
  -  == a@??? R=client T=send_to_server defer (0): SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
  +  == a@??? R=client T=send_to_server defer (0): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
   LOG: MAIN
  -  ** b@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** c@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** c@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** d@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** d@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** e@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** e@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** f@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** f@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** g@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<g@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** g@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<g@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** h@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<h@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** h@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<h@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** i@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<i@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** i@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<i@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** j@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<j@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** j@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<j@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** k@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<k@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** k@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<k@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** l@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<l@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** l@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<l@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** m@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<m@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** m@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<m@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** n@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<n@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** n@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** o@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<o@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** o@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<o@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** p@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<p@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** p@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<p@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** q@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<q@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** q@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<q@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** r@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<r@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** r@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<r@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** s@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<s@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** s@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<s@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** t@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<t@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** t@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<t@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** u@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<u@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** u@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<u@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** v@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<v@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** v@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<v@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** w@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<w@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** w@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<w@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** x@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<x@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** x@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<x@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** y@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<y@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** y@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<y@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** z@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<z@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** z@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<z@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** aa@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<aa@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** aa@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<aa@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** bb@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<bb@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** bb@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<bb@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** cc@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<cc@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** cc@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<cc@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** dd@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<dd@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** dd@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<dd@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ee@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ee@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ee@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ee@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ff@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ff@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ff@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ff@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** gg@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<gg@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** gg@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<gg@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** hh@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<hh@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** hh@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<hh@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ii@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ii@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ii@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ii@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** jj@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<jj@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** jj@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<jj@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** kk@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<kk@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** kk@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<kk@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ll@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ll@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ll@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ll@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** mm@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<mm@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** mm@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<mm@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** nn@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<nn@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** nn@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<nn@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** oo@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<oo@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** oo@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<oo@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** pp@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<pp@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** pp@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<pp@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** qq@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<qq@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** qq@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<qq@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** rr@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<rr@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** rr@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<rr@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ss@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ss@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ss@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ss@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** tt@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<tt@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** tt@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<tt@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** uu@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<uu@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** uu@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<uu@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** vv@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<vv@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** vv@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<vv@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** ww@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<ww@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ww@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<ww@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** xx@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<xx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** xx@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<xx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** yy@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<yy@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** yy@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<yy@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  ** zz@??? R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<zz@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** zz@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<zz@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   LOG: MAIN
  -  <= <> R=10HmbL-0005vi-00 U=exim P=local S=7413
  +  <= <> R=10HmbL-0005vi-00 U=exim P=local S=7668
   delivering 10HmbM-0005vi-00
   LOG: MAIN
     ** ph10@??? R=bounce: just discard


  Index: 247
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/247,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 247    6 Apr 2005 10:06:14 -0000    1.3
  +++ 247    28 Apr 2005 13:06:34 -0000    1.4
  @@ -84,7 +84,7 @@
     SMTP<< 503 Unexpected DATA
     SMTP>> QUIT
   LOG: MAIN
  -  ** a@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** a@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   Exim version x.yz uid=42 gid=42 pid=pppp D=100001
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0
  @@ -94,7 +94,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1097
  +  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1102
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   LOG: MAIN
     Completed
  @@ -140,7 +140,7 @@
     SMTP>> RSET
     SMTP<< 250 OK
   LOG: MAIN
  -  ** b@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
  +  ** b@??? F=<ph10@???> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
   Exim version x.yz uid=42 gid=42 pid=pppp D=1001
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0
  @@ -150,7 +150,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmbA-0005vi-00 U=exim P=local S=1097
  +  <= <> R=10HmbA-0005vi-00 U=exim P=local S=1102
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   LOG: MAIN
     Completed


  Index: 315
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/315,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 315    4 Nov 2004 12:19:49 -0000    1.2
  +++ 315    28 Apr 2005 13:06:34 -0000    1.3
  @@ -15,9 +15,9 @@
     SMTP<< 500 NO
     SMTP>> QUIT
   LOG: MAIN
  -  ** ph10@??? R=r1 T=t1: SMTP error from remote mailer after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  +  ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1086
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1091
   delivering 10HmaY-0005vi-00
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN
  @@ -48,9 +48,9 @@
     SMTP<< 500 NO
     SMTP>> QUIT
   LOG: MAIN
  -  ** ph10@??? R=r1 T=t1: SMTP error from remote mailer after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
  +  ** ph10@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
   LOG: MAIN
  -  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1076
  +  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1081
   delivering 10HmbA-0005vi-00
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
   LOG: MAIN


  Index: 414
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/414,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 414    6 Apr 2005 10:06:14 -0000    1.2
  +++ 414    28 Apr 2005 13:06:34 -0000    1.3
  @@ -37,7 +37,7 @@
   reading retry information for R:ph10@??? from subprocess
     added retry item
   LOG: MAIN
  -  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   Processing retry items
   Succeeded addresses:
   Failed addresses:
  @@ -47,7 +47,7 @@
   retry for R:ph10@??? = *
   Writing retry data for R:ph10@???
     first failed=dddd last try=dddd next try=+1 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   end of retry processing
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -88,7 +88,7 @@
   reading retry information for R:ph10@??? from subprocess
     delete item not added: non-delete item exists
   LOG: MAIN
  -  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   Processing retry items
   Succeeded addresses:
   Failed addresses:
  @@ -99,7 +99,7 @@
   retry for R:ph10@??? = *
   Writing retry data for R:ph10@???
     first failed=dddd last try=dddd next try=+1 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   end of retry processing
   LOG: queue_run MAIN
     End queue run: pid=pppp
  @@ -141,7 +141,7 @@
   reading retry information for R:ph10@??? from subprocess
     delete item not added: non-delete item exists
   LOG: MAIN
  -  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   Processing retry items
   Succeeded addresses:
   Failed addresses:
  @@ -152,7 +152,7 @@
   retry for R:ph10@??? = *
   Writing retry data for R:ph10@???
     first failed=dddd last try=dddd next try=+2 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   end of retry processing
   LOG: queue_run MAIN
     End queue run: pid=pppp


  Index: 415
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/415,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 415    6 Apr 2005 10:06:14 -0000    1.2
  +++ 415    28 Apr 2005 13:06:34 -0000    1.3
  @@ -45,9 +45,9 @@
   reading retry information for R:ph99@??? from subprocess
     added retry item
   LOG: MAIN
  -  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   LOG: MAIN
  -  == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   Processing retry items
   Succeeded addresses:
   Failed addresses:
  @@ -57,12 +57,12 @@
   retry for R:ph99@??? = *
   Writing retry data for R:ph99@???
     first failed=dddd last try=dddd next try=+1 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   ph10@???
   retry for R:ph10@??? = *
   Writing retry data for R:ph10@???
     first failed=dddd last try=dddd next try=+1 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   end of retry processing
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -118,9 +118,9 @@
   reading retry information for R:ph99@??? from subprocess
     delete item not added: non-delete item exists
   LOG: MAIN
  -  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   LOG: MAIN
  -  == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  == ph99@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   Processing retry items
   Succeeded addresses:
   Failed addresses:
  @@ -131,13 +131,13 @@
   retry for R:ph99@??? = *
   Writing retry data for R:ph99@???
     first failed=dddd last try=dddd next try=+2 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   ph10@???
   deleted retry information for R:test.ex
   retry for R:ph10@??? = *
   Writing retry data for R:ph10@???
     first failed=dddd last try=dddd next try=+2 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   end of retry processing
   LOG: queue_run MAIN
     End queue run: pid=pppp


  Index: 427
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/427,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 427    6 Apr 2005 10:06:14 -0000    1.2
  +++ 427    28 Apr 2005 13:06:34 -0000    1.3
  @@ -105,7 +105,7 @@
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-t1.lockfile
   LOG: MAIN
  -  == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mailer after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
  +  == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 434    6 Apr 2005 10:06:14 -0000    1.2
  +++ 434    28 Apr 2005 13:06:34 -0000    1.3
  @@ -379,11 +379,11 @@
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut4.lockfile
   LOG: MAIN
  -  == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mailer after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
  +  == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut4.lockfile
   LOG: MAIN
  -  ** d3@??? R=ut4 T=ut4: SMTP error from remote mailer after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  +  ** d3@??? R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   Exim version x.yz uid=42 gid=42 pid=pppp D=2000000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
  @@ -394,7 +394,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1201
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1206
   Exim version x.yz uid=42 gid=42 pid=pppp D=2000000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0


  Index: 435
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/435,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 435    6 Apr 2005 10:06:14 -0000    1.2
  +++ 435    28 Apr 2005 13:06:34 -0000    1.3
  @@ -815,17 +815,17 @@
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut4.lockfile
   LOG: MAIN
  -  == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mailer after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
  +  == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
   log writing disabled
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut4.lockfile
   LOG: MAIN
  -  ** d3@??? P=<> R=ut4 T=ut4: SMTP error from remote mailer after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  +  ** d3@??? P=<> R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
   log writing disabled
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut5.lockfile
   LOG: MAIN
  -  ** e1@??? P=<> R=ut5 T=ut5: SMTP error from remote mailer after RCPT TO:<e1@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  +  ** e1@??? P=<> R=ut5 T=ut5: SMTP error from remote mail server after RCPT TO:<e1@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
   log writing disabled
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut6.lockfile
  @@ -835,12 +835,12 @@
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut6.lockfile
   LOG: MAIN
  -  == f2@??? R=ut6 T=ut6 defer (-44): SMTP error from remote mailer after RCPT TO:<f2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
  +  == f2@??? R=ut6 T=ut6 defer (-44): SMTP error from remote mail server after RCPT TO:<f2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
   log writing disabled
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-ut6.lockfile
   LOG: MAIN
  -  ** f3@??? P=<ph10@???> R=ut6 T=ut6: SMTP error from remote mailer after RCPT TO:<f3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
  +  ** f3@??? P=<ph10@???> R=ut6 T=ut6: SMTP error from remote mail server after RCPT TO:<f3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
   log writing disabled
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   LOG: MAIN
  @@ -855,7 +855,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1134
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1139
   Exim version x.yz uid=42 gid=42 pid=pppp D=2000000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0


  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 451    6 Apr 2005 10:06:14 -0000    1.4
  +++ 451    28 Apr 2005 13:06:34 -0000    1.5
  @@ -107,7 +107,7 @@
   read response data: size=21
     SMTP<< 451 Temporary error
   LOG: MAIN
  -  SMTP error from remote mailer after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   added retry item for R:x@y: errno=-44 more_errno=51,A flags=0
   ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL
     SMTP>> QUIT
  @@ -167,7 +167,7 @@
   on queue longer than maximum retry
   Writing retry data for R:x@y
     first failed=dddd last try=dddd next try=+0 expired=0
  -  errno=-44 more_errno=51,A SMTP error from remote mailer after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  errno=-44 more_errno=51,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   dbfn_write: key=R:x@y
   address match: subject=*@10.0.0.0 pattern=*
   10.0.0.0 in "*"? yes (matched "*")
  @@ -235,7 +235,7 @@
   Writing spool header file
   Size of headers = 422
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1052
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1026
   search_tidyup called
   exec /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
   Exim version x.yz uid=42 gid=42 pid=pppp D=fbb95ced


  Index: 495
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/495,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 495    6 Apr 2005 10:06:14 -0000    1.2
  +++ 495    28 Apr 2005 13:06:34 -0000    1.3
  @@ -56,7 +56,7 @@
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locking /source/exim4/AutoTest/spool/db/wait-t1.lockfile
   LOG: MAIN
  -  ** x@??? R=r1 T=t1: SMTP error from remote mailer after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
  +  ** x@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
   Exim version x.yz uid=42 gid=42 pid=pppp D=2000800
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0
  @@ -66,7 +66,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1135
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1140
   Exim version x.yz uid=42 gid=42 pid=pppp D=2000800
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
   Fixed never_users: 0


  Index: 555
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/555,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 555    6 Apr 2005 10:06:14 -0000    1.3
  +++ 555    28 Apr 2005 13:06:34 -0000    1.4
  @@ -53,7 +53,7 @@
   set_process_info: 21680 delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
   set_process_info: 21680 delivering 10HmaX-0005vi-00
   LOG: MAIN
  -  ** ph1@??? R=r1 T=t1: SMTP error from remote mailer after RCPT TO:<ph1@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
  +  ** ph1@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<ph1@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
   set_process_info: 21680 tidying up after delivering 10HmaX-0005vi-00
   writing data block fd=9 size=332 timeout=0
   Exim version x.yz uid=42 gid=42 pid=pppp D=10080000
  @@ -66,7 +66,7 @@
   admin user
   set_process_info: 21680 accepting a local non-SMTP message from <>
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1193
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1198
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   Exim version x.yz uid=42 gid=42 pid=pppp D=10080000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb


  Index: 578
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/578,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 578    8 Oct 2004 14:50:08 -0000    1.1
  +++ 578    28 Apr 2005 13:06:34 -0000    1.2
  @@ -1,7 +1,7 @@
   Delivery failed: Connection refused
  -Delivery failed: SMTP error from remote mailer after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
  -Delivery failed: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
  -Delivery failed: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
  +Delivery failed: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
  +Delivery failed: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
  +Delivery failed: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
   routing file@??? yielded a local delivery
   routing fail@??? yielded a failed delivery: forcible fail message
   routing defer@??? yielded a deferred delivery: forcible defer message


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 581    6 Apr 2005 10:06:14 -0000    1.4
  +++ 581    28 Apr 2005 13:06:34 -0000    1.5
  @@ -225,7 +225,7 @@
   Writing spool header file
   Size of headers = 427
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1164
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1014
   search_tidyup called
   search_tidyup called
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -250,7 +250,7 @@
   Empty Tree
   ---- End of tree ----
   recipients_count=1
  -body_linecount=20 message_linecount=10
  +body_linecount=17 message_linecount=10
   Delivery address list:
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile


  Index: 600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/600,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 600    6 Apr 2005 10:06:14 -0000    1.2
  +++ 600    28 Apr 2005 13:06:34 -0000    1.3
  @@ -74,7 +74,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1098
  +  <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   Exim version x.yz uid=42 gid=42 pid=pppp D=10000000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
  @@ -148,7 +148,7 @@
   trusted user
   admin user
   LOG: MAIN
  -  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1098
  +  <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1047
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   Exim version x.yz uid=42 gid=42 pid=pppp D=10000000
   Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb


  Index: 414
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/414,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 414    8 Oct 2004 14:50:13 -0000    1.1
  +++ 414    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,11 +1,11 @@
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph10@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 1
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph10@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 1
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph10@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 2


******** SERVER ********

  Index: 415
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/415,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 415    8 Oct 2004 14:50:13 -0000    1.1
  +++ 415    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,12 +1,12 @@
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph10@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 1
  -  R:ph99@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph99@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 1
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph10@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 2
  -  R:ph99@??? -44 13121 SMTP error from remote mailer after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
  +  R:ph99@??? -44 13121 SMTP error from remote mail server after RCPT TO:<ph99@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
   first failed = time last try = time2 next try = time2 + 2


******** SERVER ********

  Index: 427
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/427,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 427    8 Oct 2004 14:50:13 -0000    1.1
  +++ 427    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,5 +1,5 @@
   +++++++++++++++++++++++++++
  -  T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00 0 65 SMTP error from remote mailer after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing
  +  T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<ph10@???> SIZE=1275: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - cl
   first failed = time last try = time2 next try = time2 + 600
     R:2.test.again.dns -1 0 host lookup did not complete
   first failed = time last try = time2 next try = time2 + 600


  Index: 553
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/553,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 553    8 Oct 2004 14:50:14 -0000    1.1
  +++ 553    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,11 +1,11 @@
   +++++++++++++++++++++++++++
  -  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mailer after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
  +  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
   first failed = time last try = time2 next try = time2 + 10
   +++++++++++++++++++++++++++
  -  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
  +  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
   first failed = time last try = time2 next try = time2 + 10
   +++++++++++++++++++++++++++
  -  R:abcd@xyz -44 12865 SMTP error from remote mailer after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
  +  R:abcd@xyz -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
   first failed = time last try = time2 next try = time2 + 10


******** SERVER ********

  Index: 556
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/556,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 556    8 Oct 2004 14:50:14 -0000    1.1
  +++ 556    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,15 +1,15 @@
   +++++++++++++++++++++++++++
  -  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
   first failed = time last try = time2 next try = time2 + 7200
  -  T:::1:::1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mailer after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error
  +  T:::1:::1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error
   first failed = time last try = time2 next try = time2 + 7200
   No remote hosts found for 127.0.0.1
  -Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
  +Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
     first failed: 07-Mar-2000 12:21:52
     last tried:   07-Mar-2000 12:21:52
     next try at:  07-Mar-2000 12:21:52
   exinext exit code = 0
  -Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mailer after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error
  +Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host ::1 [::1]: 450 Temporary error
     first failed: 07-Mar-2000 12:21:52
     last tried:   07-Mar-2000 12:21:52
     next try at:  07-Mar-2000 12:21:52


  Index: 580
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/580,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 580    8 Oct 2004 14:50:14 -0000    1.1
  +++ 580    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,5 +1,5 @@
   +++++++++++++++++++++++++++
  -  R:ph10@??? -44 13377 SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
  +  R:ph10@??? -44 13377 SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
   first failed = time last try = time2 next try = time2 + 0 *
     T:127.0.0.1:127.0.0.1:1225 111 65 Connection refused
   first failed = time last try = time2 next try = time2 + 900


  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/581,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 581    8 Oct 2004 14:50:14 -0000    1.1
  +++ 581    28 Apr 2005 13:06:35 -0000    1.2
  @@ -1,5 +1,5 @@
   +++++++++++++++++++++++++++
  -  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mailer after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
  +  T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
   first failed = time last try = time2 next try = time2 + 10


******** SERVER ********