fanf2 2009/01/20 16:09:20 GMT
Modified files:
exim-src/src spool_in.c spool_out.c
Log:
Revert stupid screwed-up attempt to store more spam variables in spool files.
Revision Changes Path
1.23 +0 -6 exim/exim-src/src/spool_in.c
1.16 +0 -3 exim/exim-src/src/spool_out.c
Index: spool_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- spool_in.c 28 Jul 2008 18:46:44 -0000 1.22
+++ spool_in.c 20 Jan 2009 16:09:20 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.22 2008/07/28 18:46:44 fanf2 Exp $ */
+/* $Cambridge: exim/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 @@
#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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- spool_out.c 28 Jul 2008 18:46:44 -0000 1.15
+++ spool_out.c 20 Jan 2009 16:09:20 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.15 2008/07/28 18:46:44 fanf2 Exp $ */
+/* $Cambridge: exim/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_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");
