projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default notifier socket name to spooldir-dependent path even for abstract names
[exim.git]
/
src
/
src
/
spam.c
diff --git
a/src/src/spam.c
b/src/src/spam.c
index 3ffc514f09cf13432f38beedc442929dfe9c3dcc..6954bee32ada2ee5819f37d93fdec1ae58ce5871 100644
(file)
--- a/
src/src/spam.c
+++ b/
src/src/spam.c
@@
-293,7
+293,7
@@
start = time(NULL);
uschar * s;
DEBUG(D_acl) debug_printf_indent("spamd: addr entry '%s'\n", address);
uschar * s;
DEBUG(D_acl) debug_printf_indent("spamd: addr entry '%s'\n", address);
- sd =
(spamd_address_container *)store_get(sizeof(spamd_address_container)
);
+ sd =
store_get(sizeof(spamd_address_container), FALSE
);
for (sublist = address, args = 0, spamd_param_init(sd);
(s = string_nextinlist(&sublist, &sublist_sep, NULL, 0));
for (sublist = address, args = 0, spamd_param_init(sd);
(s = string_nextinlist(&sublist, &sublist_sep, NULL, 0));
@@
-344,7
+344,7
@@
start = time(NULL);
for (;;)
{
/*XXX could potentially use TFO early-data here */
for (;;)
{
/*XXX could potentially use TFO early-data here */
- if ( (spamd_cctx.sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
+ if ( (spamd_cctx.sock = ip_streamsocket(sd->hostspec, &errstr, 5
, NULL
)) >= 0
|| sd->retry <= 0
)
break;
|| sd->retry <= 0
)
break;
@@
-503,7
+503,7
@@
offset = 0;
while ((i = ip_recv(&spamd_cctx,
spamd_buffer + offset,
sizeof(spamd_buffer) - offset - 1,
while ((i = ip_recv(&spamd_cctx,
spamd_buffer + offset,
sizeof(spamd_buffer) - offset - 1,
- sd->timeout
- time(NULL)
+ start)) > 0)
+ sd->timeout + start)) > 0)
offset += i;
spamd_buffer[offset] = '\0'; /* guard byte */
offset += i;
spamd_buffer[offset] = '\0'; /* guard byte */
@@
-565,7
+565,7
@@
else
}
Ustrcpy(spam_action_buffer,
}
Ustrcpy(spam_action_buffer,
- spamd_score >= spamd_threshold ?
"reject" :
"no action");
+ spamd_score >= spamd_threshold ?
US"reject" : US
"no action");
}
/* Create report. Since this is a multiline string,
}
/* Create report. Since this is a multiline string,