[exim-cvs] cvs commit: exim/exim-doc/doc-misc WishList exim…

Página Inicial
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Para: exim-cvs
Assunto: [exim-cvs] cvs commit: exim/exim-doc/doc-misc WishList exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src/src EDITME acl.c functions.h globals.c header.c macros.h malware.c mime.c receive.c reg
ph10 2004/12/17 14:52:45 GMT

  Modified files:
    exim-doc/doc-misc    WishList 
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src/src         EDITME acl.c functions.h globals.c 
                         header.c macros.h malware.c mime.c 
                         receive.c regex.c spam.c spool_mbox.c 
                         srs.c version.c 
    exim-test-orig/AutoTest/confs 002 
    exim-test-orig/AutoTest/scripts 205 
    exim-test-orig/AutoTest/stderr 119 400 549 
    exim-test-orig/AutoTest/stdout 001 002 205 
  Log:
  1. Tidies to get rid of compiler warnings from the merged Exiscan files.
  2. Fixed a very old bug that sometimes lost the final 221 message after
  QUIT.


  Revision  Changes    Path
  1.15      +13 -1     exim/exim-doc/doc-misc/WishList
  1.43      +9 -2      exim/exim-doc/doc-txt/ChangeLog
  1.20      +4 -1      exim/exim-doc/doc-txt/NewStuff
  1.6       +17 -14    exim/exim-src/src/EDITME
  1.7       +1 -1      exim/exim-src/src/acl.c
  1.8       +1 -1      exim/exim-src/src/functions.h
  1.10      +1 -1      exim/exim-src/src/globals.c
  1.3       +0 -1      exim/exim-src/src/header.c
  1.6       +1 -1      exim/exim-src/src/macros.h
  1.3       +242 -239  exim/exim-src/src/malware.c
  1.3       +4 -4      exim/exim-src/src/mime.c
  1.7       +1 -1      exim/exim-src/src/receive.c
  1.3       +2 -2      exim/exim-src/src/regex.c
  1.3       +2 -2      exim/exim-src/src/spam.c
  1.3       +17 -17    exim/exim-src/src/spool_mbox.c
  1.3       +2 -2      exim/exim-src/src/srs.c
  1.3       +1 -1      exim/exim-src/src/version.c
  1.3       +3 -0      exim/exim-test-orig/AutoTest/confs/002
  1.2       +1 -1      exim/exim-test-orig/AutoTest/scripts/205
  1.2       +4 -4      exim/exim-test-orig/AutoTest/stderr/119
  1.2       +78 -78    exim/exim-test-orig/AutoTest/stderr/400
  1.2       +327 -327  exim/exim-test-orig/AutoTest/stderr/549
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stdout/001
  1.3       +3 -0      exim/exim-test-orig/AutoTest/stdout/002
  1.2       +2 -1      exim/exim-test-orig/AutoTest/stdout/205


  Index: WishList
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-misc/WishList,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WishList    7 Dec 2004 14:23:56 -0000    1.14
  +++ WishList    17 Dec 2004 14:52:43 -0000    1.15
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.14 2004/12/07 14:23:56 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.15 2004/12/17 14:52:43 ph10 Exp $


EXIM 4 WISH LIST
----------------
@@ -880,6 +880,11 @@

22-Apr-04: Implemented for domains, addresses, and local parts. Hosts are
too messy!
+
+The only sensible approach seems to be to allow IP address arguments only.
+Anything else should be diagnosed as an error. However, if a name appears in
+the list, a PTR lookup should be done. This may require a lot of refactoring
+in the code.
------------------------------------------------------------------------------

(74) 22-Jul-02 M Extend -bV to do more semantic checking
@@ -1826,5 +1831,12 @@
remain fixed. In addition to main codes, enhanced status codes (RFC 2034) were
requested. (As far as I can tell, they have never been highly popular.)
------------------------------------------------------------------------------
---- HWM 311 ------------------------------------------------------------------
+
+(312) 10-Dec-04 ? Shadow remote transports
+
+Unless a lot of work is done, this would be restricted to another remote
+transport. A similar effect could therefore be achieved with "shadow_hosts"
+which are like fallback_hosts but which operate on success.
+------------------------------------------------------------------------------
+--- HWM 312 ------------------------------------------------------------------
---------------------------- End of WishList ---------------------------------

  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ChangeLog    25 Nov 2004 15:29:36 -0000    1.42
  +++ ChangeLog    17 Dec 2004 14:52:44 -0000    1.43
  @@ -1,10 +1,9 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.42 2004/11/25 15:29:36 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.43 2004/12/17 14:52:44 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------

-
-Exim version 4.44
+Exim version 4.50
-----------------

    1. Minor wording change to the doc/README.SIEVE file.
  @@ -179,6 +178,14 @@
   42. Allow both -bf and -bF in the same test run.


   43. Did the same fix as 41 above for OpenSSL, which had the same infelicity.
  +
  +44. The "Exiscan patch" is now merged into the mainline Exim source.
  +
  +45. Sometimes the final signoff response after QUIT could fail to get
  +    transmitted in the non-TLS case. Testing !tls_active instead of tls_active
  +    < 0 before doing a fflush(). This bug looks as though it goes back to the
  +    introduction of TLS in release 3.20, but "sometimes" must have been rare
  +    because the tests only now provoked it.



Exim version 4.43

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- NewStuff    25 Nov 2004 14:31:28 -0000    1.19
  +++ NewStuff    17 Dec 2004 14:52:44 -0000    1.20
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.19 2004/11/25 14:31:28 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.20 2004/12/17 14:52:44 ph10 Exp $


New Features in Exim
--------------------
@@ -9,7 +9,7 @@
file contains a listing of all changes, including bug fixes.


-Version 4.44
+Version 4.50
------------

    1. There is a new build-time option called CONFIGURE_GROUP which works like
  @@ -218,6 +218,9 @@


       This is helpful when the system filter adds header lines or sets filter
       variables that are used by the user filter.
  +
  +19. The Exiscan patch is now merged into the main source. See src/EDITME for
  +    parameters for the build.



Version 4.43

  Index: EDITME
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/EDITME,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EDITME    16 Dec 2004 15:11:47 -0000    1.5
  +++ EDITME    17 Dec 2004 14:52:44 -0000    1.6
  @@ -1,4 +1,4 @@
  -# $Cambridge: exim/exim-src/src/EDITME,v 1.5 2004/12/16 15:11:47 tom Exp $
  +# $Cambridge: exim/exim-src/src/EDITME,v 1.6 2004/12/17 14:52:44 ph10 Exp $


   ##################################################
   #          The Exim mail transport agent         #
  @@ -321,42 +321,45 @@
   # and the MIME ACL. Please read the documentation to learn more about these
   # features.


-#WITH_CONTENT_SCAN=yes
+# WITH_CONTENT_SCAN=yes

# If you want to use the deprecated "demime" condition in the DATA ACL,
# uncomment the line below. Doing so will also explicitly turn on the
# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
# the "demime" condition.

-#WITH_OLD_DEMIME=yes
+# WITH_OLD_DEMIME=yes

#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
# experimental-spec.txt. "Experimental" means that the way these features are
-# implemented may still change. Backward compatability is not guaranteed.
+# implemented may still change. Backward compatibility is not guaranteed.

# Uncomment the following lines to add SPF support. You need to have libspf2
# installed on your system (www.libspf2.org). Depending on where it is installed
# you may have to edit the CFLAGS and LDFLAGS lines.
-#EXPERIMENTAL_SPF=yes
-#CFLAGS += -I/usr/local/include
-#LDFLAGS += -lspf2

-# Uncommend the following lines to add SRS (Sender rewriting scheme) support.
+# EXPERIMENTAL_SPF=yes
+# CFLAGS += -I/usr/local/include
+# LDFLAGS += -lspf2
+
+# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
# You need to have libsrs_alt installed on your system (srs.mirtol.com).
# Depending on where it is installed you may have to edit the CFLAGS and
# LDFLAGS lines.
-#EXPERIMENTAL_SRS=yes
-#CFLAGS += -I/usr/local/include
-#LDFLAGS += -lsrs_alt

-# Uncommend the following lines to add Brightmail AntiSpam support. You need
+# EXPERIMENTAL_SRS=yes
+# CFLAGS += -I/usr/local/include
+# LDFLAGS += -lsrs_alt
+
+# Uncomment the following lines to add Brightmail AntiSpam support. You need
# to have the Brightmail client SDK installed. Please check the experimental
# documentation for implementation details. You need to edit the CFLAGS and
# LDFLAGS lines.
-#EXPERIMENTAL_BRIGHTMAIL=yes
-#CFLAGS += -I/opt/brightmail/bsdk-6.0/include
-#LDFLAGS += -lxml2 -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
+
+# EXPERIMENTAL_BRIGHTMAIL=yes
+# CFLAGS += -I/opt/brightmail/bsdk-6.0/include
+# LDFLAGS += -lxml2 -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib




  Index: acl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/acl.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- acl.c    16 Dec 2004 15:11:47 -0000    1.6
  +++ acl.c    17 Dec 2004 14:52:44 -0000    1.7
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/acl.c,v 1.6 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/acl.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -248,7 +248,7 @@


     0,                                               /* delay */


  -#ifdef WITH_CONTENT_SCAN
  +#ifdef WITH_OLD_DEMIME
     (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)|      /* demime */
       (1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
       (1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|


  Index: functions.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/functions.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- functions.h    16 Dec 2004 15:11:47 -0000    1.7
  +++ functions.h    17 Dec 2004 14:52:44 -0000    1.8
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/functions.h,v 1.7 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/functions.h,v 1.8 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -264,7 +264,7 @@
   extern int     smtp_write_command(smtp_outblock *, BOOL, char *, ...);
   #ifdef WITH_CONTENT_SCAN
   extern int     spam(uschar **);
  -extern FILE   *spool_mbox(unsigned long long *);
  +extern FILE   *spool_mbox(unsigned long *);
   #endif
   extern BOOL    spool_move_message(uschar *, uschar *, uschar *, uschar *);
   extern BOOL    spool_open_datafile(uschar *);


  Index: globals.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/globals.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- globals.c    16 Dec 2004 15:11:47 -0000    1.9
  +++ globals.c    17 Dec 2004 14:52:44 -0000    1.10
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/globals.c,v 1.9 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/globals.c,v 1.10 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -695,7 +695,7 @@


   /* MIME ACL expandables */
   #ifdef WITH_CONTENT_SCAN
  -int     mime_anomaly_level     = NULL;
  +int     mime_anomaly_level     = 0;
   uschar *mime_anomaly_text      = NULL;
   uschar *mime_boundary          = NULL;
   uschar *mime_charset           = NULL;


  Index: header.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/header.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- header.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ header.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/header.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/header.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -48,7 +48,6 @@
   BOOL
   header_testname_incomplete(header_line *h, uschar *name, int len, BOOL notdel)
   {
  -uschar *tt;
   if (h->type == '*' && notdel) return FALSE;
   if (h->text == NULL || strncmpic(h->text, name, len) != 0) return FALSE;
   return TRUE;


  Index: macros.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/macros.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- macros.h    16 Dec 2004 15:11:47 -0000    1.5
  +++ macros.h    17 Dec 2004 14:52:44 -0000    1.6
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/macros.h,v 1.5 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/macros.h,v 1.6 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -72,7 +72,7 @@
   a no-op once an SSL session is in progress. */


#ifdef SUPPORT_TLS
-#define mac_smtp_fflush() if (!tls_active) fflush(smtp_out);
+#define mac_smtp_fflush() if (tls_active < 0) fflush(smtp_out);
#else
#define mac_smtp_fflush() fflush(smtp_out);
#endif

  Index: malware.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/malware.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- malware.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ malware.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/malware.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/malware.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -48,7 +48,7 @@
     uschar *malware_regex;
     uschar malware_regex_buffer[64];
     uschar malware_regex_default[] = ".+";
  -  unsigned long long mbox_size;
  +  unsigned long mbox_size;
     FILE *mbox_file;
     int roffset;
     const pcre *re;
  @@ -127,258 +127,257 @@
         return DEFER;
       };


  -      /* "drweb" scanner type ----------------------------------------------- */
  -      /* v0.1 - added support for tcp sockets                    */
  -      /* v0.0 - initial release -- support for unix sockets            */
  -      if (strcmpic(scanner_name,US"drweb") == 0) {
  -          uschar *drweb_options;
  -          uschar drweb_options_buffer[1024];
  -          uschar drweb_options_default[] = "/usr/local/drweb/run/drwebd.sock";
  -          struct sockaddr_un server;
  -          int sock, port, result, ovector[30];
  -          unsigned int fsize;
  -          uschar tmpbuf[1024], *drweb_fbuf;
  -          uschar scanrequest[1024];
  -          uschar drweb_match_string[128];
  -          int drweb_rc, drweb_cmd, drweb_flags = 0x0000, drweb_fd,
  -              drweb_vnum, drweb_slen, drweb_fin = 0x0000;
  -          unsigned long bread;
  -          uschar hostname[256];
  -          struct hostent *he;
  -          struct in_addr in;
  -          pcre *drweb_re;
  -      
  -          if ((drweb_options = string_nextinlist(&av_scanner_work, &sep,
  -              drweb_options_buffer, sizeof(drweb_options_buffer))) == NULL) {
  -              /* no options supplied, use default options */
  -              drweb_options = drweb_options_default;
  -          };
  +    /* "drweb" scanner type ----------------------------------------------- */
  +    /* v0.1 - added support for tcp sockets                    */
  +    /* v0.0 - initial release -- support for unix sockets            */
  +    if (strcmpic(scanner_name,US"drweb") == 0) {
  +        uschar *drweb_options;
  +        uschar drweb_options_buffer[1024];
  +        uschar drweb_options_default[] = "/usr/local/drweb/run/drwebd.sock";
  +        struct sockaddr_un server;
  +        int sock, result, ovector[30];
  +        unsigned int port, fsize;
  +        uschar tmpbuf[1024], *drweb_fbuf;
  +        uschar scanrequest[1024];
  +        uschar drweb_match_string[128];
  +        int drweb_rc, drweb_cmd, drweb_flags = 0x0000, drweb_fd,
  +            drweb_vnum, drweb_slen, drweb_fin = 0x0000;
  +        unsigned long bread;
  +        uschar hostname[256];
  +        struct hostent *he;
  +        struct in_addr in;
  +        pcre *drweb_re;
  +      
  +        if ((drweb_options = string_nextinlist(&av_scanner_work, &sep,
  +            drweb_options_buffer, sizeof(drweb_options_buffer))) == NULL) {
  +            /* no options supplied, use default options */
  +            drweb_options = drweb_options_default;
  +        };


  -          if (*drweb_options != '/') {
  +        if (*drweb_options != '/') {


  -              /* extract host and port part */
  -              if( sscanf(CS drweb_options, "%s %u", hostname, &port) != 2 ) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: invalid socket '%s'", drweb_options);
  -                  return DEFER;
  -                  }
  -      
  -              /* Lookup the host */
  -              if((he = gethostbyname(CS hostname)) == 0) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: failed to lookup host '%s'", hostname);
  -                  return DEFER;
  -              }
  -      
  -              in = *(struct in_addr *) he->h_addr_list[0];
  -      
  -              /* Open the drwebd TCP socket */
  -              if ( (sock = ip_socket(SOCK_STREAM, AF_INET)) < 0) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to acquire socket (%s)",
  -                      strerror(errno));
  -                  return DEFER;
  -              }
  -      
  -              if (ip_connect(sock, AF_INET, (uschar*)inet_ntoa(in), port, 5) < 0) {
  -                  close(sock); 
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: connection to %s, port %u failed (%s)",
  -                      inet_ntoa(in), port, strerror(errno));
  -                  return DEFER;
  -              }
  +            /* extract host and port part */
  +            if( sscanf(CS drweb_options, "%s %u", hostname, &port) != 2 ) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: invalid socket '%s'", drweb_options);
  +                return DEFER;
  +            }
  +      
  +            /* Lookup the host */
  +            if((he = gethostbyname(CS hostname)) == 0) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: failed to lookup host '%s'", hostname);
  +                return DEFER;
  +            }
  +      
  +            in = *(struct in_addr *) he->h_addr_list[0];
  +      
  +            /* Open the drwebd TCP socket */
  +            if ( (sock = ip_socket(SOCK_STREAM, AF_INET)) < 0) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to acquire socket (%s)",
  +                    strerror(errno));
  +                return DEFER;
  +            }
  +      
  +            if (ip_connect(sock, AF_INET, (uschar*)inet_ntoa(in), port, 5) < 0) {
  +                close(sock); 
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: connection to %s, port %u failed (%s)",
  +                    inet_ntoa(in), port, strerror(errno));
  +                return DEFER;
  +            }


  -              /* prepare variables */
  -              drweb_cmd = htonl(DRWEBD_SCAN_CMD);
  -              drweb_flags = htonl(DRWEBD_RETURN_VIRUSES | DRWEBD_IS_MAIL);
  -              snprintf(CS scanrequest, 1024,CS"%s/scan/%s/%s.eml", 
  -                      spool_directory, message_id, message_id);
  +            /* prepare variables */
  +            drweb_cmd = htonl(DRWEBD_SCAN_CMD);
  +            drweb_flags = htonl(DRWEBD_RETURN_VIRUSES | DRWEBD_IS_MAIL);
  +            snprintf(CS scanrequest, 1024,CS"%s/scan/%s/%s.eml", 
  +                    spool_directory, message_id, message_id);


  -              /* calc file size */
  -              drweb_fd = open(CS scanrequest, O_RDONLY);
  -              if (drweb_fd == -1) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                              "malware acl condition: drweb: can't open spool file %s: %s", 
  -                      scanrequest, strerror(errno));
  -                  return DEFER; 
  -              }
  -              fsize = lseek(drweb_fd, 0, SEEK_END);
  -              if (fsize == -1) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                              "malware acl condition: drweb: can't seek spool file %s: %s", 
  -                      scanrequest, strerror(errno));
  -                  return DEFER; 
  -              }
  -              drweb_slen = htonl(fsize);
  -              lseek(drweb_fd, 0, SEEK_SET);
  +            /* calc file size */
  +            drweb_fd = open(CS scanrequest, O_RDONLY);
  +            if (drweb_fd == -1) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: can't open spool file %s: %s", 
  +                    scanrequest, strerror(errno));
  +                return DEFER; 
  +            }
  +            fsize = lseek(drweb_fd, 0, SEEK_END);
  +            if (fsize == -1) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: can't seek spool file %s: %s", 
  +                    scanrequest, strerror(errno));
  +                return DEFER; 
  +            }
  +            drweb_slen = htonl(fsize);
  +            lseek(drweb_fd, 0, SEEK_SET);


  -              /* send scan request */
  -              if ((send(sock, &drweb_cmd, sizeof(drweb_cmd), 0) < 0) || 
  -                  (send(sock, &drweb_flags, sizeof(drweb_flags), 0) < 0) ||
  -                  (send(sock, &drweb_fin, sizeof(drweb_fin), 0) < 0) ||
  -                  (send(sock, &drweb_slen, sizeof(drweb_slen), 0) < 0)) {
  -                  close(sock); 
  -                  close(drweb_fd);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to send commands to socket (%s)", drweb_options);
  -                  return DEFER;
  -              }
  +            /* send scan request */
  +            if ((send(sock, &drweb_cmd, sizeof(drweb_cmd), 0) < 0) || 
  +                (send(sock, &drweb_flags, sizeof(drweb_flags), 0) < 0) ||
  +                (send(sock, &drweb_fin, sizeof(drweb_fin), 0) < 0) ||
  +                (send(sock, &drweb_slen, sizeof(drweb_slen), 0) < 0)) {
  +                close(sock); 
  +                close(drweb_fd);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to send commands to socket (%s)", drweb_options);
  +                return DEFER;
  +            }


  -              drweb_fbuf = (uschar *) malloc (fsize);
  -              if (!drweb_fbuf) {
  -                  close(sock);
  -                  close(drweb_fd);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to allocate memory %u for file (%s)", 
  -                      fsize, scanrequest);
  -                  return DEFER;
  -              }
  +            drweb_fbuf = (uschar *) malloc (fsize);
  +            if (!drweb_fbuf) {
  +                close(sock);
  +                close(drweb_fd);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to allocate memory %u for file (%s)", 
  +                    fsize, scanrequest);
  +                return DEFER;
  +            }


  -              result = read (drweb_fd, drweb_fbuf, fsize);
  -              if (result == -1) {
  -                  close(sock);
  -                  close(drweb_fd);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                              "malware acl condition: drweb: can't read spool file %s: %s",
  -                      scanrequest, strerror(errno));
  -                  return DEFER; 
  -              }
  -              
  -              /* send file body to socket */
  -              if (send(sock, drweb_fbuf, fsize, 0) < 0) {
  -                  close(sock);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to send file body to socket (%s)", drweb_options);
  -                  return DEFER;
  -              }
  -              close(drweb_fd);
  -              free(drweb_fbuf);
  -          }
  -              else {
  -              /* open the drwebd UNIX socket */
  -              sock = socket(AF_UNIX, SOCK_STREAM, 0);
  -              if (sock < 0) {
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                              "malware acl condition: drweb: can't open UNIX socket");
  -                  return DEFER; 
  -              }
  -              server.sun_family = AF_UNIX;
  -              Ustrcpy(server.sun_path, drweb_options);
  -              if (connect(sock, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {
  -                  close(sock);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to connect to socket (%s). errno=%d", drweb_options, errno);
  -                  return DEFER;
  -              }
  +            result = read (drweb_fd, drweb_fbuf, fsize);
  +            if (result == -1) {
  +                close(sock);
  +                close(drweb_fd);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: can't read spool file %s: %s",
  +                    scanrequest, strerror(errno));
  +                return DEFER; 
  +            }
  +            
  +            /* send file body to socket */
  +            if (send(sock, drweb_fbuf, fsize, 0) < 0) {
  +                close(sock);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to send file body to socket (%s)", drweb_options);
  +                return DEFER;
  +            }
  +            close(drweb_fd);
  +            free(drweb_fbuf);
  +        }
  +        else {
  +            /* open the drwebd UNIX socket */
  +            sock = socket(AF_UNIX, SOCK_STREAM, 0);
  +            if (sock < 0) {
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: can't open UNIX socket");
  +                return DEFER; 
  +            }
  +            server.sun_family = AF_UNIX;
  +            Ustrcpy(server.sun_path, drweb_options);
  +            if (connect(sock, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {
  +                close(sock);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to connect to socket (%s). errno=%d", drweb_options, errno);
  +                return DEFER;
  +            }


  -              /* prepare variables */
  -              drweb_cmd = htonl(DRWEBD_SCAN_CMD);
  -              drweb_flags = htonl(DRWEBD_RETURN_VIRUSES | DRWEBD_IS_MAIL);
  -              snprintf(CS scanrequest, 1024,CS"%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
  -              drweb_slen = htonl(Ustrlen(scanrequest));
  +            /* prepare variables */
  +            drweb_cmd = htonl(DRWEBD_SCAN_CMD);
  +            drweb_flags = htonl(DRWEBD_RETURN_VIRUSES | DRWEBD_IS_MAIL);
  +            snprintf(CS scanrequest, 1024,CS"%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
  +            drweb_slen = htonl(Ustrlen(scanrequest));


  -              /* send scan request */
  -              if ((send(sock, &drweb_cmd, sizeof(drweb_cmd), 0) < 0) || 
  -                  (send(sock, &drweb_flags, sizeof(drweb_flags), 0) < 0) ||
  -                  (send(sock, &drweb_slen, sizeof(drweb_slen), 0) < 0) ||
  -                  (send(sock, scanrequest, Ustrlen(scanrequest), 0) < 0) ||
  -                  (send(sock, &drweb_fin, sizeof(drweb_fin), 0) < 0)) {
  -                  close(sock);
  -                  log_write(0, LOG_MAIN|LOG_PANIC,
  -                      "malware acl condition: drweb: unable to send commands to socket (%s)", drweb_options);
  -                  return DEFER;
  -              }
  -          }
  +            /* send scan request */
  +            if ((send(sock, &drweb_cmd, sizeof(drweb_cmd), 0) < 0) || 
  +                (send(sock, &drweb_flags, sizeof(drweb_flags), 0) < 0) ||
  +                (send(sock, &drweb_slen, sizeof(drweb_slen), 0) < 0) ||
  +                (send(sock, scanrequest, Ustrlen(scanrequest), 0) < 0) ||
  +                (send(sock, &drweb_fin, sizeof(drweb_fin), 0) < 0)) {
  +                close(sock);
  +                log_write(0, LOG_MAIN|LOG_PANIC,
  +                    "malware acl condition: drweb: unable to send commands to socket (%s)", drweb_options);
  +                return DEFER;
  +            }
  +        }


  -          /* wait for result */
  -          if ((bread = recv(sock, &drweb_rc, sizeof(drweb_rc), 0) != sizeof(drweb_rc))) {
  -              close(sock);
  -              log_write(0, LOG_MAIN|LOG_PANIC,
  -                  "malware acl condition: drweb: unable to read return code");
  -              return DEFER;
  -          }
  -          drweb_rc = ntohl(drweb_rc);
  -      
  -          if ((bread = recv(sock, &drweb_vnum, sizeof(drweb_vnum), 0) != sizeof(drweb_vnum))) {
  -              close(sock);
  -              log_write(0, LOG_MAIN|LOG_PANIC,
  -                  "malware acl condition: drweb: unable to read the number of viruses");
  -              return DEFER;
  -          }
  -          drweb_vnum = ntohl(drweb_vnum);
  -          
  -          /* "virus(es) found" if virus number is > 0 */
  -          if (drweb_vnum)
  -          {
  -              int i;
  -              uschar pre_malware_nb[256];
  -              
  -              malware_name = malware_name_buffer;
  -              
  -              /* setup default virus name */
  -              Ustrcpy(malware_name_buffer,"unknown");
  -              
  -              /* read and concatenate virus names into one string */
  -              for (i=0;i<drweb_vnum;i++)
  -              {
  -                  /* read the size of report */
  -                  if ((bread = recv(sock, &drweb_slen, sizeof(drweb_slen), 0) != sizeof(drweb_slen))) {
  -                      close(sock);
  -                      log_write(0, LOG_MAIN|LOG_PANIC,
  -                          "malware acl condition: drweb: cannot read report size");
  -                      return DEFER;
  -                  };
  -                  drweb_slen = ntohl(drweb_slen);
  -              
  -                  /* read report body */
  -                  if ((bread = recv(sock, tmpbuf, drweb_slen, 0)) != drweb_slen) {
  -                      close(sock);
  -                      log_write(0, LOG_MAIN|LOG_PANIC,
  -                          "malware acl condition: drweb: cannot read report string");
  -                      return DEFER;
  -                  };
  -                  tmpbuf[drweb_slen] = '\0';
  +        /* wait for result */
  +        if ((bread = recv(sock, &drweb_rc, sizeof(drweb_rc), 0) != sizeof(drweb_rc))) {
  +            close(sock);
  +            log_write(0, LOG_MAIN|LOG_PANIC,
  +                "malware acl condition: drweb: unable to read return code");
  +            return DEFER;
  +        }
  +        drweb_rc = ntohl(drweb_rc);
  +      
  +        if ((bread = recv(sock, &drweb_vnum, sizeof(drweb_vnum), 0) != sizeof(drweb_vnum))) {
  +            close(sock);
  +            log_write(0, LOG_MAIN|LOG_PANIC,
  +                "malware acl condition: drweb: unable to read the number of viruses");
  +            return DEFER;
  +        }
  +        drweb_vnum = ntohl(drweb_vnum);
  +        
  +        /* "virus(es) found" if virus number is > 0 */
  +        if (drweb_vnum)
  +        {
  +            int i;
  +            uschar pre_malware_nb[256];
  +            
  +            malware_name = malware_name_buffer;
  +            
  +            /* setup default virus name */
  +            Ustrcpy(malware_name_buffer,"unknown");
  +            
  +            /* read and concatenate virus names into one string */
  +            for (i=0;i<drweb_vnum;i++)
  +            {
  +                /* read the size of report */
  +                if ((bread = recv(sock, &drweb_slen, sizeof(drweb_slen), 0) != sizeof(drweb_slen))) {
  +                    close(sock);
  +                    log_write(0, LOG_MAIN|LOG_PANIC,
  +                        "malware acl condition: drweb: cannot read report size");
  +                    return DEFER;
  +                };
  +                drweb_slen = ntohl(drweb_slen);
  +            
  +                /* read report body */
  +                if ((bread = recv(sock, tmpbuf, drweb_slen, 0)) != drweb_slen) {
  +                    close(sock);
  +                    log_write(0, LOG_MAIN|LOG_PANIC,
  +                        "malware acl condition: drweb: cannot read report string");
  +                    return DEFER;
  +                };
  +                tmpbuf[drweb_slen] = '\0';


  -                  /* set up match regex, depends on retcode */
  -                  Ustrcpy(drweb_match_string, "infected\\swith\\s*(.+?)$");
  +                /* set up match regex, depends on retcode */
  +                Ustrcpy(drweb_match_string, "infected\\swith\\s*(.+?)$");


  -                  drweb_re = pcre_compile( CS drweb_match_string,
  -                                  PCRE_COPT,
  -                                      (const char **)&rerror,
  -                                      &roffset,
  -                                      NULL );
  +                drweb_re = pcre_compile( CS drweb_match_string,
  +                    PCRE_COPT,
  +                    (const char **)&rerror,
  +                    &roffset,
  +                    NULL );


  -                  /* try matcher on the line, grab substring */
  -                  result = pcre_exec(drweb_re, NULL, CS tmpbuf, Ustrlen(tmpbuf), 0, 0, ovector, 30);
  -                  if (result >= 2) {
  -                      pcre_copy_substring(CS tmpbuf, ovector, result, 1, CS pre_malware_nb, 255);
  -                  }
  -                  /* the first name we just copy to malware_name */
  -                  if (i==0)
  -                      Ustrcpy(CS malware_name_buffer, CS pre_malware_nb);
  -                  else {
  -                      /* concatenate each new virus name to previous */
  -                      int slen = Ustrlen(malware_name_buffer);
  -                      if (slen < (slen+Ustrlen(pre_malware_nb))) {
  -                          Ustrcat(malware_name_buffer, "/");
  -                          Ustrcat(malware_name_buffer, pre_malware_nb);
  -                      }
  -                  }
  -              }
  -          }
  -          else {
  -              /* no virus found */
  -              malware_name = NULL;
  -          };
  -          close(sock);
  -      }
  -      /* ----------------------------------------------------------------------- */
  +                /* try matcher on the line, grab substring */
  +                result = pcre_exec(drweb_re, NULL, CS tmpbuf, Ustrlen(tmpbuf), 0, 0, ovector, 30);
  +                if (result >= 2) {
  +                    pcre_copy_substring(CS tmpbuf, ovector, result, 1, CS pre_malware_nb, 255);
  +                }
  +                /* the first name we just copy to malware_name */
  +                if (i==0)
  +                    Ustrcpy(CS malware_name_buffer, CS pre_malware_nb);
  +                else {
  +                    /* concatenate each new virus name to previous */
  +                    int slen = Ustrlen(malware_name_buffer);
  +                    if (slen < (slen+Ustrlen(pre_malware_nb))) {
  +                        Ustrcat(malware_name_buffer, "/");
  +                        Ustrcat(malware_name_buffer, pre_malware_nb);
  +                    }
  +                }
  +            }
  +        }
  +        else {
  +            /* no virus found */
  +            malware_name = NULL;
  +        };
  +        close(sock);
  +    }
  +    /* ----------------------------------------------------------------------- */
       else if (strcmpic(scanner_name,US"aveserver") == 0) {
         uschar *kav_options;
         uschar kav_options_buffer[1024];
         uschar kav_options_default[] = "/var/run/aveserver";
         uschar buf[32768];
  -      uschar *p;
         struct sockaddr_un server;
         int sock;


  @@ -452,7 +451,10 @@
         uschar file_name[1024];
         uschar av_buffer[1024];
         pcre *fs_inf;
  -      static uschar *cmdoptions[] = { "CONFIGURE\tARCHIVE\t1\n","CONFIGURE\tTIMEOUT\t0\n","CONFIGURE\tMAXARCH\t5\n","CONFIGURE\tMIME\t1\n" };
  +      static uschar *cmdoptions[] = { US"CONFIGURE\tARCHIVE\t1\n",
  +                                      US"CONFIGURE\tTIMEOUT\t0\n",
  +                                      US"CONFIGURE\tMAXARCH\t5\n",
  +                                      US"CONFIGURE\tMIME\t1\n" };


         malware_name = NULL;
         if ((fsecure_options = string_nextinlist(&av_scanner_work, &sep,
  @@ -947,7 +949,8 @@
         uschar clamd_options_default[] = "/tmp/clamd";
         uschar *p,*vname;
         struct sockaddr_un server;
  -      int sock,port,bread=0;
  +      int sock,bread=0;
  +      unsigned int port; 
         uschar file_name[1024];
         uschar av_buffer[1024];
         uschar hostname[256];
  @@ -1058,7 +1061,7 @@
         /* Check the result. ClamAV Returns
            infected: -> "<filename>: <virusname> FOUND"
            not-infected: -> "<filename>: OK"
  -            error: -> "<filename>: <errcode> ERROR */
  +        error: -> "<filename>: <errcode> ERROR */


         if (!(*av_buffer)) {
           log_write(0, LOG_MAIN|LOG_PANIC,
  @@ -1123,7 +1126,7 @@
                                               sizeof(mksd_options_buffer))) != NULL) {
           mksd_maxproc = (int) strtol(CS mksd_options, &mksd_options_end, 10);
             if ((*mksd_options == '\0') || (*mksd_options_end != '\0') ||
  -              (mksd_maxproc < 1) || (mksd_maxproc > 32)) {
  +          (mksd_maxproc < 1) || (mksd_maxproc > 32)) {
             log_write(0, LOG_MAIN|LOG_PANIC,
                       "malware acl condition: mksd: invalid option '%s'", mksd_options);
             return DEFER;


  Index: mime.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/mime.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mime.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ mime.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/mime.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/mime.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -25,8 +25,8 @@


   void mime_set_anomaly(int level, char *text) {
     mime_anomaly_level = level;
  -  mime_anomaly_text = text;
  -};
  +  mime_anomaly_text = US text;
  +}



/*************************************************
@@ -240,7 +240,7 @@


   FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
  -  FILE *f;
  +  FILE *f = NULL;
     uschar *filename;


     filename = (uschar *)malloc(2048);
  @@ -519,7 +519,7 @@
     while(1) {


       /* reset all per-part mime variables */
  -    mime_anomaly_level     = NULL;
  +    mime_anomaly_level     = 0;
       mime_anomaly_text      = NULL;
       mime_boundary          = NULL;
       mime_charset           = NULL;


  Index: receive.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/receive.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- receive.c    16 Dec 2004 15:11:47 -0000    1.6
  +++ receive.c    17 Dec 2004 14:52:44 -0000    1.7
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/receive.c,v 1.6 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/receive.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2743,7 +2743,7 @@
         {
         FILE *mbox_file;
         uschar rfc822_file_path[2048];
  -      unsigned long long mbox_size;
  +      unsigned long mbox_size;
         header_line *my_headerlist;
         uschar *user_msg, *log_msg;
         int mime_part_count_buffer = -1;


  Index: regex.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/regex.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- regex.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ regex.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/regex.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/regex.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -32,7 +32,7 @@
     uschar *list = *listptr;
     uschar *regex_string;
     uschar regex_string_buffer[1024];
  -  unsigned long long mbox_size;
  +  unsigned long mbox_size;
     FILE *mbox_file;
     pcre *re;
     pcre_list *re_list_head = NULL;
  @@ -113,7 +113,7 @@
       do {
         /* try matcher on the line */
         if (pcre_exec(re_list_item->re, NULL, CS linebuffer,
  -                      (int)Ustrlen(linebuffer), 0, 0, NULL, 0) >= 0) {
  +            (int)Ustrlen(linebuffer), 0, 0, NULL, 0) >= 0) {
           Ustrncpy(regex_match_string_buffer, re_list_item->pcre_text, 1023);
           regex_match_string = regex_match_string_buffer;
           if (mime_stream == NULL)


  Index: spam.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spam.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- spam.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ spam.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spam.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/spam.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -26,7 +26,7 @@
     uschar *list = *listptr;
     uschar *user_name;
     uschar user_name_buffer[128];
  -  unsigned long long mbox_size;
  +  unsigned long mbox_size;
     FILE *mbox_file;
     int spamd_sock;
     uschar spamd_buffer[32600];
  @@ -188,7 +188,7 @@
     /* now we are connected to spamd on spamd_sock */
     snprintf(CS spamd_buffer,
              sizeof(spamd_buffer),
  -           "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %lld\r\n\r\n",
  +           "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n",
              user_name,
              mbox_size);



  Index: spool_mbox.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spool_mbox.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- spool_mbox.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ spool_mbox.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spool_mbox.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/spool_mbox.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -27,7 +27,7 @@


/* returns a pointer to the FILE, and puts the size in bytes into mbox_file_size */

  -FILE *spool_mbox(unsigned long long *mbox_file_size) {
  +FILE *spool_mbox(unsigned long *mbox_file_size) {
     uschar mbox_path[1024];
     uschar message_subdir[2];
     uschar data_buffer[65535];
  @@ -149,24 +149,24 @@
         DIR *tempdir;


         snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, spooled_message_id);
  -        
  -        tempdir = opendir(CS mbox_path);
  -        /* loop thru dir & delete entries */
  -        n = 0;
  -        do {
  -          entry = readdir(tempdir);
  -          if (entry == NULL) break;
  -          snprintf(CS file_path, 1024,"%s/scan/%s/%s", spool_directory, spooled_message_id, entry->d_name);
  -          if ( (Ustrcmp(entry->d_name,"..") != 0) && (Ustrcmp(entry->d_name,".") != 0) ) {
  -            debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
  +    
  +    tempdir = opendir(CS mbox_path);
  +    /* loop thru dir & delete entries */
  +    n = 0;
  +    do {
  +      entry = readdir(tempdir);
  +      if (entry == NULL) break;
  +      snprintf(CS file_path, 1024,"%s/scan/%s/%s", spool_directory, spooled_message_id, entry->d_name);
  +      if ( (Ustrcmp(entry->d_name,"..") != 0) && (Ustrcmp(entry->d_name,".") != 0) ) {
  +        debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
                 n = unlink(CS file_path);
               }; 
  -        } while (n > -1);
  -        
  -        closedir(tempdir);
  -        
  -        /* remove directory */
  -        n = rmdir(CS mbox_path);
  +    } while (n > -1);
  +    
  +    closedir(tempdir);
  +    
  +    /* remove directory */
  +    n = rmdir(CS mbox_path);
       };
     };
   }


  Index: srs.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/srs.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- srs.c    16 Dec 2004 15:11:47 -0000    1.2
  +++ srs.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/srs.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/srs.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -35,7 +35,7 @@


     if(!srs)
     {
  -    // Check config
  +    /* Check config */
       if(!srs_config)
       {
         log_write(0, LOG_MAIN | LOG_PANIC,
  @@ -43,7 +43,7 @@
         return DEFER;
       }


  -    // Get config
  +    /* Get config */
       co = 0;
       if((secret = string_nextinlist(&list, &co, secret_buf,
                                      SRS_MAX_SECRET_LENGTH)) == NULL)


  Index: version.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/version.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- version.c    14 Oct 2004 11:21:02 -0000    1.2
  +++ version.c    17 Dec 2004 14:52:44 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/version.c,v 1.2 2004/10/14 11:21:02 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/version.c,v 1.3 2004/12/17 14:52:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -12,7 +12,7 @@
   #include "exim.h"



-#define THIS_VERSION "4.44"
+#define THIS_VERSION "4.45"


/* The header file cnumber.h contains a single line containing the

  Index: 002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/002,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 002    4 Nov 2004 10:42:11 -0000    1.2
  +++ 002    17 Dec 2004 14:52:44 -0000    1.3
  @@ -21,6 +21,7 @@
   acl_smtp_expn = check_expn
   acl_smtp_helo = check_helo
   acl_smtp_mail = check_mail
  +acl_smtp_mime = check_mime
   acl_smtp_mailauth = check_mailauth
   acl_smtp_quit = check_quit
   acl_smtp_predata = check_predata
  @@ -32,6 +33,7 @@
   allow_utf8_domains
   auth_advertise_hosts = a.a.h
   auto_thaw = 1d
  +av_scanner = /some/scanner
   bi_command =
   bounce_message_file =
   bounce_message_text =
  @@ -201,6 +203,7 @@
   smtp_receive_timeout = 1m
   smtp_reserve_hosts =
   smtp_return_error_details
  +spamd_address = 1.2.3.4 123
   no_split_spool_directory
   # spool_directory is set above
   no_strip_excess_angle_brackets


  Index: 205
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/205,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 205    8 Oct 2004 14:49:52 -0000    1.1
  +++ 205    17 Dec 2004 14:52:44 -0000    1.2
  @@ -11,7 +11,7 @@
   expn rhubarb
   ??? 553
   quit
  -221
  +??? 221
   ****
   0
   killdaemon


  Index: 119
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/119,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 119    8 Oct 2004 14:50:08 -0000    1.1
  +++ 119    17 Dec 2004 14:52:44 -0000    1.2
  @@ -6,11 +6,11 @@
   ---1 Get    32
   ---1 Get     8
   ---1 Get    24
  ---Malloc   236 8200 4511
  +--Malloc   236 8200 16799
   configuration file is /source/exim4/AutoTest/confs/119
   log selectors = xxxxxxxx xxxxxxxx
   admin user
  ---Malloc  8200 16400 4511
  +--Malloc  8200 16400 16799
   ---0 Get     8
   ---0 Get    16
   ---0 Get    16
  @@ -33,9 +33,9 @@
   ---0 Ext  1024
   ---0 Ext  2048
   ---0 Ext  4096
  ---Malloc  8200 24600 4511
  +--Malloc  8200 24600 16799
   ---0 Get  8192
  ---Malloc 16392 40992 4511
  +--Malloc 16392 40992 16799
   ---0 Get 16384
   -Release       32792
   ---0 Rst    ** 32792


  Index: 400
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/400,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 400    8 Oct 2004 14:50:08 -0000    1.1
  +++ 400    17 Dec 2004 14:52:44 -0000    1.2
  @@ -5,7 +5,7 @@
   ---1 Get    32
   ---1 Get    16
   ---1 Get    32
  ---Malloc   236 8200 4511
  +--Malloc   236 8200 16799
   configuration file is /source/exim4/AutoTest/confs/400
   log selectors = xxxxxxxx xxxxxxxx
   admin user
  @@ -22,7 +22,7 @@
   ---1 Get    24
   ---1 Get     8
   ---1 Get    24
  ---Malloc  8200 16400 4511
  +--Malloc  8200 16400 16799
   ---0 Get     8
   ---0 Get    16
   ---0 Get    16
  @@ -45,7 +45,7 @@
   ---0 Rst    ** 16400
   ---0 Get    96
   ---0 Rst    ** 16400
  ---Malloc  8200 24600 4511
  +--Malloc  8200 24600 16799
   ---2 Get     0
   ---2 Get    48
   ---2 Get    24
  @@ -93,65 +93,65 @@
   ---2 Ext  5124
   ---2 Ext  6148
   ---2 Ext  7172
  ---Malloc  8208 32808 4511
  +--Malloc  8208 32808 16799
   ---2 Get  8200
  ---Malloc  9232 42040 4511
  +--Malloc  9232 42040 16799
   ---2 Get  9224
   -Release       33832
  ---Malloc 10256 44088 4511
  +--Malloc 10256 44088 16799
   ---2 Get 10248
   -Release       34856
  ---Malloc 11280 46136 4511
  +--Malloc 11280 46136 16799
   ---2 Get 11272
   -Release       35880
  ---Malloc 12304 48184 4511
  +--Malloc 12304 48184 16799
   ---2 Get 12296
   -Release       36904
  ---Malloc 13328 50232 4511
  +--Malloc 13328 50232 16799
   ---2 Get 13320
   -Release       37928
  ---Malloc 14352 52280 4511
  +--Malloc 14352 52280 16799
   ---2 Get 14344
   -Release       38952
  ---Malloc 15376 54328 4511
  +--Malloc 15376 54328 16799
   ---2 Get 15368
   -Release       39976
  ---Malloc 16400 56376 4511
  +--Malloc 16400 56376 16799
   ---2 Get 16392
   -Release       41000
  ---Malloc 17424 58424 4511
  +--Malloc 17424 58424 16799
   ---2 Get 17416
   -Release       42024
  ---Malloc 18448 60472 4511
  +--Malloc 18448 60472 16799
   ---2 Get 18440
   -Release       43048
  ---Malloc 19472 62520 4511
  +--Malloc 19472 62520 16799
   ---2 Get 19464
   -Release       44072
  ---Malloc 20496 64568 4511
  +--Malloc 20496 64568 16799
   ---2 Get 20488
   -Release       45096
  ---Malloc 21520 66616 4511
  +--Malloc 21520 66616 16799
   ---2 Get 21512
   -Release       46120
  ---Malloc 22544 68664 4511
  +--Malloc 22544 68664 16799
   ---2 Get 22536
   -Release       47144
  ---Malloc 23568 70712 4511
  +--Malloc 23568 70712 16799
   ---2 Get 23560
   -Release       48168
  ---Malloc 24592 72760 4511
  +--Malloc 24592 72760 16799
   ---2 Get 24584
   -Release       49192
   ---2 Rst    ** 49192
   ---2 Get    24
  ---Malloc 24296 73488 4511
  +--Malloc 24296 73488 16799
   ---0 Get 24288
  ---Malloc 24336 97824 4511
  +--Malloc 24336 97824 16799
   ---0 Get 24328
   ---0 Rst    ** 97824
   ---0 Get    24
  ---Malloc  8200 106024 4511
  +--Malloc  8200 106024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -272,7 +272,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 114224 4511
  +--Malloc  8200 114224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -393,7 +393,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 122424 4511
  +--Malloc  8200 122424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -514,7 +514,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 130624 4511
  +--Malloc  8200 130624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -635,7 +635,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 138824 4511
  +--Malloc  8200 138824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -756,7 +756,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 147024 4511
  +--Malloc  8200 147024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -877,7 +877,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 155224 4511
  +--Malloc  8200 155224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -998,7 +998,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 163424 4511
  +--Malloc  8200 163424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1119,7 +1119,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 171624 4511
  +--Malloc  8200 171624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1240,7 +1240,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 179824 4511
  +--Malloc  8200 179824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1361,7 +1361,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 188024 4511
  +--Malloc  8200 188024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1482,7 +1482,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 196224 4511
  +--Malloc  8200 196224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1603,7 +1603,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 204424 4511
  +--Malloc  8200 204424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1724,7 +1724,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 212624 4511
  +--Malloc  8200 212624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1845,7 +1845,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 220824 4511
  +--Malloc  8200 220824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -1966,7 +1966,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 229024 4511
  +--Malloc  8200 229024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2087,7 +2087,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 237224 4511
  +--Malloc  8200 237224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2208,7 +2208,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 245424 4511
  +--Malloc  8200 245424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2329,7 +2329,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 253624 4511
  +--Malloc  8200 253624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2450,7 +2450,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 261824 4511
  +--Malloc  8200 261824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2571,7 +2571,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 270024 4511
  +--Malloc  8200 270024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2692,7 +2692,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 278224 4511
  +--Malloc  8200 278224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2813,7 +2813,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 286424 4511
  +--Malloc  8200 286424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -2934,7 +2934,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 294624 4511
  +--Malloc  8200 294624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3055,7 +3055,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 302824 4511
  +--Malloc  8200 302824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3176,7 +3176,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 311024 4511
  +--Malloc  8200 311024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3297,7 +3297,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 319224 4511
  +--Malloc  8200 319224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3418,7 +3418,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 327424 4511
  +--Malloc  8200 327424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3539,7 +3539,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 335624 4511
  +--Malloc  8200 335624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3660,7 +3660,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 343824 4511
  +--Malloc  8200 343824 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3781,7 +3781,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 352024 4511
  +--Malloc  8200 352024 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -3902,7 +3902,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 360224 4511
  +--Malloc  8200 360224 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -4023,7 +4023,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 368424 4511
  +--Malloc  8200 368424 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -4144,7 +4144,7 @@
   ---0 Get    24
   ---0 Get    24
   ---0 Get    24
  ---Malloc  8200 376624 4511
  +--Malloc  8200 376624 16799
   ---0 Get   200
   ---0 Get    24
   ---0 Get    24
  @@ -4392,7 +4392,7 @@
   ---0 Get    16
   ---0 Get    56
   ---0 Get   128
  ---Malloc  8200 384824 4511
  +--Malloc  8200 384824 16799
   ---0 Get   120
   ---0 Rst    ** 384824
   ---0 Get   104
  @@ -5050,7 +5050,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 393024 4511
  +--Malloc  8200 393024 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 393024
  @@ -5695,7 +5695,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 401224 4511
  +--Malloc  8200 401224 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 401224
  @@ -6340,7 +6340,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 409424 4511
  +--Malloc  8200 409424 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 409424
  @@ -6985,7 +6985,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 417624 4511
  +--Malloc  8200 417624 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 417624
  @@ -7630,7 +7630,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 425824 4511
  +--Malloc  8200 425824 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 425824
  @@ -8275,7 +8275,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 434024 4511
  +--Malloc  8200 434024 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 434024
  @@ -8920,7 +8920,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 442224 4511
  +--Malloc  8200 442224 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 442224
  @@ -9565,7 +9565,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 450424 4511
  +--Malloc  8200 450424 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 450424
  @@ -10210,7 +10210,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 458624 4511
  +--Malloc  8200 458624 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 458624
  @@ -10855,7 +10855,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 466824 4511
  +--Malloc  8200 466824 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 466824
  @@ -11500,7 +11500,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 475024 4511
  +--Malloc  8200 475024 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 475024
  @@ -12145,7 +12145,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 483224 4511
  +--Malloc  8200 483224 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 483224
  @@ -12790,7 +12790,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 491424 4511
  +--Malloc  8200 491424 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 491424
  @@ -13435,7 +13435,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 499624 4511
  +--Malloc  8200 499624 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 499624
  @@ -14080,7 +14080,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 507824 4511
  +--Malloc  8200 507824 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 507824
  @@ -14725,7 +14725,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 516024 4511
  +--Malloc  8200 516024 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 516024
  @@ -15370,7 +15370,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 524224 4511
  +--Malloc  8200 524224 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 524224
  @@ -16015,7 +16015,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 532424 4511
  +--Malloc  8200 532424 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 532424
  @@ -16660,7 +16660,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 540624 4511
  +--Malloc  8200 540624 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 540624
  @@ -17305,7 +17305,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 548824 4511
  +--Malloc  8200 548824 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 548824
  @@ -17950,7 +17950,7 @@
   ---0 Get    16
   ---0 Get    16
   ---0 Get    56
  ---Malloc  8200 557024 4511
  +--Malloc  8200 557024 16799
   ---0 Get   128
   ---0 Get   120
   ---0 Rst    ** 557024


  Index: 549
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/549,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 549    8 Oct 2004 14:50:08 -0000    1.1
  +++ 549    17 Dec 2004 14:52:44 -0000    1.2
  @@ -8,7 +8,7 @@
   ---1 Get    32
   ---1 Get    16
   ---1 Get    32
  ---Malloc   236 8200 4511
  +--Malloc   236 8200 16799
   configuration file is /source/exim4/AutoTest/confs/549
   log selectors = xxxxxxxx xxxxxxxx
   admin user
  @@ -18,7 +18,7 @@
   ---1 Get    16
   ---1 Get     8
   ---1 Get    88
  ---Malloc  8200 16400 4511
  +--Malloc  8200 16400 16799
   ---0 Get     8
   ---0 Get    16
   ---0 Get    16
  @@ -105,7 +105,7 @@
   ---0 Rst    ** 16400
   ---0 Get   112
   ---0 Rst    ** 16400
  ---Malloc  8200 24600 4511
  +--Malloc  8200 24600 16799
   ---2 Get     0
   search_open: lsearch "/source/exim4/AutoTest/aux/549.rw"
   ---2 Get    56
  @@ -267,7 +267,7 @@
   ---1 Get    40
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4055 24600 8566
  +--Malloc  4055 24600 20854
   newlen=4051 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -310,7 +310,7 @@
   **** debug string too long - truncated ****
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 8566
  +--Malloc  8200 32800 20854
   ---0 Get  4056
   ----Free
   remainder: random@???,
  @@ -390,7 +390,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4057 32800 12623
  +--Malloc  4057 32800 24911
   newlen=4053 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -434,7 +434,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 12623
  +--Malloc  8200 32800 24911
   ---0 Get  4056
   ----Free
   remainder: random@???,
  @@ -514,7 +514,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4059 32800 16682
  +--Malloc  4059 32800 28970
   newlen=4055 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -558,7 +558,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 16682
  +--Malloc  8200 32800 28970
   ---0 Get  4056
   ----Free
   remainder: random@???,
  @@ -638,7 +638,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4061 32800 20743
  +--Malloc  4061 32800 33031
   newlen=4057 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -682,7 +682,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 20743
  +--Malloc  8200 32800 33031
   ---0 Get  4064
   ----Free
   remainder: random@???,
  @@ -762,7 +762,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4063 32800 24806
  +--Malloc  4063 32800 37094
   newlen=4059 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -806,7 +806,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 24806
  +--Malloc  8200 32800 37094
   ---0 Get  4064
   ----Free
   remainder: random@???,
  @@ -886,7 +886,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4065 32800 28871
  +--Malloc  4065 32800 41159
   newlen=4061 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -930,7 +930,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 28871
  +--Malloc  8200 32800 41159
   ---0 Get  4064
   ----Free
   remainder: random@???,
  @@ -1010,7 +1010,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4067 32800 32938
  +--Malloc  4067 32800 45226
   newlen=4063 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1054,7 +1054,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 32938
  +--Malloc  8200 32800 45226
   ---0 Get  4064
   ----Free
   remainder: random@???,
  @@ -1134,7 +1134,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4069 32800 37007
  +--Malloc  4069 32800 49295
   newlen=4065 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1178,7 +1178,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 37007
  +--Malloc  8200 32800 49295
   ---0 Get  4072
   ----Free
   remainder: random@???,
  @@ -1258,7 +1258,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4071 32800 41078
  +--Malloc  4071 32800 53366
   newlen=4067 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1302,7 +1302,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 41078
  +--Malloc  8200 32800 53366
   ---0 Get  4072
   ----Free
   remainder: random@???,
  @@ -1382,7 +1382,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4073 32800 45151
  +--Malloc  4073 32800 57439
   newlen=4069 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1426,7 +1426,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 45151
  +--Malloc  8200 32800 57439
   ---0 Get  4072
   ----Free
   remainder: random@???,
  @@ -1506,7 +1506,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4075 32800 49226
  +--Malloc  4075 32800 61514
   newlen=4071 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1549,7 +1549,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 49226
  +--Malloc  8200 32800 61514
   ---0 Get  4072
   ----Free
   remainder: random@???,
  @@ -1629,7 +1629,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4077 32800 53303
  +--Malloc  4077 32800 65591
   newlen=4073 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1672,7 +1672,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 53303
  +--Malloc  8200 32800 65591
   ---0 Get  4080
   ----Free
   remainder: random@???,
  @@ -1752,7 +1752,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4079 32800 57382
  +--Malloc  4079 32800 69670
   newlen=4075 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1795,7 +1795,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 57382
  +--Malloc  8200 32800 69670
   ---0 Get  4080
   ----Free
   remainder: random@???,
  @@ -1875,7 +1875,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4081 32800 61463
  +--Malloc  4081 32800 73751
   newlen=4077 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -1918,7 +1918,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 61463
  +--Malloc  8200 32800 73751
   ---0 Get  4080
   ----Free
   remainder: random@???,
  @@ -1998,7 +1998,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4083 32800 65546
  +--Malloc  4083 32800 77834
   newlen=4079 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2041,7 +2041,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 65546
  +--Malloc  8200 32800 77834
   ---0 Get  4080
   ----Free
   remainder: random@???,
  @@ -2121,7 +2121,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4085 32800 69631
  +--Malloc  4085 32800 81919
   newlen=4081 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2164,7 +2164,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 69631
  +--Malloc  8200 32800 81919
   ---0 Get  4088
   ----Free
   remainder: random@???,
  @@ -2244,7 +2244,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4087 32800 73718
  +--Malloc  4087 32800 86006
   newlen=4083 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2287,7 +2287,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 73718
  +--Malloc  8200 32800 86006
   ---0 Get  4088
   ----Free
   remainder: random@???,
  @@ -2367,7 +2367,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4089 32800 77807
  +--Malloc  4089 32800 90095
   newlen=4085 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2410,7 +2410,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 77807
  +--Malloc  8200 32800 90095
   ---0 Get  4088
   ----Free
   remainder: random@???,
  @@ -2490,7 +2490,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4091 32800 81898
  +--Malloc  4091 32800 94186
   newlen=4087 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2533,7 +2533,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 81898
  +--Malloc  8200 32800 94186
   ---0 Get  4088
   ----Free
   remainder: random@???,
  @@ -2613,7 +2613,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4093 32800 85991
  +--Malloc  4093 32800 98279
   newlen=4089 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2656,7 +2656,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 85991
  +--Malloc  8200 32800 98279
   ---0 Get  4096
   ----Free
   remainder: random@???,
  @@ -2736,7 +2736,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4095 32800 90086
  +--Malloc  4095 32800 102374
   newlen=4091 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2779,7 +2779,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 90086
  +--Malloc  8200 32800 102374
   ---0 Get  4096
   ----Free
   remainder: random@???,
  @@ -2859,7 +2859,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4097 32800 94183
  +--Malloc  4097 32800 106471
   newlen=4093 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -2902,7 +2902,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 94183
  +--Malloc  8200 32800 106471
   ---0 Get  4096
   ----Free
   remainder: random@???,
  @@ -2982,7 +2982,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4099 32800 98282
  +--Malloc  4099 32800 110570
   newlen=4095 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3024,7 +3024,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 98282
  +--Malloc  8200 32800 110570
   ---0 Get  4096
   ----Free
   remainder: random@???,
  @@ -3104,7 +3104,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4101 32800 102383
  +--Malloc  4101 32800 114671
   newlen=4097 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3146,7 +3146,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 102383
  +--Malloc  8200 32800 114671
   ---0 Get  4104
   ----Free
   remainder: random@???,
  @@ -3226,7 +3226,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4103 32800 106486
  +--Malloc  4103 32800 118774
   newlen=4099 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3268,7 +3268,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 106486
  +--Malloc  8200 32800 118774
   ---0 Get  4104
   ----Free
   remainder: random@???,
  @@ -3348,7 +3348,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4105 32800 110591
  +--Malloc  4105 32800 122879
   newlen=4101 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3390,7 +3390,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 110591
  +--Malloc  8200 32800 122879
   ---0 Get  4104
   ----Free
   remainder: random@???,
  @@ -3470,7 +3470,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4107 32800 114698
  +--Malloc  4107 32800 126986
   newlen=4103 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3512,7 +3512,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 114698
  +--Malloc  8200 32800 126986
   ---0 Get  4104
   ----Free
   remainder: random@???,
  @@ -3592,7 +3592,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4109 32800 118807
  +--Malloc  4109 32800 131095
   newlen=4105 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3634,7 +3634,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 118807
  +--Malloc  8200 32800 131095
   ---0 Get  4112
   ----Free
   remainder: random@???,
  @@ -3714,7 +3714,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4111 32800 122918
  +--Malloc  4111 32800 135206
   newlen=4107 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3756,7 +3756,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 122918
  +--Malloc  8200 32800 135206
   ---0 Get  4112
   ----Free
   remainder: random@???,
  @@ -3836,7 +3836,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4113 32800 127031
  +--Malloc  4113 32800 139319
   newlen=4109 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -3878,7 +3878,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 127031
  +--Malloc  8200 32800 139319
   ---0 Get  4112
   ----Free
   remainder: random@???,
  @@ -3958,7 +3958,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4115 32800 131146
  +--Malloc  4115 32800 143434
   newlen=4111 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4000,7 +4000,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 131146
  +--Malloc  8200 32800 143434
   ---0 Get  4112
   ----Free
   remainder: random@???,
  @@ -4080,7 +4080,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4117 32800 135263
  +--Malloc  4117 32800 147551
   newlen=4113 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4122,7 +4122,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 135263
  +--Malloc  8200 32800 147551
   ---0 Get  4120
   ----Free
   remainder: random@???,
  @@ -4202,7 +4202,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4119 32800 139382
  +--Malloc  4119 32800 151670
   newlen=4115 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4244,7 +4244,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 139382
  +--Malloc  8200 32800 151670
   ---0 Get  4120
   ----Free
   remainder: random@???,
  @@ -4324,7 +4324,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4121 32800 143503
  +--Malloc  4121 32800 155791
   newlen=4117 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4366,7 +4366,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 143503
  +--Malloc  8200 32800 155791
   ---0 Get  4120
   ----Free
   remainder: random@???,
  @@ -4446,7 +4446,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4123 32800 147626
  +--Malloc  4123 32800 159914
   newlen=4119 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4488,7 +4488,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 147626
  +--Malloc  8200 32800 159914
   ---0 Get  4120
   ----Free
   remainder: random@???,
  @@ -4568,7 +4568,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4125 32800 151751
  +--Malloc  4125 32800 164039
   newlen=4121 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4610,7 +4610,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 151751
  +--Malloc  8200 32800 164039
   ---0 Get  4128
   ----Free
   remainder: random@???,
  @@ -4690,7 +4690,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4127 32800 155878
  +--Malloc  4127 32800 168166
   newlen=4123 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4732,7 +4732,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 155878
  +--Malloc  8200 32800 168166
   ---0 Get  4128
   ----Free
   remainder: random@???,
  @@ -4812,7 +4812,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4129 32800 160007
  +--Malloc  4129 32800 172295
   newlen=4125 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4854,7 +4854,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 160007
  +--Malloc  8200 32800 172295
   ---0 Get  4128
   ----Free
   remainder: random@???,
  @@ -4934,7 +4934,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4131 32800 164138
  +--Malloc  4131 32800 176426
   newlen=4127 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -4976,7 +4976,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 164138
  +--Malloc  8200 32800 176426
   ---0 Get  4128
   ----Free
   remainder: random@???,
  @@ -5056,7 +5056,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4133 32800 168271
  +--Malloc  4133 32800 180559
   newlen=4129 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5098,7 +5098,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 168271
  +--Malloc  8200 32800 180559
   ---0 Get  4136
   ----Free
   remainder: random@???,
  @@ -5178,7 +5178,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4135 32800 172406
  +--Malloc  4135 32800 184694
   newlen=4131 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5220,7 +5220,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 172406
  +--Malloc  8200 32800 184694
   ---0 Get  4136
   ----Free
   remainder: random@???,
  @@ -5300,7 +5300,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4137 32800 176543
  +--Malloc  4137 32800 188831
   newlen=4133 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5342,7 +5342,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 176543
  +--Malloc  8200 32800 188831
   ---0 Get  4136
   ----Free
   remainder: random@???,
  @@ -5422,7 +5422,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4139 32800 180682
  +--Malloc  4139 32800 192970
   newlen=4135 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5464,7 +5464,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 180682
  +--Malloc  8200 32800 192970
   ---0 Get  4136
   ----Free
   remainder: random@???,
  @@ -5544,7 +5544,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4141 32800 184823
  +--Malloc  4141 32800 197111
   newlen=4137 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5586,7 +5586,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 184823
  +--Malloc  8200 32800 197111
   ---0 Get  4144
   ----Free
   remainder: random@???,
  @@ -5666,7 +5666,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4143 32800 188966
  +--Malloc  4143 32800 201254
   newlen=4139 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5708,7 +5708,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 188966
  +--Malloc  8200 32800 201254
   ---0 Get  4144
   ----Free
   remainder: random@???,
  @@ -5788,7 +5788,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4145 32800 193111
  +--Malloc  4145 32800 205399
   newlen=4141 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5830,7 +5830,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 193111
  +--Malloc  8200 32800 205399
   ---0 Get  4144
   ----Free
   remainder: random@???,
  @@ -5910,7 +5910,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4147 32800 197258
  +--Malloc  4147 32800 209546
   newlen=4143 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -5952,7 +5952,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 197258
  +--Malloc  8200 32800 209546
   ---0 Get  4144
   ----Free
   remainder: random@???,
  @@ -6032,7 +6032,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4149 32800 201407
  +--Malloc  4149 32800 213695
   newlen=4145 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6074,7 +6074,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 201407
  +--Malloc  8200 32800 213695
   ---0 Get  4152
   ----Free
   remainder: random@???,
  @@ -6154,7 +6154,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4151 32800 205558
  +--Malloc  4151 32800 217846
   newlen=4147 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6196,7 +6196,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 205558
  +--Malloc  8200 32800 217846
   ---0 Get  4152
   ----Free
   remainder: random@???,
  @@ -6276,7 +6276,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4153 32800 209711
  +--Malloc  4153 32800 221999
   newlen=4149 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6318,7 +6318,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 209711
  +--Malloc  8200 32800 221999
   ---0 Get  4152
   ----Free
   remainder: random@???,
  @@ -6398,7 +6398,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4155 32800 213866
  +--Malloc  4155 32800 226154
   newlen=4151 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6440,7 +6440,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 213866
  +--Malloc  8200 32800 226154
   ---0 Get  4152
   ----Free
   remainder: random@???,
  @@ -6520,7 +6520,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4157 32800 218023
  +--Malloc  4157 32800 230311
   newlen=4153 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6562,7 +6562,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 218023
  +--Malloc  8200 32800 230311
   ---0 Get  4160
   ----Free
   remainder: random@???,
  @@ -6642,7 +6642,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4159 32800 222182
  +--Malloc  4159 32800 234470
   newlen=4155 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6684,7 +6684,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 222182
  +--Malloc  8200 32800 234470
   ---0 Get  4160
   ----Free
   remainder: random@???,
  @@ -6764,7 +6764,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4161 32800 226343
  +--Malloc  4161 32800 238631
   newlen=4157 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6806,7 +6806,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 226343
  +--Malloc  8200 32800 238631
   ---0 Get  4160
   ----Free
   remainder: random@???,
  @@ -6886,7 +6886,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4163 32800 230506
  +--Malloc  4163 32800 242794
   newlen=4159 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -6928,7 +6928,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 230506
  +--Malloc  8200 32800 242794
   ---0 Get  4160
   ----Free
   remainder: random@???,
  @@ -7008,7 +7008,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4165 32800 234671
  +--Malloc  4165 32800 246959
   newlen=4161 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7050,7 +7050,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 234671
  +--Malloc  8200 32800 246959
   ---0 Get  4168
   ----Free
   remainder: random@???,
  @@ -7130,7 +7130,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4167 32800 238838
  +--Malloc  4167 32800 251126
   newlen=4163 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7172,7 +7172,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 238838
  +--Malloc  8200 32800 251126
   ---0 Get  4168
   ----Free
   remainder: random@???,
  @@ -7252,7 +7252,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4169 32800 243007
  +--Malloc  4169 32800 255295
   newlen=4165 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7294,7 +7294,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 243007
  +--Malloc  8200 32800 255295
   ---0 Get  4168
   ----Free
   remainder: random@???,
  @@ -7374,7 +7374,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4171 32800 247178
  +--Malloc  4171 32800 259466
   newlen=4167 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7416,7 +7416,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 247178
  +--Malloc  8200 32800 259466
   ---0 Get  4168
   ----Free
   remainder: random@???,
  @@ -7496,7 +7496,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4173 32800 251351
  +--Malloc  4173 32800 263639
   newlen=4169 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7538,7 +7538,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 251351
  +--Malloc  8200 32800 263639
   ---0 Get  4176
   ----Free
   remainder: random@???,
  @@ -7618,7 +7618,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4175 32800 255526
  +--Malloc  4175 32800 267814
   newlen=4171 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7660,7 +7660,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 255526
  +--Malloc  8200 32800 267814
   ---0 Get  4176
   ----Free
   remainder: random@???,
  @@ -7740,7 +7740,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4177 32800 259703
  +--Malloc  4177 32800 271991
   newlen=4173 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7782,7 +7782,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 259703
  +--Malloc  8200 32800 271991
   ---0 Get  4176
   ----Free
   remainder: random@???,
  @@ -7862,7 +7862,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4179 32800 263882
  +--Malloc  4179 32800 276170
   newlen=4175 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -7904,7 +7904,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 263882
  +--Malloc  8200 32800 276170
   ---0 Get  4176
   ----Free
   remainder: random@???,
  @@ -7984,7 +7984,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4181 32800 268063
  +--Malloc  4181 32800 280351
   newlen=4177 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8026,7 +8026,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 268063
  +--Malloc  8200 32800 280351
   ---0 Get  4184
   ----Free
   remainder: random@???,
  @@ -8106,7 +8106,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4183 32800 272246
  +--Malloc  4183 32800 284534
   newlen=4179 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8148,7 +8148,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 272246
  +--Malloc  8200 32800 284534
   ---0 Get  4184
   ----Free
   remainder: random@???,
  @@ -8228,7 +8228,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4185 32800 276431
  +--Malloc  4185 32800 288719
   newlen=4181 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8270,7 +8270,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 276431
  +--Malloc  8200 32800 288719
   ---0 Get  4184
   ----Free
   remainder: random@???,
  @@ -8350,7 +8350,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4187 32800 280618
  +--Malloc  4187 32800 292906
   newlen=4183 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8392,7 +8392,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 280618
  +--Malloc  8200 32800 292906
   ---0 Get  4184
   ----Free
   remainder: random@???,
  @@ -8472,7 +8472,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4189 32800 284807
  +--Malloc  4189 32800 297095
   newlen=4185 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8514,7 +8514,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 284807
  +--Malloc  8200 32800 297095
   ---0 Get  4192
   ----Free
   remainder: random@???,
  @@ -8594,7 +8594,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4191 32800 288998
  +--Malloc  4191 32800 301286
   newlen=4187 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8636,7 +8636,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 288998
  +--Malloc  8200 32800 301286
   ---0 Get  4192
   ----Free
   remainder: random@???,
  @@ -8716,7 +8716,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4193 32800 293191
  +--Malloc  4193 32800 305479
   newlen=4189 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8758,7 +8758,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 293191
  +--Malloc  8200 32800 305479
   ---0 Get  4192
   ----Free
   remainder: random@???,
  @@ -8838,7 +8838,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4195 32800 297386
  +--Malloc  4195 32800 309674
   newlen=4191 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -8880,7 +8880,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 297386
  +--Malloc  8200 32800 309674
   ---0 Get  4192
   ----Free
   remainder: random@???,
  @@ -8960,7 +8960,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4197 32800 301583
  +--Malloc  4197 32800 313871
   newlen=4193 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9002,7 +9002,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 301583
  +--Malloc  8200 32800 313871
   ---0 Get  4200
   ----Free
   remainder: random@???,
  @@ -9082,7 +9082,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4199 32800 305782
  +--Malloc  4199 32800 318070
   newlen=4195 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9124,7 +9124,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 305782
  +--Malloc  8200 32800 318070
   ---0 Get  4200
   ----Free
   remainder: random@???,
  @@ -9204,7 +9204,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4201 32800 309983
  +--Malloc  4201 32800 322271
   newlen=4197 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9246,7 +9246,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 309983
  +--Malloc  8200 32800 322271
   ---0 Get  4200
   ----Free
   remainder: random@???,
  @@ -9326,7 +9326,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4203 32800 314186
  +--Malloc  4203 32800 326474
   newlen=4199 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9368,7 +9368,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 314186
  +--Malloc  8200 32800 326474
   ---0 Get  4200
   ----Free
   remainder: random@???,
  @@ -9448,7 +9448,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4205 32800 318391
  +--Malloc  4205 32800 330679
   newlen=4201 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9490,7 +9490,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 318391
  +--Malloc  8200 32800 330679
   ---0 Get  4208
   ----Free
   remainder: random@???,
  @@ -9570,7 +9570,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4207 32800 322598
  +--Malloc  4207 32800 334886
   newlen=4203 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9612,7 +9612,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 322598
  +--Malloc  8200 32800 334886
   ---0 Get  4208
   ----Free
   remainder: random@???,
  @@ -9692,7 +9692,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4209 32800 326807
  +--Malloc  4209 32800 339095
   newlen=4205 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9734,7 +9734,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 326807
  +--Malloc  8200 32800 339095
   ---0 Get  4208
   ----Free
   remainder: random@???,
  @@ -9814,7 +9814,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4211 32800 331018
  +--Malloc  4211 32800 343306
   newlen=4207 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9856,7 +9856,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 331018
  +--Malloc  8200 32800 343306
   ---0 Get  4208
   ----Free
   remainder: random@???,
  @@ -9936,7 +9936,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4213 32800 335231
  +--Malloc  4213 32800 347519
   newlen=4209 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -9978,7 +9978,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 335231
  +--Malloc  8200 32800 347519
   ---0 Get  4216
   ----Free
   remainder: random@???,
  @@ -10058,7 +10058,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4215 32800 339446
  +--Malloc  4215 32800 351734
   newlen=4211 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10100,7 +10100,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 339446
  +--Malloc  8200 32800 351734
   ---0 Get  4216
   ----Free
   remainder: random@???,
  @@ -10180,7 +10180,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4217 32800 343663
  +--Malloc  4217 32800 355951
   newlen=4213 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10222,7 +10222,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 343663
  +--Malloc  8200 32800 355951
   ---0 Get  4216
   ----Free
   remainder: random@???,
  @@ -10302,7 +10302,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4219 32800 347882
  +--Malloc  4219 32800 360170
   newlen=4215 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10344,7 +10344,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 347882
  +--Malloc  8200 32800 360170
   ---0 Get  4216
   ----Free
   remainder: random@???,
  @@ -10424,7 +10424,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4221 32800 352103
  +--Malloc  4221 32800 364391
   newlen=4217 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10466,7 +10466,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 352103
  +--Malloc  8200 32800 364391
   ---0 Get  4224
   ----Free
   remainder: random@???,
  @@ -10546,7 +10546,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4223 32800 356326
  +--Malloc  4223 32800 368614
   newlen=4219 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10588,7 +10588,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 356326
  +--Malloc  8200 32800 368614
   ---0 Get  4224
   ----Free
   remainder: random@???,
  @@ -10668,7 +10668,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4225 32800 360551
  +--Malloc  4225 32800 372839
   newlen=4221 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10710,7 +10710,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 360551
  +--Malloc  8200 32800 372839
   ---0 Get  4224
   ----Free
   remainder: random@???,
  @@ -10790,7 +10790,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4227 32800 364778
  +--Malloc  4227 32800 377066
   newlen=4223 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10832,7 +10832,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 364778
  +--Malloc  8200 32800 377066
   ---0 Get  4224
   ----Free
   remainder: random@???,
  @@ -10912,7 +10912,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4229 32800 369007
  +--Malloc  4229 32800 381295
   newlen=4225 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -10954,7 +10954,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 369007
  +--Malloc  8200 32800 381295
   ---0 Get  4232
   ----Free
   remainder: random@???,
  @@ -11034,7 +11034,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4231 32800 373238
  +--Malloc  4231 32800 385526
   newlen=4227 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11076,7 +11076,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 373238
  +--Malloc  8200 32800 385526
   ---0 Get  4232
   ----Free
   remainder: random@???,
  @@ -11156,7 +11156,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4233 32800 377471
  +--Malloc  4233 32800 389759
   newlen=4229 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11198,7 +11198,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 377471
  +--Malloc  8200 32800 389759
   ---0 Get  4232
   ----Free
   remainder: random@???,
  @@ -11278,7 +11278,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4235 32800 381706
  +--Malloc  4235 32800 393994
   newlen=4231 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11320,7 +11320,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 381706
  +--Malloc  8200 32800 393994
   ---0 Get  4232
   ----Free
   remainder: random@???,
  @@ -11400,7 +11400,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4237 32800 385943
  +--Malloc  4237 32800 398231
   newlen=4233 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11442,7 +11442,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 385943
  +--Malloc  8200 32800 398231
   ---0 Get  4240
   ----Free
   remainder: random@???,
  @@ -11522,7 +11522,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4239 32800 390182
  +--Malloc  4239 32800 402470
   newlen=4235 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11564,7 +11564,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 390182
  +--Malloc  8200 32800 402470
   ---0 Get  4240
   ----Free
   remainder: random@???,
  @@ -11644,7 +11644,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4241 32800 394423
  +--Malloc  4241 32800 406711
   newlen=4237 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11686,7 +11686,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 394423
  +--Malloc  8200 32800 406711
   ---0 Get  4240
   ----Free
   remainder: random@???,
  @@ -11766,7 +11766,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4243 32800 398666
  +--Malloc  4243 32800 410954
   newlen=4239 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11808,7 +11808,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 398666
  +--Malloc  8200 32800 410954
   ---0 Get  4240
   ----Free
   remainder: random@???,
  @@ -11888,7 +11888,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4245 32800 402911
  +--Malloc  4245 32800 415199
   newlen=4241 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -11930,7 +11930,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 402911
  +--Malloc  8200 32800 415199
   ---0 Get  4248
   ----Free
   remainder: random@???,
  @@ -12010,7 +12010,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4247 32800 407158
  +--Malloc  4247 32800 419446
   newlen=4243 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12052,7 +12052,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 407158
  +--Malloc  8200 32800 419446
   ---0 Get  4248
   ----Free
   remainder: random@???,
  @@ -12132,7 +12132,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4249 32800 411407
  +--Malloc  4249 32800 423695
   newlen=4245 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12174,7 +12174,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 411407
  +--Malloc  8200 32800 423695
   ---0 Get  4248
   ----Free
   remainder: random@???,
  @@ -12254,7 +12254,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4251 32800 415658
  +--Malloc  4251 32800 427946
   newlen=4247 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12296,7 +12296,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 415658
  +--Malloc  8200 32800 427946
   ---0 Get  4248
   ----Free
   remainder: random@???,
  @@ -12376,7 +12376,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4253 32800 419911
  +--Malloc  4253 32800 432199
   newlen=4249 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12418,7 +12418,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 419911
  +--Malloc  8200 32800 432199
   ---0 Get  4256
   ----Free
   remainder: random@???,
  @@ -12498,7 +12498,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4255 32800 424166
  +--Malloc  4255 32800 436454
   newlen=4251 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12540,7 +12540,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 424166
  +--Malloc  8200 32800 436454
   ---0 Get  4256
   ----Free
   remainder: random@???,
  @@ -12620,7 +12620,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4257 32800 428423
  +--Malloc  4257 32800 440711
   newlen=4253 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12662,7 +12662,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 428423
  +--Malloc  8200 32800 440711
   ---0 Get  4256
   ----Free
   remainder: random@???,
  @@ -12742,7 +12742,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4259 32800 432682
  +--Malloc  4259 32800 444970
   newlen=4255 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12784,7 +12784,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 432682
  +--Malloc  8200 32800 444970
   ---0 Get  4256
   ----Free
   remainder: random@???,
  @@ -12864,7 +12864,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4261 32800 436943
  +--Malloc  4261 32800 449231
   newlen=4257 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -12906,7 +12906,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 436943
  +--Malloc  8200 32800 449231
   ---0 Get  4264
   ----Free
   remainder: random@???,
  @@ -12986,7 +12986,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4263 32800 441206
  +--Malloc  4263 32800 453494
   newlen=4259 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13028,7 +13028,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 441206
  +--Malloc  8200 32800 453494
   ---0 Get  4264
   ----Free
   remainder: random@???,
  @@ -13108,7 +13108,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4265 32800 445471
  +--Malloc  4265 32800 457759
   newlen=4261 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13150,7 +13150,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 445471
  +--Malloc  8200 32800 457759
   ---0 Get  4264
   ----Free
   remainder: random@???,
  @@ -13230,7 +13230,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4267 32800 449738
  +--Malloc  4267 32800 462026
   newlen=4263 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13272,7 +13272,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 449738
  +--Malloc  8200 32800 462026
   ---0 Get  4264
   ----Free
   remainder: random@???,
  @@ -13352,7 +13352,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4269 32800 454007
  +--Malloc  4269 32800 466295
   newlen=4265 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13394,7 +13394,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 454007
  +--Malloc  8200 32800 466295
   ---0 Get  4272
   ----Free
   remainder: random@???,
  @@ -13474,7 +13474,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4271 32800 458278
  +--Malloc  4271 32800 470566
   newlen=4267 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13516,7 +13516,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 458278
  +--Malloc  8200 32800 470566
   ---0 Get  4272
   ----Free
   remainder: random@???,
  @@ -13596,7 +13596,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4273 32800 462551
  +--Malloc  4273 32800 474839
   newlen=4269 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13638,7 +13638,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 462551
  +--Malloc  8200 32800 474839
   ---0 Get  4272
   ----Free
   remainder: random@???,
  @@ -13718,7 +13718,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4275 32800 466826
  +--Malloc  4275 32800 479114
   newlen=4271 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13760,7 +13760,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 466826
  +--Malloc  8200 32800 479114
   ---0 Get  4272
   ----Free
   remainder: random@???,
  @@ -13840,7 +13840,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4277 32800 471103
  +--Malloc  4277 32800 483391
   newlen=4273 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -13882,7 +13882,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 471103
  +--Malloc  8200 32800 483391
   ---0 Get  4280
   ----Free
   remainder: random@???,
  @@ -13962,7 +13962,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4279 32800 475382
  +--Malloc  4279 32800 487670
   newlen=4275 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14004,7 +14004,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 475382
  +--Malloc  8200 32800 487670
   ---0 Get  4280
   ----Free
   remainder: random@???,
  @@ -14084,7 +14084,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4281 32800 479663
  +--Malloc  4281 32800 491951
   newlen=4277 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14126,7 +14126,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 479663
  +--Malloc  8200 32800 491951
   ---0 Get  4280
   ----Free
   remainder: random@???,
  @@ -14206,7 +14206,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4283 32800 483946
  +--Malloc  4283 32800 496234
   newlen=4279 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14248,7 +14248,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 483946
  +--Malloc  8200 32800 496234
   ---0 Get  4280
   ----Free
   remainder: random@???,
  @@ -14328,7 +14328,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4285 32800 488231
  +--Malloc  4285 32800 500519
   newlen=4281 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14370,7 +14370,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 488231
  +--Malloc  8200 32800 500519
   ---0 Get  4288
   ----Free
   remainder: random@???,
  @@ -14450,7 +14450,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4287 32800 492518
  +--Malloc  4287 32800 504806
   newlen=4283 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14492,7 +14492,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 492518
  +--Malloc  8200 32800 504806
   ---0 Get  4288
   ----Free
   remainder: random@???,
  @@ -14572,7 +14572,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4289 32800 496807
  +--Malloc  4289 32800 509095
   newlen=4285 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14614,7 +14614,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 496807
  +--Malloc  8200 32800 509095
   ---0 Get  4288
   ----Free
   remainder: random@???,
  @@ -14694,7 +14694,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4291 32800 501098
  +--Malloc  4291 32800 513386
   newlen=4287 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14736,7 +14736,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 501098
  +--Malloc  8200 32800 513386
   ---0 Get  4288
   ----Free
   remainder: random@???,
  @@ -14816,7 +14816,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4293 32800 505391
  +--Malloc  4293 32800 517679
   newlen=4289 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14858,7 +14858,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 505391
  +--Malloc  8200 32800 517679
   ---0 Get  4296
   ----Free
   remainder: random@???,
  @@ -14938,7 +14938,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4295 32800 509686
  +--Malloc  4295 32800 521974
   newlen=4291 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -14980,7 +14980,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 509686
  +--Malloc  8200 32800 521974
   ---0 Get  4296
   ----Free
   remainder: random@???,
  @@ -15060,7 +15060,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4297 32800 513983
  +--Malloc  4297 32800 526271
   newlen=4293 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15102,7 +15102,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 513983
  +--Malloc  8200 32800 526271
   ---0 Get  4296
   ----Free
   remainder: random@???,
  @@ -15182,7 +15182,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4299 32800 518282
  +--Malloc  4299 32800 530570
   newlen=4295 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15224,7 +15224,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 518282
  +--Malloc  8200 32800 530570
   ---0 Get  4296
   ----Free
   remainder: random@???,
  @@ -15303,7 +15303,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4301 32800 522583
  +--Malloc  4301 32800 534871
   newlen=4297 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15345,7 +15345,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 522583
  +--Malloc  8200 32800 534871
   ---0 Get  4304
   ----Free
   remainder: random@???,
  @@ -15423,7 +15423,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4303 32800 526886
  +--Malloc  4303 32800 539174
   newlen=4299 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15465,7 +15465,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 526886
  +--Malloc  8200 32800 539174
   ---0 Get  4304
   ----Free
   remainder: random@???,
  @@ -15542,7 +15542,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4305 32800 531191
  +--Malloc  4305 32800 543479
   newlen=4301 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15584,7 +15584,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 531191
  +--Malloc  8200 32800 543479
   ---0 Get  4304
   ----Free
   remainder: random@???,
  @@ -15660,7 +15660,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4307 32800 535498
  +--Malloc  4307 32800 547786
   newlen=4303 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15702,7 +15702,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 535498
  +--Malloc  8200 32800 547786
   ---0 Get  4304
   ----Free
   remainder: random@???,
  @@ -15777,7 +15777,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4309 32800 539807
  +--Malloc  4309 32800 552095
   newlen=4305 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15819,7 +15819,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 539807
  +--Malloc  8200 32800 552095
   ---0 Get  4312
   ----Free
   remainder: random@???,
  @@ -15893,7 +15893,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4311 32800 544118
  +--Malloc  4311 32800 556406
   newlen=4307 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -15935,7 +15935,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 544118
  +--Malloc  8200 32800 556406
   ---0 Get  4312
   ----Free
   remainder: random@???,
  @@ -16008,7 +16008,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4313 32800 548431
  +--Malloc  4313 32800 560719
   newlen=4309 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16050,7 +16050,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 548431
  +--Malloc  8200 32800 560719
   ---0 Get  4312
   ----Free
   remainder: random@???,
  @@ -16122,7 +16122,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4315 32800 552746
  +--Malloc  4315 32800 565034
   newlen=4311 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16164,7 +16164,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 552746
  +--Malloc  8200 32800 565034
   ---0 Get  4312
   ----Free
   remainder: random@???,
  @@ -16235,7 +16235,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4317 32800 557063
  +--Malloc  4317 32800 569351
   newlen=4313 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16277,7 +16277,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 557063
  +--Malloc  8200 32800 569351
   ---0 Get  4320
   ----Free
   remainder: random@???,
  @@ -16347,7 +16347,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4319 32800 561382
  +--Malloc  4319 32800 573670
   newlen=4315 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16389,7 +16389,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 561382
  +--Malloc  8200 32800 573670
   ---0 Get  4320
   ----Free
   remainder: random@???,
  @@ -16458,7 +16458,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4321 32800 565703
  +--Malloc  4321 32800 577991
   newlen=4317 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16500,7 +16500,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 565703
  +--Malloc  8200 32800 577991
   ---0 Get  4320
   ----Free
   remainder: random@???,
  @@ -16568,7 +16568,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4323 32800 570026
  +--Malloc  4323 32800 582314
   newlen=4319 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16610,7 +16610,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 570026
  +--Malloc  8200 32800 582314
   ---0 Get  4320
   ----Free
   remainder: random@???,
  @@ -16677,7 +16677,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4325 32800 574351
  +--Malloc  4325 32800 586639
   newlen=4321 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16719,7 +16719,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 574351
  +--Malloc  8200 32800 586639
   ---0 Get  4328
   ----Free
   remainder: random@???,
  @@ -16785,7 +16785,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4327 32800 578678
  +--Malloc  4327 32800 590966
   newlen=4323 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16827,7 +16827,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 578678
  +--Malloc  8200 32800 590966
   ---0 Get  4328
   ----Free
   remainder: random@???,
  @@ -16892,7 +16892,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4329 32800 583007
  +--Malloc  4329 32800 595295
   newlen=4325 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -16934,7 +16934,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 583007
  +--Malloc  8200 32800 595295
   ---0 Get  4328
   ----Free
   remainder: random@???,
  @@ -16998,7 +16998,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4331 32800 587338
  +--Malloc  4331 32800 599626
   newlen=4327 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17040,7 +17040,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 587338
  +--Malloc  8200 32800 599626
   ---0 Get  4328
   ----Free
   remainder: random@???,
  @@ -17103,7 +17103,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4333 32800 591671
  +--Malloc  4333 32800 603959
   newlen=4329 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17145,7 +17145,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 591671
  +--Malloc  8200 32800 603959
   ---0 Get  4336
   ----Free
   remainder: random@???,
  @@ -17207,7 +17207,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4335 32800 596006
  +--Malloc  4335 32800 608294
   newlen=4331 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17249,7 +17249,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 596006
  +--Malloc  8200 32800 608294
   ---0 Get  4336
   ----Free
   remainder: random@???,
  @@ -17310,7 +17310,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4337 32800 600343
  +--Malloc  4337 32800 612631
   newlen=4333 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17352,7 +17352,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 600343
  +--Malloc  8200 32800 612631
   ---0 Get  4336
   ----Free
   remainder: random@???,
  @@ -17412,7 +17412,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4339 32800 604682
  +--Malloc  4339 32800 616970
   newlen=4335 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17454,7 +17454,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 604682
  +--Malloc  8200 32800 616970
   ---0 Get  4336
   ----Free
   remainder: random@???,
  @@ -17513,7 +17513,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4341 32800 609023
  +--Malloc  4341 32800 621311
   newlen=4337 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17555,7 +17555,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 609023
  +--Malloc  8200 32800 621311
   ---0 Get  4344
   ----Free
   remainder: random@???,
  @@ -17613,7 +17613,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4343 32800 613366
  +--Malloc  4343 32800 625654
   newlen=4339 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17655,7 +17655,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 613366
  +--Malloc  8200 32800 625654
   ---0 Get  4344
   ----Free
   remainder: random@???,
  @@ -17712,7 +17712,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4345 32800 617711
  +--Malloc  4345 32800 629999
   newlen=4341 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17754,7 +17754,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 617711
  +--Malloc  8200 32800 629999
   ---0 Get  4344
   ----Free
   remainder: random@???,
  @@ -17810,7 +17810,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4347 32800 622058
  +--Malloc  4347 32800 634346
   newlen=4343 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17852,7 +17852,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 622058
  +--Malloc  8200 32800 634346
   ---0 Get  4344
   ----Free
   remainder: random@???,
  @@ -17907,7 +17907,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4349 32800 626407
  +--Malloc  4349 32800 638695
   newlen=4345 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -17949,7 +17949,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 626407
  +--Malloc  8200 32800 638695
   ---0 Get  4352
   ----Free
   remainder: random@???,
  @@ -18003,7 +18003,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4351 32800 630758
  +--Malloc  4351 32800 643046
   newlen=4347 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18045,7 +18045,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 630758
  +--Malloc  8200 32800 643046
   ---0 Get  4352
   ----Free
   remainder: random@???,
  @@ -18098,7 +18098,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4353 32800 635111
  +--Malloc  4353 32800 647399
   newlen=4349 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18140,7 +18140,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 635111
  +--Malloc  8200 32800 647399
   ---0 Get  4352
   ----Free
   remainder: random@???,
  @@ -18192,7 +18192,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4355 32800 639466
  +--Malloc  4355 32800 651754
   newlen=4351 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18234,7 +18234,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 639466
  +--Malloc  8200 32800 651754
   ---0 Get  4352
   ----Free
   remainder: random@???,
  @@ -18285,7 +18285,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4357 32800 643823
  +--Malloc  4357 32800 656111
   newlen=4353 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18327,7 +18327,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 643823
  +--Malloc  8200 32800 656111
   ---0 Get  4360
   ----Free
   remainder: random@???,
  @@ -18377,7 +18377,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4359 32800 648182
  +--Malloc  4359 32800 660470
   newlen=4355 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18419,7 +18419,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 648182
  +--Malloc  8200 32800 660470
   ---0 Get  4360
   ----Free
   remainder: random@???,
  @@ -18468,7 +18468,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4361 32800 652543
  +--Malloc  4361 32800 664831
   newlen=4357 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18510,7 +18510,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 652543
  +--Malloc  8200 32800 664831
   ---0 Get  4360
   ----Free
   remainder: random@???,
  @@ -18558,7 +18558,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4363 32800 656906
  +--Malloc  4363 32800 669194
   newlen=4359 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18600,7 +18600,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 656906
  +--Malloc  8200 32800 669194
   ---0 Get  4360
   ----Free
   remainder: random@???,
  @@ -18647,7 +18647,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4365 32800 661271
  +--Malloc  4365 32800 673559
   newlen=4361 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18689,7 +18689,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 661271
  +--Malloc  8200 32800 673559
   ---0 Get  4368
   ----Free
   remainder: random@???,
  @@ -18735,7 +18735,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4367 32800 665638
  +--Malloc  4367 32800 677926
   newlen=4363 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18777,7 +18777,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 665638
  +--Malloc  8200 32800 677926
   ---0 Get  4368
   ----Free
   remainder: random@???,
  @@ -18822,7 +18822,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4369 32800 670007
  +--Malloc  4369 32800 682295
   newlen=4365 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18864,7 +18864,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 670007
  +--Malloc  8200 32800 682295
   ---0 Get  4368
   ----Free
   remainder: random@???,
  @@ -18908,7 +18908,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4371 32800 674378
  +--Malloc  4371 32800 686666
   newlen=4367 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -18950,7 +18950,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 674378
  +--Malloc  8200 32800 686666
   ---0 Get  4368
   ----Free
   remainder: random@???,
  @@ -18993,7 +18993,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4373 32800 678751
  +--Malloc  4373 32800 691039
   newlen=4369 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -19035,7 +19035,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 678751
  +--Malloc  8200 32800 691039
   ---0 Get  4376
   ----Free
   remainder: random@???,
  @@ -19077,7 +19077,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4375 32800 683126
  +--Malloc  4375 32800 695414
   newlen=4371 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -19119,7 +19119,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 683126
  +--Malloc  8200 32800 695414
   ---0 Get  4376
   ----Free
   remainder: random@???
  @@ -19160,7 +19160,7 @@
   ---0 Get    24
   LOG: address_rewrite MAIN
     "random@???" from to: rewritten as "random@???" by rule 1
  ---Malloc  4377 32800 687503
  +--Malloc  4377 32800 699791
   newlen=4373 newtype=T newtext:
   To: random@???,
       random@???,
  @@ -19202,7 +19202,7 @@
   ----Free
   ---0 Rst    ** 24600
   ---0 Get    16
  ---Malloc  8200 32800 687503
  +--Malloc  8200 32800 699791
   ---0 Get  4376
   ----Free
   remainder: 


  Index: 001
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 001    4 Nov 2004 10:42:11 -0000    1.2
  +++ 001    17 Dec 2004 14:52:44 -0000    1.3
  @@ -8,6 +8,7 @@
   acl_smtp_helo = 
   acl_smtp_mail = 
   acl_smtp_mailauth = 
  +acl_smtp_mime = 
   acl_smtp_predata = 
   acl_smtp_quit = 
   acl_smtp_rcpt = 
  @@ -19,6 +20,7 @@
   no_allow_utf8_domains
   auth_advertise_hosts = *
   auto_thaw = 0s
  +av_scanner = sophie:/var/run/sophie
   bi_command = 
   bounce_message_file = 
   bounce_message_text = 
  @@ -161,6 +163,7 @@
   smtp_receive_timeout = 5m
   smtp_reserve_hosts = 
   no_smtp_return_error_details
  +spamd_address = 127.0.0.1 783
   no_split_spool_directory
   spool_directory = /var/spool/exim
   no_strip_excess_angle_brackets


  Index: 002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/002,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 002    4 Nov 2004 10:42:11 -0000    1.2
  +++ 002    17 Dec 2004 14:52:44 -0000    1.3
  @@ -8,6 +8,7 @@
   acl_smtp_helo = check_helo
   acl_smtp_mail = check_mail
   acl_smtp_mailauth = check_mailauth
  +acl_smtp_mime = check_mime
   acl_smtp_predata = check_predata
   acl_smtp_quit = check_quit
   acl_smtp_rcpt = check_recipient
  @@ -19,6 +20,7 @@
   allow_utf8_domains
   auth_advertise_hosts = a.a.h
   auto_thaw = 1d
  +av_scanner = /some/scanner
   bi_command = 
   bounce_message_file = 
   bounce_message_text = 
  @@ -161,6 +163,7 @@
   smtp_receive_timeout = 1m
   smtp_reserve_hosts = 
   smtp_return_error_details
  +spamd_address = 1.2.3.4 123
   no_split_spool_directory
   spool_directory = /source/exim4/AutoTest/spool
   no_strip_excess_angle_brackets


  Index: 205
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/205,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 205    8 Oct 2004 14:50:13 -0000    1.1
  +++ 205    17 Dec 2004 14:52:44 -0000    1.2
  @@ -12,5 +12,6 @@
   ??? 553
   <<< 553 custard@??? is undeliverable
   >>> quit
  ->>> 221
  +??? 221
  +<<< 221 myhost.test.ex closing connection
   End of script