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

トップ ページ
このメッセージを削除
このメッセージに返信
著者: Philip Hazel
日付:  
To: exim-cvs
題目: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src/src functions.h parse.c exim/exim-src/src/transports autoreply.c exim/exim-test/confs 0530 exim/exim-test/log 0530 exim
ph10 2006/02/28 11:25:41 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src/src         functions.h parse.c 
    exim-src/src/transports autoreply.c 
    exim-test/mail       0015.userx 0016.userx 0037.CALLER 
                         0072.CALLER 0073.CALLER 0074.CALLER 
                         0074.userx 0079.userx 0090.CALLER 
                         0114.file 0140.CALLER 0177.usery 
                         0222.foo1 0222.foo2 0222.foo3 0223.CALLER 
                         0233.postmaster 0243.CALLER 0246.CALLER 
                         0404.sender 0428.someone 0444.CALLER 
                         0452.CALLER 0494.userx 
    exim-test/stderr     0404 
  Added files:
    exim-test/confs      0530 
    exim-test/log        0530 
    exim-test/mail       0530.CALLER 
    exim-test/scripts/0000-Basic 0530 
    exim-test/stdout     0530 
  Log:
  Add References: support to autoreply.


  Revision  Changes    Path
  1.314     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.91      +11 -0     exim/exim-doc/doc-txt/NewStuff
  1.23      +1 -0      exim/exim-src/src/functions.h
  1.8       +82 -0     exim/exim-src/src/parse.c
  1.9       +52 -3     exim/exim-src/src/transports/autoreply.c
  1.1       +47 -0     exim/exim-test/confs/0530 (new)
  1.1       +60 -0     exim/exim-test/log/0530 (new)
  1.2       +2 -0      exim/exim-test/mail/0015.userx
  1.2       +1 -0      exim/exim-test/mail/0016.userx
  1.2       +2 -0      exim/exim-test/mail/0037.CALLER
  1.2       +5 -0      exim/exim-test/mail/0072.CALLER
  1.2       +2 -0      exim/exim-test/mail/0073.CALLER
  1.2       +2 -0      exim/exim-test/mail/0074.CALLER
  1.2       +2 -0      exim/exim-test/mail/0074.userx
  1.2       +1 -0      exim/exim-test/mail/0079.userx
  1.2       +1 -0      exim/exim-test/mail/0090.CALLER
  1.2       +1 -0      exim/exim-test/mail/0114.file
  1.2       +1 -0      exim/exim-test/mail/0140.CALLER
  1.2       +5 -0      exim/exim-test/mail/0177.usery
  1.2       +2 -0      exim/exim-test/mail/0222.foo1
  1.2       +1 -0      exim/exim-test/mail/0222.foo2
  1.2       +1 -0      exim/exim-test/mail/0222.foo3
  1.2       +2 -0      exim/exim-test/mail/0223.CALLER
  1.2       +1 -0      exim/exim-test/mail/0233.postmaster
  1.2       +1 -0      exim/exim-test/mail/0243.CALLER
  1.2       +1 -0      exim/exim-test/mail/0246.CALLER
  1.2       +1 -0      exim/exim-test/mail/0404.sender
  1.2       +1 -0      exim/exim-test/mail/0428.someone
  1.2       +1 -0      exim/exim-test/mail/0444.CALLER
  1.2       +1 -0      exim/exim-test/mail/0452.CALLER
  1.2       +1 -0      exim/exim-test/mail/0494.userx
  1.1       +144 -0    exim/exim-test/mail/0530.CALLER (new)
  1.1       +82 -0     exim/exim-test/scripts/0000-Basic/0530 (new)
  1.3       +3 -1      exim/exim-test/stderr/0404
  1.1       +30 -0     exim/exim-test/stdout/0530 (new)


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.313
  retrieving revision 1.314
  diff -u -r1.313 -r1.314
  --- ChangeLog    23 Feb 2006 12:41:22 -0000    1.313
  +++ ChangeLog    28 Feb 2006 11:25:40 -0000    1.314
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.313 2006/02/23 12:41:22 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.314 2006/02/28 11:25:40 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -235,6 +235,9 @@
         they are received. Thus, the responses can be made to depend on the
         challenges. If an invalid string is ignored, an empty string is placed in
         the variable.
  +
  +PH/46 Messages that are created by the autoreply transport now contains a
  +      References: header, in accordance with RFCs 2822 and 3834.



Exim version 4.60

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- NewStuff    23 Feb 2006 12:41:22 -0000    1.90
  +++ NewStuff    28 Feb 2006 11:25:40 -0000    1.91
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.90 2006/02/23 12:41:22 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.91 2006/02/28 11:25:40 ph10 Exp $


   New Features in Exim
   --------------------
  @@ -86,6 +86,17 @@
         string, and so on. Currently, up to 3 challenge strings are available in
         this way. If an invalid base64 string is received when client_ignore_
         invalid_base64 is set, an empty string is put in the $auth<n> variable.
  +
  +PH/14 Messages created by the autoreply transport now contain a References:
  +      header. This is constructed in accordance with rules that are described
  +      in section 3.64 of RFC 2822, which states that replies should contain
  +      such a header line, and section 3.14 of RFC 3834, which states that
  +      automatic responses are not different in this respect. However, because
  +      some mail processing software does not cope well with very long header
  +      lines, no more than 12 message IDs are copied from the References: header
  +      line in the incoming message. If there are more than 12, the first one
  +      and then the final 11 are copied, before adding the message ID of the
  +      incoming message.



Version 4.60

  Index: functions.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/functions.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- functions.h    22 Feb 2006 14:46:44 -0000    1.22
  +++ functions.h    28 Feb 2006 11:25:40 -0000    1.23
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/functions.h,v 1.22 2006/02/22 14:46:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/functions.h,v 1.23 2006/02/28 11:25:40 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -175,6 +175,7 @@
   extern uschar *parse_find_address_end(uschar *, BOOL);
   extern uschar *parse_find_at(uschar *);
   extern uschar *parse_fix_phrase(uschar *, int, uschar *, int);
  +extern uschar *parse_message_id(uschar *, uschar **, uschar **);
   extern uschar *parse_quote_2047(uschar *, int, uschar *, uschar *, int);


   extern BOOL    queue_action(uschar *, int, uschar **, int, int);


  Index: parse.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/parse.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- parse.c    7 Feb 2006 11:19:00 -0000    1.7
  +++ parse.c    28 Feb 2006 11:25:40 -0000    1.8
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/parse.c,v 1.7 2006/02/07 11:19:00 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/parse.c,v 1.8 2006/02/28 11:25:40 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1656,6 +1656,68 @@
   }



  +
  +/*************************************************
  +*            Extract a Message-ID                *
  +*************************************************/
  +
  +/* This function is used to extract message ids from In-Reply-To: and
  +References: header lines.
  +
  +Arguments:
  +  str          pointer to the start of the message-id
  +  yield        put pointer to the message id (in dynamic memory) here
  +  error        put error message here on failure
  +
  +Returns:       points after the processed message-id or NULL on error
  +*/
  +
  +uschar *
  +parse_message_id(uschar *str, uschar **yield, uschar **error)
  +{
  +uschar *domain = NULL;
  +uschar *id;
  +
  +str = skip_comment(str);
  +if (*str != '<')
  +  {
  +  *error = US"Missing '<' before message-id";
  +  return NULL;
  +  }
  +
  +/* Getting a block the size of the input string will definitely be sufficient
  +for the answer, but it may also be very long if we are processing a header
  +line. Therefore, take care to release unwanted store afterwards. */
  +
  +id = *yield = store_get(Ustrlen(str) + 1);
  +*id++ = *str++;
  +
  +str = read_addr_spec(str, id, '>', error, &domain);
  +
  +if (*error == NULL)
  +  {
  +  if (*str != '>') *error = US"Missing '>' after message-id";
  +    else if (domain == NULL) *error = US"domain missing in message-id";
  +  }
  +
  +if (*error != NULL)
  +  {
  +  store_reset(*yield);
  +  return NULL;
  +  }
  +
  +while (*id != 0) id++;
  +*id++ = *str++;
  +*id++ = 0;
  +store_reset(id);
  +
  +str = skip_comment(str);
  +return str;
  +}
  +
  +
  +
  +
   /*************************************************
   **************************************************
   *             Stand-alone test program           *
  @@ -1786,6 +1848,26 @@
         }
       }
     else printf("Failed: %d %s\n", extracted, errmess);
  +  }
  +
  +printf("Testing parse_message_id\n");
  +
  +while (Ufgets(buffer, sizeof(buffer), stdin) != NULL)
  +  {
  +  uschar *s, *t, *errmess;
  +  buffer[Ustrlen(buffer) - 1] = 0;
  +  if (buffer[0] == 0) break;
  +  s = buffer;
  +  while (*s != 0)
  +    {
  +    s = parse_message_id(s, &t, &errmess);
  +    if (errmess != NULL)
  +      {
  +      printf("Failed: %s\n", errmess);
  +      break;
  +      }
  +    printf("%s\n", t);
  +    }
     }


return 0;

  Index: autoreply.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/autoreply.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- autoreply.c    7 Feb 2006 11:19:03 -0000    1.8
  +++ autoreply.c    28 Feb 2006 11:25:40 -0000    1.9
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/autoreply.c,v 1.8 2006/02/07 11:19:03 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/autoreply.c,v 1.9 2006/02/28 11:25:40 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -277,6 +277,7 @@
   uschar *logfile, *oncelog;
   uschar *cache_buff = NULL;
   uschar *cache_time = NULL;
  +uschar *message_id = NULL;
   header_line *h;
   time_t now = time(NULL);
   time_t once_repeat_sec = 0;
  @@ -590,9 +591,57 @@


   if (h != NULL)
     {
  -  uschar *s = Ustrchr(h->text, ':') + 1;
  -  while (isspace(*s)) s++;
  -  fprintf(f, "In-Reply-To: %s", s);
  +  message_id = Ustrchr(h->text, ':') + 1;
  +  while (isspace(*message_id)) message_id++;
  +  fprintf(f, "In-Reply-To: %s", message_id);
  +  }
  +
  +/* Generate a References header if there is at least one of Message-ID:,
  +References:, or In-Reply-To: (see RFC 2822). */
  +
  +for (h = header_list; h != NULL; h = h->next)
  +  if (h->type != htype_old && strncmpic(US"References:", h->text, 11) == 0)
  +    break;
  +
  +if (h == NULL)
  +  for (h = header_list; h != NULL; h = h->next)
  +    if (h->type != htype_old && strncmpic(US"In-Reply-To:", h->text, 12) == 0)
  +      break;
  +
  +/* We limit the total length of references.  Although there is no fixed
  +limit, some systems do not like headers growing beyond recognition.
  +Keep the first message ID for the thread root and the last few for
  +the position inside the thread, up to a maximum of 12 altogether. */
  +
  +if (h != NULL || message_id != NULL)
  +  {
  +  fprintf(f, "References:");
  +  if (h != NULL)
  +    {
  +    uschar *s, *id, *error;
  +    uschar *referenced_ids[12];
  +    int reference_count = 0;
  +    int i;
  +
  +    s = Ustrchr(h->text, ':') + 1;
  +    parse_allow_group = FALSE;
  +    while (*s != 0 && (s = parse_message_id(s, &id, &error)) != NULL)
  +      {
  +      if (reference_count == sizeof(referenced_ids)/sizeof(uschar *))
  +        {
  +        memmove(referenced_ids + 1, referenced_ids + 2,
  +           sizeof(referenced_ids) - 2*sizeof(uschar *));
  +        referenced_ids[reference_count - 1] = id;
  +        }
  +      else referenced_ids[reference_count++] = id;
  +      }
  +    for (i = 0; i < reference_count; ++i) fprintf(f, " %s", referenced_ids[i]);
  +    }
  +
  +  /* The message id will have a newline on the end of it. */
  +
  +  if (message_id != NULL) fprintf(f, " %s", message_id);
  +    else fprintf(f, "\n");
     }


/* Add an Auto-Submitted: header */

Index: 0530
====================================================================
# Exim test configuration 0530

exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME

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

acl_smtp_rcpt = accept control = suppress_local_fixups


# ----- Routers -----

begin routers

  r1:
    driver = accept
    senders = :
    transport = t1


  r2:
    driver = accept
    transport = t2



# ----- Transports -----

begin transports

  t1:
    driver = appendfile
    file = DIR/test-mail/$local_part
    user = CALLER


  t2:
    driver = autoreply
    to = $sender_address
    subject = Re: $h_subject:
    text = This is the text of the autoreply.
    user = CALLER


# End

Index: 0530
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=m1@b
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=m1@b
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=m1@b
1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=m1@b
1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=m1@b
1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbG-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbI-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
1999-03-02 09:44:33 10HmbH-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbK-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbM-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
1999-03-02 09:44:33 10HmbL-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbO-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
1999-03-02 09:44:33 10HmbN-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmbQ-0005vi-00 <= <> R=10HmbP-0005vi-00 U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbQ-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbP-0005vi-00 => userx <userx@???> R=r2 T=t2
1999-03-02 09:44:33 10HmbP-0005vi-00 Completed

  Index: 0530.CALLER
  ====================================================================
  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmaY-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: Message-id, no References, no In-Reply-to
  In-Reply-To: <m1@b>
  References: <m1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmaY-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbA-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: Message-id, no References, In-Reply-to
  In-Reply-To: <m1@b>
  References: <i1@b> <m1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbA-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbC-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: Message-id, References (1), In-Reply-to
  In-Reply-To: <m1@b>
  References: <r1@b> <m1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbC-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbE-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: Message-id, References (5), no In-Reply-to
  In-Reply-To: <m1@b>
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbE-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbG-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: Message-id, References (15), In-Reply-to
  In-Reply-To: <m1@b>
  References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbG-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbI-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: no Message-id, no References, no In-Reply-to
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbI-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbK-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: no Message-id, no References, In-Reply-to
  References: <i1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbK-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbM-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: no Message-id, References (1), In-Reply-to
  References: <r1@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbM-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbO-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: no Message-id, References (5), no In-Reply-to
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbO-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.

  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      id 10HmbQ-0005vi-00
      for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
  To: CALLER@???
  Subject: Re: no Message-id, References (15), In-Reply-to
  References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
  Auto-Submitted: auto-replied
  Message-Id: <E10HmbQ-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This is the text of the autoreply.


  Index: 0015.userx
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0015.userx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0015.userx    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0015.userx    28 Feb 2006 11:25:40 -0000    1.2
  @@ -23,6 +23,7 @@
       for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -57,6 +58,7 @@
       for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0016.userx
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0016.userx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0016.userx    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0016.userx    28 Feb 2006 11:25:40 -0000    1.2
  @@ -21,6 +21,7 @@
       for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0037.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0037.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0037.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0037.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -51,6 +51,7 @@
   To: CALLER@???
   Subject: An auto reply: qualify_domain=test.ex
   In-Reply-To: <E10HmbC-0005vi-00@???>
  +References: <E10HmbC-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbD-0005vi-00@???>
   From: CALLER@???
  @@ -290,6 +291,7 @@
   To: CALLER_NAME <CALLER@???>
   Subject: On vacation
   In-Reply-To: <E10HmbQ-0005vi-00@???>
  +References: <E10HmbQ-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbR-0005vi-00@???>
   From: CALLER@???


  Index: 0072.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0072.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0072.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0072.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???
  @@ -23,6 +24,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: EXIMUSER@???
  @@ -52,6 +54,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbC-0005vi-00@???>
  +References: <E10HmbC-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbD-0005vi-00@???>
   From: EXIMUSER@???
  @@ -72,6 +75,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbE-0005vi-00@???>
  +References: <E10HmbE-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbF-0005vi-00@???>
   From: EXIMUSER@???
  @@ -100,6 +104,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@???>
   In-Reply-To: <E10HmbG-0005vi-00@???>
  +References: <E10HmbG-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbH-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0073.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0073.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0073.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0073.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???
  @@ -23,6 +24,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0074.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0074.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0074.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0074.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -23,6 +24,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0074.userx
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0074.userx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0074.userx    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0074.userx    28 Feb 2006 11:25:40 -0000    1.2
  @@ -63,6 +63,7 @@
       id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???,  abey seedy <abcd@???>
   In-Reply-To: <E10HmbC-0005vi-00@???>
  +References: <E10HmbC-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbD-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -94,6 +95,7 @@
       id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???,   abcd@???
   In-Reply-To: <E10HmbE-0005vi-00@???>
  +References: <E10HmbE-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbF-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0079.userx
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0079.userx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0079.userx    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0079.userx    28 Feb 2006 11:25:40 -0000    1.2
  @@ -49,6 +49,7 @@
       for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: userx@???
   In-Reply-To: <E10HmaZ-0005vi-00@???>
  +References: <E10HmaZ-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbA-0005vi-00@???>
   From: CALLER@???


  Index: 0090.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0090.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0090.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0090.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -4,6 +4,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER@???
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0114.file
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0114.file,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0114.file    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0114.file    28 Feb 2006 11:25:40 -0000    1.2
  @@ -15,6 +15,7 @@
   To: A. File <file@???>, No One <null@???>
   Subject: autoreply
   In-Reply-To: <E10HmaZ-0005vi-00@???>
  +References: <E10HmaZ-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbA-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0140.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0140.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0140.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0140.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: Reply Person <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0177.usery
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0177.usery,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0177.usery    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0177.usery    28 Feb 2006 11:25:40 -0000    1.2
  @@ -5,6 +5,7 @@
   To: usery@???
   Subject: auto fail message
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -19,6 +20,7 @@
   To: usery@???
   Subject: auto freeze message
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -33,6 +35,7 @@
   To: usery@???
   Subject: An auto reply: qualify_domain=test.ex
   In-Reply-To: <E10HmbC-0005vi-00@???>
  +References: <E10HmbC-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbD-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -47,6 +50,7 @@
   To: usery@???
   Subject: auto freeze message
   In-Reply-To: <E10HmbE-0005vi-00@???>
  +References: <E10HmbE-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbF-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -61,6 +65,7 @@
   To: usery@???
   Subject: auto freeze message
   In-Reply-To: <E10HmbG-0005vi-00@???>
  +References: <E10HmbG-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbH-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0222.foo1
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0222.foo1,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0222.foo1    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0222.foo1    28 Feb 2006 11:25:40 -0000    1.2
  @@ -4,6 +4,7 @@
       for foo1@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: foo1@???
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  @@ -17,6 +18,7 @@
       for foo1@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: foo1@???
   In-Reply-To: <E10HmbG-0005vi-00@???>
  +References: <E10HmbG-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbH-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0222.foo2
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0222.foo2,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0222.foo2    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0222.foo2    28 Feb 2006 11:25:40 -0000    1.2
  @@ -4,6 +4,7 @@
       for foo2@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: foo2@???
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0222.foo3
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0222.foo3,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0222.foo3    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0222.foo3    28 Feb 2006 11:25:40 -0000    1.2
  @@ -4,6 +4,7 @@
       for foo3@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: foo3@???
   In-Reply-To: <E10HmbD-0005vi-00@???>
  +References: <E10HmbD-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbE-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0223.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0223.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0223.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0223.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???
  @@ -23,6 +24,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmbA-0005vi-00@???>
  +References: <E10HmbA-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmbB-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0233.postmaster
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0233.postmaster,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0233.postmaster    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0233.postmaster    28 Feb 2006 11:25:40 -0000    1.2
  @@ -5,6 +5,7 @@
   To: postmaster@???
   Subject: System filter has frozen
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0243.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0243.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0243.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0243.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -8,6 +8,7 @@
   To: CALLER@???
   Subject: Re: 
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000


  Index: 0246.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0246.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0246.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0246.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -4,6 +4,7 @@
       for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
   To: CALLER_NAME <CALLER@???>
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0404.sender
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0404.sender,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0404.sender    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0404.sender    28 Feb 2006 11:25:40 -0000    1.2
  @@ -3,6 +3,7 @@
       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
   To: sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>


  Index: 0428.someone
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0428.someone,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0428.someone    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0428.someone    28 Feb 2006 11:25:40 -0000    1.2
  @@ -9,6 +9,7 @@
   To: someone@???
   Subject: =?utf-8?Q?Auto=3A_?=
   In-Reply-To: <E10HmbL-0005vi-00@???>
  +References: <E10HmbL-0005vi-00@???>
   Auto-Submitted: auto-replied
   MIME-Version: 1.0
   Content-Type: text/plain;


  Index: 0444.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0444.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0444.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0444.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -7,6 +7,7 @@
   To: CALLER@???
   Subject: Submission of mail from CALLER@??? directly to the XXX hosts
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   Sender: CALLER_NAME <CALLER@???>


  Index: 0452.CALLER
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0452.CALLER,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0452.CALLER    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0452.CALLER    28 Feb 2006 11:25:40 -0000    1.2
  @@ -5,6 +5,7 @@
   To: CALLER@???
   Subject: Auto generated
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   h1: the first added header
   h2: the second added header


  Index: 0494.userx
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/mail/0494.userx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0494.userx    7 Feb 2006 10:34:59 -0000    1.1
  +++ 0494.userx    28 Feb 2006 11:25:40 -0000    1.2
  @@ -5,6 +5,7 @@
   To: userx@???
   Subject: testing, testing
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied
   Message-Id: <E10HmaY-0005vi-00@???>
   From: EXIMUSER@???


  Index: 0530
  ====================================================================
  # autoreply and References: headers
  #
  exim -odi userx@???
  Subject: Message-id, no References, no In-Reply-to
  Message-id: <m1@b>
  ****
  exim -odi userx@???
  Subject: Message-id, no References, In-Reply-to
  Message-id: <m1@b>
  In-Reply-To: <i1@b>
  ****
  exim -odi userx@???
  Subject: Message-id, References (1), In-Reply-to
  Message-id: <m1@b>
  References: <r1@b>
  In-Reply-To: <i1@b>
  ****
  exim -odi userx@???
  Subject: Message-id, References (5), no In-Reply-to
  Message-id: <m1@b>
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
  ****
  exim -odi userx@???
  Subject: Message-id, References (15), In-Reply-to
  Message-id: <m1@b>
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
              <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
              <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
  In-Reply-To: <i1@b>
  ****
  # In order not to have Exim create a Message-ID: header, we need to set
  # suppress_local_fixups, but the not-smtp ACL is too late. So we must use
  # an SMTP interface.
  #
  exim -odi -bs
  mail from:<CALLER@???>
  rcpt to:<userx@???>
  data
  Subject: no Message-id, no References, no In-Reply-to
  .
  quit
  ****
  exim -odi -bs
  mail from:<CALLER@???>
  rcpt to:<userx@???>
  data
  Subject: no Message-id, no References, In-Reply-to
  In-Reply-To: <i1@b>
  .
  quit
  ****
  exim -odi -bs
  mail from:<CALLER@???>
  rcpt to:<userx@???>
  data
  Subject: no Message-id, References (1), In-Reply-to
  References: <r1@b>
  In-Reply-To: <i1@b>
  .
  quit
  ****
  exim -odi -bs
  mail from:<CALLER@???>
  rcpt to:<userx@???>
  data
  Subject: no Message-id, References (5), no In-Reply-to
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
  .
  quit
  ****
  exim -odi -bs
  mail from:<CALLER@???>
  rcpt to:<userx@???>
  data
  Subject: no Message-id, References (15), In-Reply-to
  References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
              <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
              <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
  In-Reply-To: <i1@b>
  .
  quit
  ****


  Index: 0404
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0404,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0404    16 Feb 2006 10:05:34 -0000    1.2
  +++ 0404    28 Feb 2006 11:25:41 -0000    1.3
  @@ -246,6 +246,7 @@
   To: sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???,
   **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@???>
  +References: <E10HmaX-0005vi-00@???>
   Auto-Submitted: auto-replied


   rewrite_one_header: type=T:
  @@ -258,6 +259,7 @@
   T To: sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???
   **** debug string too long - truncated ****
     In-Reply-To: <E10HmaX-0005vi-00@???>
  +  References: <E10HmaX-0005vi-00@???>
     Auto-Submitted: auto-replied
   I Message-Id: <E10HmaY-0005vi-00@???>
   F From: CALLER_NAME <CALLER@???>
  @@ -291,7 +293,7 @@
   Empty Tree
   ---- End of tree ----
   recipients_count=608
  -body_linecount=1 message_linecount=8
  +body_linecount=1 message_linecount=9
   Delivery address list:
     sender@??? 
     sender@??? 


Index: 0530
====================================================================
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbH-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbJ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbL-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbN-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbP-0005vi-00
221 myhost.test.ex closing connection