Revert stupid screwed-up attempt to store more spam variables in spool files.

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 4773dc002f9244874cfdc9c9ba296f27d5877d2e..311d1833cdc3cacfc092ec5b95969ae68ca219be 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.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 7bb4f8594e700ec3fc8c316383a11c94bf30da8a..e0ead072a512d72397dd4250a98c54ded151549d 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.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");