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
ClamAV INSTREAM scanning by default, unless built with WITH_OLD_CLAMAV_STREAM.
[exim.git]
/
src
/
src
/
spam.c
diff --git
a/src/src/spam.c
b/src/src/spam.c
index 7915a433613159b680ec19719a5c897808afc9a8..f2ca92712cf0372141eff8dab21413a678310dec 100644
(file)
--- a/
src/src/spam.c
+++ b/
src/src/spam.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/spam.c,v 1.1
5 2008/01/16 09:52:15 tom
Exp $ */
+/* $Cambridge: exim/src/src/spam.c,v 1.1
8 2010/06/05 11:13:30 pdp
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-80,7
+80,7
@@
int spam(uschar **listptr) {
};
/* make sure the eml mbox file is spooled up */
};
/* make sure the eml mbox file is spooled up */
- mbox_file = spool_mbox(&mbox_size);
+ mbox_file = spool_mbox(&mbox_size
, NULL
);
if (mbox_file == NULL) {
/* error while spooling */
if (mbox_file == NULL) {
/* error while spooling */
@@
-109,7
+109,7
@@
int spam(uschar **listptr) {
int current_server = 0;
int start_server = 0;
uschar *address = NULL;
int current_server = 0;
int start_server = 0;
uschar *address = NULL;
- uschar *spamd_address_list_ptr = spamd_address;
+ uschar *spamd_address_list_ptr = spamd_address
_work
;
uschar address_buffer[256];
spamd_address_container * spamd_address_vector[32];
uschar address_buffer[256];
spamd_address_container * spamd_address_vector[32];
@@
-354,13
+354,10
@@
again:
*q = *p;
q++;
if (*p == '\n') {
*q = *p;
q++;
if (*p == '\n') {
- *q = '\t';
+ /* add an extra space after the newline to ensure
+ that it is treated as a header continuation line */
+ *q = ' ';
q++;
q++;
- /* eat whitespace */
- while( (*p <= ' ') && (*p != '\0') ) {
- p++;
- };
- p--;
};
p++;
};
};
p++;
};