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
Fix client-only use of gsasl authenticator. Bug 2818
[exim.git]
/
src
/
src
/
spam.c
diff --git
a/src/src/spam.c
b/src/src/spam.c
index b0e24b3682095d7f1009334553570dff6ca5d09e..470e5fae7c1e2e67892000d80e5e138b45423d7a 100644
(file)
--- a/
src/src/spam.c
+++ b/
src/src/spam.c
@@
-4,7
+4,7
@@
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 202
0
+ * Copyright (c) The Exim Maintainers 2016 - 202
1
*/
/* Code for calling spamassassin's spamd. Called from acl.c. */
*/
/* Code for calling spamassassin's spamd. Called from acl.c. */
@@
-35,7
+35,7
@@
spamd->is_failed = FALSE;
spamd->weight = SPAMD_WEIGHT;
spamd->timeout = SPAMD_TIMEOUT;
spamd->retry = 0;
spamd->weight = SPAMD_WEIGHT;
spamd->timeout = SPAMD_TIMEOUT;
spamd->retry = 0;
-spamd->priority =
1
;
+spamd->priority =
SPAMD_PRIORITY
;
return 0;
}
return 0;
}
@@
-139,21
+139,11
@@
unsigned int i;
spamd_address_container * sd;
long weights;
unsigned pri;
spamd_address_container * sd;
long weights;
unsigned pri;
-static BOOL srandomed = FALSE;
/* speedup, if we have only 1 server */
if (num_servers == 1)
return (spamds[0]->is_failed ? -1 : 0);
/* speedup, if we have only 1 server */
if (num_servers == 1)
return (spamds[0]->is_failed ? -1 : 0);
-/* init ranmod */
-if (!srandomed)
- {
- struct timeval tv;
- gettimeofday(&tv, NULL);
- srandom((unsigned int)(tv.tv_usec/1000));
- srandomed = TRUE;
- }
-
/* scan for highest pri */
for (pri = 0, i = 0; i < num_servers; i++)
{
/* scan for highest pri */
for (pri = 0, i = 0; i < num_servers; i++)
{
@@
-170,7
+160,7
@@
for (weights = 0, i = 0; i < num_servers; i++)
if (weights == 0) /* all servers failed */
return -1;
if (weights == 0) /* all servers failed */
return -1;
-for (long rnd = random
() % weights
, i = 0; i < num_servers; i++)
+for (long rnd = random
_number(weights)
, i = 0; i < num_servers; i++)
{
sd = spamds[i];
if (!sd->is_failed && sd->priority == pri)
{
sd = spamds[i];
if (!sd->is_failed && sd->priority == pri)