==============================================================================
This is a patch file for updating Exim release 3.35 to release 3.36.
To apply this patch, proceed as follows:

1. Make current the directory containing the distribution tree for release
   3.35, in other words, the directory that contains the exim-3.35 directory.

2. Run the command

     patch -p0 <this-patch-file

3. Immediately afterwards, run the command

     echo $?

   This shows the return code from the patch command; if all went well it
   should be zero.

4. Some versions of the patch command (at least up to version 2.1) write quite
   voluminous output to the standard error stream, so if you want to capture
   this in order to check it, you need to use

     patch -p0 <this-patch-file 2>/some/work/file

   The latest releases of patch write much less output (one line per file
   successfully patched) to the standard output stream, and it is normally easy
   enough to check this on the screen.

5. After the patching is complete, you can rename exim-3.35 as exim-3.36 if
   you wish. However, it is important not to do this until afterwards, as
   otherwise the patch process may not be successful.

6. Exim maintains a build number in the file cnumber.h inside each build-xxx
   directory. If you want to reset this number for the new release, edit this
   file so that the single number it contains is 0 before you remake exim.
==============================================================================

*** exim-3.35/doc/ChangeLog	Tue Feb 19 10:10:47 2002
--- exim-3.36/doc/ChangeLog	Thu Apr  4 13:56:22 2002
***************
*** 1,6 ****
--- 1,26 ----
  Change log file for Exim from version 3.01
  ------------------------------------------
  
+ Version 3.36
+ ------------
+ 
+ 1. Bug in string expansion: if a "fail" substring of a conditional contained
+ another conditional that used the "fail" facility, Exim didn't swallow the
+ right number of closing parentheses in the case when the original condition 
+ succeeded (i.e. when the condition containing the "fail" should be 
+ skipped). 
+ 
+ 2. NULLs in a message body are turned into spaces for $message_body[_end].
+ 
+ 3. If a message with the -N flag was on the spool, and was selected during a
+ queue run by -R or -S, the -N flag was incorrectly passed on to all subsequent
+ messages, leading to their being thrown away.
+ 
+ 4. The -H files for Exim 4 have changed again with regard to the data for 
+ one_time addresses. Make Exim 3 capable of coping with the new format.
+ 
+ 
+ 
  Version 3.35
  ------------
  
*** exim-3.35/exim_monitor/em_globals.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_globals.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                Exim Monitor                    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                Exim Monitor                    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_hdr.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_hdr.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_init.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_init.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                  Exim monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module contains code to initialize things from the
--- 2,8 ----
  *                  Exim monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module contains code to initialize things from the
*** exim-3.35/exim_monitor/em_log.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_log.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module contains code for scanning the smaill log,
--- 2,8 ----
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module contains code for scanning the smaill log,
*** exim-3.35/exim_monitor/em_main.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_main.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_menu.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_menu.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_queue.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_queue.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                 Exim Monitor                   *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_strip.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_strip.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *                   Exim Monitor                 *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *                   Exim Monitor                 *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_text.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/exim_monitor/em_text.c	Thu Apr  4 13:56:22 2002
***************
*** 2,8 ****
  *               Exim Monitor                     *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *               Exim Monitor                     *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/exim_monitor/em_version.c	Tue Feb 19 10:10:47 2002
--- exim-3.36/exim_monitor/em_version.c	Thu Apr  4 13:56:22 2002
***************
*** 2,8 ****
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include <stdlib.h>
--- 2,8 ----
  *                  Exim Monitor                  *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include <stdlib.h>
*** exim-3.35/exim_monitor/em_xs.c	Tue Feb 19 10:10:47 2002
--- exim-3.36/exim_monitor/em_xs.c	Thu Apr  4 13:56:22 2002
***************
*** 2,8 ****
  *               Exim Monitor                     *
  *************************************************/
  
! /* Copyright (c) University of Cambridge, 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This file contains a number of subroutines that are in effect
--- 2,8 ----
  *               Exim Monitor                     *
  *************************************************/
  
! /* Copyright (c) University of Cambridge, 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This file contains a number of subroutines that are in effect
*** exim-3.35/src/accept.c	Tue Feb 19 10:10:41 2002
--- exim-3.36/src/accept.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Code for receiving a message and setting up spool files. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Code for receiving a message and setting up spool files. */
*** exim-3.35/src/buildconfig.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/buildconfig.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/child.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/child.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/config.h.defaults	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/config.h.defaults	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* The default settings for Exim configuration variables. A #define without
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* The default settings for Exim configuration variables. A #define without
*** exim-3.35/src/daemon.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/daemon.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with running Exim as a daemon */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with running Exim as a daemon */
*** exim-3.35/src/dbfn.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/dbfn.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/dbfn.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/dbfn.h	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/debug.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/debug.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/deliver.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/deliver.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* The main code for delivering a message. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* The main code for delivering a message. */
*** exim-3.35/src/direct.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/direct.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/directory.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directory.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "exim.h"
*** exim-3.35/src/dns.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/dns.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for interfacing with the DNS. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for interfacing with the DNS. */
*** exim-3.35/src/drtables.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/drtables.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/dummies.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/dummies.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This file is not part of the main Exim code. The Exim monitor and some other
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This file is not part of the main Exim code. The Exim monitor and some other
*** exim-3.35/src/exim.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/exim.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/exim.h	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/exim.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/exim_dbmbuild.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/exim_dbmbuild.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/exim_dumpdb.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/exim_dumpdb.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include <stdarg.h>
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include <stdarg.h>
*** exim-3.35/src/exim_fixdb.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/exim_fixdb.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/exim_tidydb.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/exim_tidydb.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/expand.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/expand.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
***************
*** 572,581 ****
        lseek(deliver_datafile, start_offset, SEEK_SET);
        len = read(deliver_datafile, body, len);
        if (len >= 0) body[len] = 0;
!       while (*body != 0)
          {
!         if (*body == '\n') *body = ' ';
!         body++;
          }
        }
      return (*ss == NULL)? "" : *ss;
--- 572,580 ----
        lseek(deliver_datafile, start_offset, SEEK_SET);
        len = read(deliver_datafile, body, len);
        if (len >= 0) body[len] = 0;
!       while (len > 0)
          {
!         if (body[--len] == '\n' || body[len] == 0) body[len] = ' ';
          }
        }
      return (*ss == NULL)? "" : *ss;
***************
*** 1266,1272 ****
    s = read_name(name, sizeof(name), s, "_");
    if (strcmp(name, "fail") == 0)
      {
!     if (!yes)
        {
        while (isspace((uschar)*s)) s++;
        if (*s++ != '}') goto FAILED_CURLY;
--- 1265,1271 ----
    s = read_name(name, sizeof(name), s, "_");
    if (strcmp(name, "fail") == 0)
      {
!     if (!yes && !skipping)
        {
        while (isspace((uschar)*s)) s++;
        if (*s++ != '}') goto FAILED_CURLY;
*** exim-3.35/src/filter.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/filter.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
***************
*** 2566,2577 ****
  BOOL
  filter_runtest(int fd, BOOL is_system, BOOL dot_ended)
  {
! int rc, body_len, action, header_size;
  register int ch;
  BOOL yield, delivered;
  struct stat statbuf;
  address_item *generated = NULL;
! char *body, *error, *filebuf, *s;
  
  /* Read the filter file into store as will be done by the director
  in a real case. */
--- 2566,2577 ----
  BOOL
  filter_runtest(int fd, BOOL is_system, BOOL dot_ended)
  {
! int rc, body_len, body_end_len, action, header_size;
  register int ch;
  BOOL yield, delivered;
  struct stat statbuf;
  address_item *generated = NULL;
! char *error, *filebuf, *s;
  
  /* Read the filter file into store as will be done by the director
  in a real case. */
***************
*** 2653,2659 ****
  function as efficient as possible. Handling message_body_end is somewhat more
  tedious. Pile it all into a circular buffer and sort out at the end. */
  
! message_body = body = store_malloc(message_body_visible + 1);
  message_body_end = store_malloc(message_body_visible + 1);
  s = message_body_end;
  body_len = 0;
--- 2653,2659 ----
  function as efficient as possible. Handling message_body_end is somewhat more
  tedious. Pile it all into a circular buffer and sort out at the end. */
  
! message_body = store_malloc(message_body_visible + 1);
  message_body_end = store_malloc(message_body_visible + 1);
  s = message_body_end;
  body_len = 0;
***************
*** 2729,2752 ****
      memcpy(temp, message_body_end, below);
      memmove(message_body_end, s+1, above);
      memcpy(message_body_end + above, temp, below);
!     message_body_end[message_body_visible] = 0;
      }
    }
- else *s = 0;
  
! /* Convert newlines in the body variables to spaces */
  
! while (*body != 0)
    {
!   if (*body == '\n') *body = ' ';
!   body++;
    }
  
! body = message_body_end;
! while (*body != 0)
    {
!   if (*body == '\n') *body = ' ';
!   body++;
    }
  
  /* Now pass the filter file to the function that interprets it. Because
--- 2729,2754 ----
      memcpy(temp, message_body_end, below);
      memmove(message_body_end, s+1, above);
      memcpy(message_body_end + above, temp, below);
!     s = message_body_end + message_body_visible;
      }
    }
  
! *s = 0;
! body_end_len = s - message_body_end;
  
! /* Convert newlines and nulls in the body variables to spaces */
! 
! while (body_len > 0)
    {
!   if (message_body[--body_len] == '\n' || message_body[body_len] == 0)
!     message_body[body_len] = ' ';
    }
  
! while (body_end_len > 0)
    {
!   if (message_body_end[--body_end_len] == '\n' ||
!       message_body_end[body_end_len] == 0)
!     message_body_end[body_end_len] = ' ';
    }
  
  /* Now pass the filter file to the function that interprets it. Because
*** exim-3.35/src/functions.h	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/functions.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/globals.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/globals.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* All the global variables are defined together in this one module, so that
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* All the global variables are defined together in this one module, so that
***************
*** 842,848 ****
  char  *verify_address_parse_error = NULL;
  char  *verify_forced_errmsg   = NULL;
  BOOL   verify_only            = FALSE;
! char  *version_copyright      = "Copyright (c) University of Cambridge 2001";
  char  *version_date           = "?";
  char  *version_cnumber        = "????";
  char  *version_string         = "?";
--- 842,848 ----
  char  *verify_address_parse_error = NULL;
  char  *verify_forced_errmsg   = NULL;
  BOOL   verify_only            = FALSE;
! char  *version_copyright      = "Copyright (c) University of Cambridge 2002";
  char  *version_date           = "?";
  char  *version_cnumber        = "????";
  char  *version_string         = "?";
*** exim-3.35/src/globals.h	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/globals.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* All the global variables are defined together in this one header, so that
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* All the global variables are defined together in this one header, so that
*** exim-3.35/src/header.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/header.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/host.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/host.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for finding hosts, either by gethostbyname, gethostbyaddr, or via
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for finding hosts, either by gethostbyname, gethostbyaddr, or via
*** exim-3.35/src/log.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/log.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for writing log files. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for writing log files. */
*** exim-3.35/src/macros.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/macros.h	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/match.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/match.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for matching strings */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for matching strings */
*** exim-3.35/src/moan.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/moan.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for sending messages to sender or to mailmaster. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for sending messages to sender or to mailmaster. */
*** exim-3.35/src/os.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/os.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #ifdef STAND_ALONE
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #ifdef STAND_ALONE
*** exim-3.35/src/parse.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/parse.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for parsing addresses */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for parsing addresses */
*** exim-3.35/src/queue.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/queue.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions that operate on the input queue. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions that operate on the input queue. */
***************
*** 407,416 ****
--- 407,418 ----
  
      if (deliver_selectstring != NULL || deliver_selectstring_sender != NULL)
        {
+       BOOL old_dont_deliver = dont_deliver;
        BOOL wanted = TRUE;
        void *reset_point2 = store_get(0);
  
        if (spool_read_header(f->text, FALSE, TRUE) != spool_read_OK) continue;
+       dont_deliver = old_dont_deliver;
  
        if (deliver_freeze && !deliver_force_thaw)
          {
*** exim-3.35/src/readconf.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/readconf.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for reading the configuration file, and for displaying
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for reading the configuration file, and for displaying
*** exim-3.35/src/retry.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/retry.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with retrying unsuccessful deliveries. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with retrying unsuccessful deliveries. */
*** exim-3.35/src/rewrite.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/rewrite.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with rewriting headers */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with rewriting headers */
*** exim-3.35/src/route.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/route.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with routing, and the list of generic router options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with routing, and the list of generic router options. */
*** exim-3.35/src/search.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/search.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A set of functions to search databases in various formats. An open
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A set of functions to search databases in various formats. An open
*** exim-3.35/src/smtp_in.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/smtp_in.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for handling an incoming SMTP call. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for handling an incoming SMTP call. */
*** exim-3.35/src/smtp_out.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/smtp_out.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A number of functions for driving outgoing SMTP calls. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A number of functions for driving outgoing SMTP calls. */
*** exim-3.35/src/spool_in.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/spool_in.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for reading spool files. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for reading spool files. */
***************
*** 453,465 ****
    left here just in case. Nothing is documented.
  
    Jan, 2002: Added code to make it read the Exim 4 version of this, which
!   is just a single number.
!   */
  
    p = big_buffer + nn - 2;
    while (isdigit((uschar)*p) || *p == ',') p--;
!   if (*p == ' ')
      {
      int orc;
      *p++ = 0;
      if (sscanf(p, "%d,%d,%d", &flags, &pno, &orc) == 1)
--- 453,481 ----
    left here just in case. Nothing is documented.
  
    Jan, 2002: Added code to make it read the Exim 4 version of this, which
!   is just a single number. At least, it was at first. Later it was revised
!   to a more flexible format. Further code added: April 2002. */
  
    p = big_buffer + nn - 2;
    while (isdigit((uschar)*p) || *p == ',') p--;
! 
!   /* New Exim 4 style */
! 
!   if (*p == '#')
      {
+     int len;
+     p--;
+     while (isdigit((uschar)*p) || *p == ',') p--;
+     sscanf(p+1, "%d,%d", &len, &pno);
+     flags = rf_onetime;
+     p -= len + 1;
+     *p = 0;
+     }
+ 
+   /* Old Exim 4 style and Exim 3 style */
+ 
+   else if (*p == ' ')
+     {
      int orc;
      *p++ = 0;
      if (sscanf(p, "%d,%d,%d", &flags, &pno, &orc) == 1)
*** exim-3.35/src/spool_out.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/spool_out.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for writing spool files, and moving them about. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for writing spool files, and moving them about. */
*** exim-3.35/src/store.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/store.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Exim gets and frees all its store through these functions. In the original
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Exim gets and frees all its store through these functions. In the original
*** exim-3.35/src/string.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/string.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Miscellaneous string-handling functions */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Miscellaneous string-handling functions */
*** exim-3.35/src/structs.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/structs.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/tls.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/tls.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module provides TLS (aka SSL) support for Exim. The code is based on a
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* This module provides TLS (aka SSL) support for Exim. The code is based on a
*** exim-3.35/src/tod.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/tod.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A function for returning the time of day in various formats */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* A function for returning the time of day in various formats */
*** exim-3.35/src/transport.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/transport.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* General functions concerned with transportation, and generic options for all
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* General functions concerned with transportation, and generic options for all
*** exim-3.35/src/tree.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/tree.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for maintaining binary balanced trees and some associated
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions for maintaining binary balanced trees and some associated
*** exim-3.35/src/verify.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/verify.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with verifying things. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Functions concerned with verifying things. */
*** exim-3.35/src/version.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/version.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Function for setting up the version string. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Function for setting up the version string. */
***************
*** 10,16 ****
  #include "exim.h"
  
  
! #define THIS_VERSION  "3.35"
  
  
  /* The header file cnumber.h contains a single line containing the
--- 10,16 ----
  #include "exim.h"
  
  
! #define THIS_VERSION  "3.36"
  
  
  /* The header file cnumber.h contains a single line containing the
*** exim-3.35/src/auths/b64decode.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/b64decode.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/b64encode.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/b64encode.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/call_pam.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/call_pam.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/cram_md5.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/cram_md5.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/cram_md5.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/cram_md5.h	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/auths/get_data.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/get_data.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/md5.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/md5.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #ifndef STAND_ALONE
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #ifndef STAND_ALONE
*** exim-3.35/src/auths/plaintext.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/plaintext.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/plaintext.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/plaintext.h	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/auths/xtestdecode.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/xtestdecode.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/auths/xtextencode.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/auths/xtextencode.c	Thu Apr  4 13:56:16 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/directors/aliasfile.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/aliasfile.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/directors/aliasfile.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/aliasfile.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the aliasfile director */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the aliasfile director */
*** exim-3.35/src/directors/df_extracted.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/df_extracted.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/directors/df_generated.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/df_generated.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/directors/df_lookup.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/df_lookup.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/directors/dfunctions.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/dfunctions.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the functions that are shared by the directors */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the functions that are shared by the directors */
*** exim-3.35/src/directors/forwardfile.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/forwardfile.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/directors/forwardfile.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/forwardfile.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the forwardfile director */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the forwardfile director */
*** exim-3.35/src/directors/localuser.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/localuser.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/directors/localuser.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/localuser.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/directors/smartuser.c	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/smartuser.c	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/directors/smartuser.h	Tue Feb 19 10:10:42 2002
--- exim-3.36/src/directors/smartuser.h	Thu Apr  4 13:56:17 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Structure for the private options. The first block of them must be the
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Structure for the private options. The first block of them must be the
*** exim-3.35/src/lookups/dbmdb.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/dbmdb.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/dbmdb.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/dbmdb.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the dbm lookup. Use dbmdb in the code to avoid name
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the dbm lookup. Use dbmdb in the code to avoid name
*** exim-3.35/src/lookups/dnsdb.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/dnsdb.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/dnsdb.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/dnsdb.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the dnsdb lookup */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the dnsdb lookup */
*** exim-3.35/src/lookups/ldap.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/ldap.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Many thanks to Stuart Lynne for contributing the original code for this
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Many thanks to Stuart Lynne for contributing the original code for this
*** exim-3.35/src/lookups/ldap.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/ldap.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the ldap lookups */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the ldap lookups */
*** exim-3.35/src/lookups/lsearch.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/lookups/lsearch.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/lsearch.h	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/lookups/lsearch.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the lsearch lookup */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the lsearch lookup */
*** exim-3.35/src/lookups/mysql.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/mysql.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Thanks to Paul Kelly for contributing the original code for these
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Thanks to Paul Kelly for contributing the original code for these
*** exim-3.35/src/lookups/mysql.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/mysql.h	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the mysql lookup functions */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the mysql lookup functions */
*** exim-3.35/src/lookups/nis.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/lookups/nis.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/nis.h	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/lookups/nis.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the nis and nis0 lookups */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the nis and nis0 lookups */
*** exim-3.35/src/lookups/nisplus.c	Tue Feb 19 10:10:43 2002
--- exim-3.36/src/lookups/nisplus.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/nisplus.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/nisplus.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the nisplus lookup */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the nisplus lookup */
*** exim-3.35/src/lookups/pgsql.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/pgsql.c	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Thanks to Petr Cech for contributing the original code for these
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Thanks to Petr Cech for contributing the original code for these
*** exim-3.35/src/lookups/pgsql.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/pgsql.h	Thu Apr  4 13:56:19 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the pgsql lookup functions */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the pgsql lookup functions */
*** exim-3.35/src/lookups/testdb.c	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/testdb.c	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/lookups/testdb.h	Tue Feb 19 10:10:44 2002
--- exim-3.36/src/lookups/testdb.h	Thu Apr  4 13:56:18 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the testdb lookup */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the testdb lookup */
*** exim-3.35/src/routers/domainlist.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/domainlist.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/domainlist.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/domainlist.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the domainlist router */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Header for the domainlist router */
*** exim-3.35/src/routers/ipliteral.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/ipliteral.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/ipliteral.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/ipliteral.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/iplookup.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/iplookup.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/iplookup.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/iplookup.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/lookuphost.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/lookuphost.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/lookuphost.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/lookuphost.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/routers/queryprogram.c	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/queryprogram.c	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/routers/queryprogram.h	Tue Feb 19 10:10:45 2002
--- exim-3.36/src/routers/queryprogram.h	Thu Apr  4 13:56:20 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/transports/appendfile.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/appendfile.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/transports/appendfile.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/appendfile.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/transports/autoreply.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/autoreply.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/transports/autoreply.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/autoreply.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/transports/lmtp.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/lmtp.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/transports/lmtp.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/lmtp.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/transports/pipe.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/pipe.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  
*** exim-3.35/src/transports/pipe.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/pipe.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options. */
*** exim-3.35/src/transports/smtp.c	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/smtp.c	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  #include "../exim.h"
*** exim-3.35/src/transports/smtp.h	Tue Feb 19 10:10:46 2002
--- exim-3.36/src/transports/smtp.h	Thu Apr  4 13:56:21 2002
***************
*** 2,8 ****
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2001 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options and other private data. */
--- 2,8 ----
  *     Exim - an Internet mail transport agent    *
  *************************************************/
  
! /* Copyright (c) University of Cambridge 1995 - 2002 */
  /* See the file NOTICE for conditions of use and distribution. */
  
  /* Private structure for the private options and other private data. */