git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save $spam_score, $spam_bar, and $spam_report in spool files, so
[exim.git]
/
src
/
src
/
spool_out.c
diff --git
a/src/src/spool_out.c
b/src/src/spool_out.c
index d64b45de016a4c6ccf2ac6b3ef31c9923f426f6b..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.1
2 2007/01/08 10:50:18 ph10
Exp $ */
+/* $Cambridge: exim/src/src/spool_out.c,v 1.1
5 2008/07/28 18:46:44 fanf2
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-198,6
+198,7
@@
tree_walk(acl_var_m, &acl_var_write, f);
/* Now any other data that needs to be remembered. */
fprintf(f, "-body_linecount %d\n", body_linecount);
/* Now any other data that needs to be remembered. */
fprintf(f, "-body_linecount %d\n", body_linecount);
+fprintf(f, "-max_received_linelength %d\n", max_received_linelength);
if (body_zerocount > 0) fprintf(f, "-body_zerocount %d\n", body_zerocount);
if (body_zerocount > 0) fprintf(f, "-body_zerocount %d\n", body_zerocount);
@@
-218,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 (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");
#endif
if (deliver_manual_thaw) fprintf(f, "-manual_thaw\n");
if (sender_set_untrusted) fprintf(f, "-sender_set_untrusted\n");
@@
-287,7
+291,7
@@
if (fflush(f) != 0 || ferror(f))
just pushes it out of C, and fclose() doesn't guarantee to do the write
either. That's just the way Unix works... */
just pushes it out of C, and fclose() doesn't guarantee to do the write
either. That's just the way Unix works... */
-if (fsync(fileno(f)) < 0)
+if (
EXIM
fsync(fileno(f)) < 0)
return spool_write_error(where, errmsg, US"sync", temp_name, f);
/* Get the size of the file, and close it. */
return spool_write_error(where, errmsg, US"sync", temp_name, f);
/* Get the size of the file, and close it. */
@@
-325,7
+329,7
@@
sprintf(CS temp_name, "%s/input/%s/.", spool_directory, message_subdir);
if ((fd = Uopen(temp_name, O_RDONLY|O_DIRECTORY, 0)) < 0)
return spool_write_error(where, errmsg, US"directory open", name, NULL);
if ((fd = Uopen(temp_name, O_RDONLY|O_DIRECTORY, 0)) < 0)
return spool_write_error(where, errmsg, US"directory open", name, NULL);
-if (fsync(fd) < 0 && errno != EINVAL)
+if (
EXIM
fsync(fd) < 0 && errno != EINVAL)
return spool_write_error(where, errmsg, US"directory sync", name, NULL);
if (close(fd) < 0)
return spool_write_error(where, errmsg, US"directory sync", name, NULL);
if (close(fd) < 0)