int spam_rc = 0;
uschar *prev_spamd_address_work = NULL;
+static int timeout_sec;
static const uschar * loglabel = US"spam acl condition:";
+
static int
spamd_param_init(spamd_address_container *spamd)
{
spamd_param(const uschar *param, spamd_address_container *spamd)
{
static int timesinceday = -1;
-uschar buffer[256];
+const uschar * s;
/* check backup parameter */
if (Ustrcmp(param, "backup") == 0)
}
/* check time parameter */
-if (sscanf(param, "time=%s", buffer))
+if (Ustrncmp(param, "time=", 5) == 0)
{
unsigned int start_h = 0, start_m = 0, start_s = 0;
unsigned int end_h = 24, end_m = 0, end_s = 0;
unsigned int time_start, time_end;
- uschar *start_string;
- uschar *end_string;
- uschar *delimiter;
+ const uschar * end_string;
- if ((delimiter = US strchr(CS buffer, '-')))
+ s = param+5;
+ if ((end_string = Ustrchr(s, '-')))
{
- *delimiter = '\0';
- start_string = buffer;
- end_string = delimiter + 1;
- if (sscanf(CS end_string, "%u.%u.%u", &end_h, &end_m, &end_s) == 0 ||
- sscanf(CS start_string, "%u.%u.%u", &start_h, &start_m, &start_s) == 0)
+ end_string++;
+ if ( sscanf(CS end_string, "%u.%u.%u", &end_h, &end_m, &end_s) == 0
+ || sscanf(CS s, "%u.%u.%u", &start_h, &start_m, &start_s) == 0
+ )
{
log_write(0, LOG_MAIN,
- "%s warning - invalid spamd time value: '%s'", loglabel, buffer);
+ "%s warning - invalid spamd time value: '%s'", loglabel, s);
return -1; /* syntax error */
}
}
else
{
log_write(0, LOG_MAIN,
- "%s warning - invalid spamd time value: '%s'", loglabel, buffer);
+ "%s warning - invalid spamd time value: '%s'", loglabel, s);
return -1; /* syntax error */
}
return 0;
}
+if (Ustrncmp(param, "tmo=", 4) == 0)
+ {
+ int sec = readconf_readtime((s = param+4), '\0', FALSE);
+ if (sec < 0)
+ {
+ log_write(0, LOG_MAIN,
+ "%s warning - invalid spamd timeout value: '%s'", loglabel, s);
+ return -1; /* syntax error */
+ }
+ timeout_sec = sec;
+ return 0;
+ }
+
log_write(0, LOG_MAIN, "%s warning - invalid spamd parameter: '%s'",
loglabel, param);
return -1; /* syntax error */
int
-spam(uschar **listptr)
+spam(const uschar **listptr)
{
int sep = 0;
-uschar *list = *listptr;
+const uschar *list = *listptr;
uschar *user_name;
uschar user_name_buffer[128];
unsigned long mbox_size;
(strcmpic(user_name,US"false") == 0) )
return FAIL;
+timeout_sec = SPAMD_TIMEOUT;
+
/* if there is an additional option, check if it is "true" */
if (strcmpic(list,US"true") == 0)
/* in that case, always return true later */
int num_servers = 0;
int current_server;
uschar *address;
- uschar *spamd_address_list_ptr = spamd_address_work;
+ const uschar *spamd_address_list_ptr = spamd_address_work;
spamd_address_container * spamd_address_vector[32];
spamd_address_container * sd;
while ((address = string_nextinlist(&spamd_address_list_ptr, &sep,
NULL, 0)) != NULL)
{
- uschar * sublist;
+ const uschar * sublist;
int sublist_sep = -(int)' '; /* default space-sep */
unsigned args;
uschar * s;
"%s %s on spamd socket", loglabel, strerror(errno));
else
{
- if (time(NULL) - start < SPAMD_TIMEOUT)
+ if (time(NULL) - start < timeout_sec)
goto again;
log_write(0, LOG_MAIN|LOG_PANIC,
"%s timed out writing spamd socket", loglabel);
while ((i = ip_recv(spamd_sock,
spamd_buffer + offset,
sizeof(spamd_buffer) - offset - 1,
- SPAMD_TIMEOUT - time(NULL) + start)) > 0 )
+ timeout_sec - time(NULL) + start)) > 0 )
offset += i;
/* error handling */