Save $spam_score, $spam_bar, and $spam_report in spool files, so

that they are available at delivery time.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9ca31ea08df5dae9100f221eaf31499997683814..347796353d6855ca66cf9b02e62616d84f08c028 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.549 2008/07/18 17:55:42 fanf2 Exp $
+$Cambridge: 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 @@ NM/05 Bugzilla 598: Improvedment to Dovecot authenticator handling.
 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
 -----------------

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index a13d9d4cfd5ca5aeb48046c0ad7f6cd35a4cd76b..4773dc002f9244874cfdc9c9ba296f27d5877d2e 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spool_in.c,v 1.21 2007/09/28 12:21:57 tom Exp $ */
+/* $Cambridge: 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 @@ for (;;)
     #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;
 

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index b2119f8349cd7ad35d8a557b10e094c1236ad85d..7bb4f8594e700ec3fc8c316383a11c94bf30da8a 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spool_out.c,v 1.14 2007/06/22 14:38:58 ph10 Exp $ */
+/* $Cambridge: 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_error_message) fprintf(f, "-localerror\n");
 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");