summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTony Finch <dot@dot.at>2009-01-20 16:09:20 +0000
committerTony Finch <dot@dot.at>2009-01-20 16:09:20 +0000
commit5ff854611127e1bd9b8ba4b61935f1550e96db38 (patch)
treef6d3f826bf78a8084944d647748063d6fa35789c /src
parent5c3a378fcb71aaf98785a642e9b46489232eeb79 (diff)
Revert stupid screwed-up attempt to store more spam variables in spool files.
Diffstat (limited to 'src')
-rw-r--r--src/src/spool_in.c8
-rw-r--r--src/src/spool_out.c5
2 files changed, 2 insertions, 11 deletions
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 4773dc002..311d1833c 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.22 2008/07/28 18:46:44 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/spool_in.c,v 1.23 2009/01/20 16:09:20 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -542,12 +542,6 @@ 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 7bb4f8594..e0ead072a 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.15 2008/07/28 18:46:44 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/spool_out.c,v 1.16 2009/01/20 16:09:20 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -219,9 +219,6 @@ 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");