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

Top Page
Delete this message
Reply to this message
Author: Tony Finch
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src spool_in.c spool_out.c
fanf2 2008/07/28 19:46:45 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         spool_in.c spool_out.c 
  Log:
  Save $spam_score, $spam_bar, and $spam_report in spool files, so
  that they are available at delivery time.


  Revision  Changes    Path
  1.550     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.22      +6 -0      exim/exim-src/src/spool_in.c
  1.15      +3 -0      exim/exim-src/src/spool_out.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.549
  retrieving revision 1.550
  diff -u -r1.549 -r1.550
  --- ChangeLog    18 Jul 2008 17:55:42 -0000    1.549
  +++ ChangeLog    28 Jul 2008 18:46:44 -0000    1.550
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.549 2008/07/18 17:55:42 fanf2 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.550 2008/07/28 18:46:44 fanf2 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -57,6 +57,9 @@
   TF/05 Leading white space used to be stripped from $spam_report which
         wrecked the formatting. Now it is preserved.


  +TF/06 Save $spam_score, $spam_bar, and $spam_report in spool files, so
  +      that they are available at delivery time.
  +


Exim version 4.69
-----------------

  Index: spool_in.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- spool_in.c    28 Sep 2007 12:21:57 -0000    1.21
  +++ spool_in.c    28 Jul 2008 18:46:44 -0000    1.22
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.21 2007/09/28 12:21:57 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.22 2008/07/28 18:46:44 fanf2 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -542,6 +542,12 @@
       #ifdef WITH_CONTENT_SCAN
       else if (Ustrncmp(p, "pam_score_int ", 14) == 0)
         spam_score_int = string_copy(big_buffer + 16);
  +    else if (Ustrncmp(p, "pam_score ", 10) == 0)
  +      spam_score = string_copy(big_buffer + 12);
  +    else if (Ustrncmp(p, "pam_bar ", 8) == 0)
  +      spam_bar = string_copy(big_buffer + 10);
  +    else if (Ustrncmp(p, "pam_report ", 11) == 0)
  +      spam_report = string_copy(big_buffer + 13);
       #endif
       break;



  Index: spool_out.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spool_out.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- spool_out.c    22 Jun 2007 14:38:58 -0000    1.14
  +++ spool_out.c    28 Jul 2008 18:46:44 -0000    1.15
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.14 2007/06/22 14:38:58 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.15 2008/07/28 18:46:44 fanf2 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -219,6 +219,9 @@
   if (local_scan_data != NULL) fprintf(f, "-local_scan %s\n", local_scan_data);
   #ifdef WITH_CONTENT_SCAN
   if (spam_score_int != NULL) fprintf(f,"-spam_score_int %s\n", spam_score_int);
  +if (spam_score != NULL) fprintf(f,"-spam_score %s\n", spam_score);
  +if (spam_bar != NULL) fprintf(f,"-spam_bar %s\n", spam_bar);
  +if (spam_report != NULL) fprintf(f,"-spam_report %s\n", spam_report);
   #endif
   if (deliver_manual_thaw) fprintf(f, "-manual_thaw\n");
   if (sender_set_untrusted) fprintf(f, "-sender_set_untrusted\n");