]>
Commit | Line | Data |
---|---|---|
24c24f89 AM |
1 | diff -urbB exim-4.54.org/src/globals.c exim-4.54/src/globals.c |
2 | --- exim-4.54.org/src/globals.c 2005-11-25 22:02:44.762799750 +0100 | |
3 | +++ exim-4.54/src/globals.c 2005-11-25 21:54:06.210392250 +0100 | |
4 | @@ -1058,6 +1058,7 @@ | |
5 | ||
6 | #ifdef WITH_CONTENT_SCAN | |
7 | uschar *spamd_address = US"127.0.0.1 783"; | |
8 | +BOOL spamd_loadbalance = TRUE; | |
9 | uschar *spam_bar = NULL; | |
10 | uschar *spam_report = NULL; | |
11 | uschar *spam_score = NULL; | |
12 | diff -urbB exim-4.54.org/src/globals.h exim-4.54/src/globals.h | |
13 | --- exim-4.54.org/src/globals.h 2005-11-25 22:02:44.762799750 +0100 | |
14 | +++ exim-4.54/src/globals.h 2005-11-25 21:54:37.700360250 +0100 | |
15 | @@ -656,6 +656,7 @@ | |
16 | ||
17 | #ifdef WITH_CONTENT_SCAN | |
18 | extern uschar *spamd_address; /* address for the spamassassin daemon */ | |
19 | +extern BOOL spamd_loadbalance; /* load balance or try in order from config */ | |
20 | extern uschar *spam_bar; /* the spam "bar" (textual representation of spam_score) */ | |
21 | extern uschar *spam_report; /* the spamd report (multiline) */ | |
22 | extern uschar *spam_score; /* the spam score (float) */ | |
23 | diff -urbB exim-4.54.org/src/readconf.c exim-4.54/src/readconf.c | |
24 | --- exim-4.54.org/src/readconf.c 2005-11-25 22:02:44.762799750 +0100 | |
25 | +++ exim-4.54/src/readconf.c 2005-11-25 21:55:01.061820250 +0100 | |
26 | @@ -339,6 +339,7 @@ | |
27 | { "smtp_return_error_details",opt_bool, &smtp_return_error_details }, | |
28 | #ifdef WITH_CONTENT_SCAN | |
29 | { "spamd_address", opt_stringptr, &spamd_address }, | |
30 | + { "spamd_loadbalance", opt_bool, &spamd_loadbalance }, | |
31 | #endif | |
32 | { "split_spool_directory", opt_bool, &split_spool_directory }, | |
33 | { "spool_directory", opt_stringptr, &spool_directory }, | |
34 | diff -urbB exim-4.54.org/src/spam.c exim-4.54/src/spam.c | |
35 | --- exim-4.54.org/src/spam.c 2005-10-04 10:55:28.000000000 +0200 | |
36 | +++ exim-4.54/src/spam.c 2005-11-25 22:01:46.839179750 +0100 | |
37 | @@ -127,7 +127,10 @@ | |
38 | return DEFER; | |
39 | }; | |
40 | ||
41 | + if (spamd_loadbalance) | |
42 | current_server = start_server = (int)now % num_servers; | |
43 | + else | |
44 | + current_server = start_server = 0; | |
45 | ||
46 | while (1) { | |
47 |