Commit fe6c328b fe6c328bb2819bd3144b1f2aef3e975923037f65 by Sergey Poznyakoff

Fix sieve logging in maidag

* maidag/maidag.c (sieve_debug_flags)
(sieve_enable_log): Remove.
* maidag/script.c (apply_script): Check for mu_script_sieve_log.
1 parent d569c130
......@@ -47,8 +47,6 @@ int forward_file_checks = FORWARD_FILE_PERM_CHECK;
/* Debuggig options */
int debug_level; /* General debugging level */
int sieve_debug_flags; /* Sieve debugging flags */
int sieve_enable_log; /* Enables logging of executed Sieve actions */
char *message_id_header; /* Use the value of this header as message
identifier when logging Sieve actions */
......@@ -524,7 +522,7 @@ main (int argc, char *argv[])
/* Default locker settings */
mu_locker_set_default_flags (MU_LOCKER_PID|MU_LOCKER_RETRY,
mu_locker_assign);
mu_locker_assign);
mu_locker_set_default_retry_timeout (1);
mu_locker_set_default_retry_count (300);
......
......@@ -87,7 +87,7 @@ apply_script (void *item, void *data)
progfile, mu_strerror (rc));
else
{
if (sieve_enable_log)
if (mu_script_sieve_log)
mu_script_log_enable (scr->scr, sd, clos->auth->name,
message_id_header);
rc = mu_script_process_msg (scr->scr, sd, clos->msg);
......