summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTony Finch <dot@dot.at>2008-07-28 18:46:44 +0000
committerTony Finch <dot@dot.at>2008-07-28 18:46:44 +0000
commita99de90cf119e8d5cafe4ffc0dfb797c7c7872ef (patch)
treee5ee90ca66900558fc86f1ff66c14ccd18d82178 /src
parent0d215e65b5d79a36827e9d0ca57232cad8004d4d (diff)
Save $spam_score, $spam_bar, and $spam_report in spool files, so
that they are available at delivery time.
Diffstat (limited to 'src')
-rw-r--r--src/src/spool_in.c8
-rw-r--r--src/src/spool_out.c5
2 files changed, 11 insertions, 2 deletions
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index a13d9d4cf..4773dc002 100644
--- 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 b2119f834..7bb4f8594 100644
--- 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");