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.
Showing
2 changed files
with
2 additions
and
4 deletions
... | @@ -47,8 +47,6 @@ int forward_file_checks = FORWARD_FILE_PERM_CHECK; | ... | @@ -47,8 +47,6 @@ int forward_file_checks = FORWARD_FILE_PERM_CHECK; |
47 | 47 | ||
48 | /* Debuggig options */ | 48 | /* Debuggig options */ |
49 | int debug_level; /* General debugging level */ | 49 | int debug_level; /* General debugging level */ |
50 | int sieve_debug_flags; /* Sieve debugging flags */ | ||
51 | int sieve_enable_log; /* Enables logging of executed Sieve actions */ | ||
52 | char *message_id_header; /* Use the value of this header as message | 50 | char *message_id_header; /* Use the value of this header as message |
53 | identifier when logging Sieve actions */ | 51 | identifier when logging Sieve actions */ |
54 | 52 | ||
... | @@ -524,7 +522,7 @@ main (int argc, char *argv[]) | ... | @@ -524,7 +522,7 @@ main (int argc, char *argv[]) |
524 | 522 | ||
525 | /* Default locker settings */ | 523 | /* Default locker settings */ |
526 | mu_locker_set_default_flags (MU_LOCKER_PID|MU_LOCKER_RETRY, | 524 | mu_locker_set_default_flags (MU_LOCKER_PID|MU_LOCKER_RETRY, |
527 | mu_locker_assign); | 525 | mu_locker_assign); |
528 | mu_locker_set_default_retry_timeout (1); | 526 | mu_locker_set_default_retry_timeout (1); |
529 | mu_locker_set_default_retry_count (300); | 527 | mu_locker_set_default_retry_count (300); |
530 | 528 | ... | ... |
... | @@ -87,7 +87,7 @@ apply_script (void *item, void *data) | ... | @@ -87,7 +87,7 @@ apply_script (void *item, void *data) |
87 | progfile, mu_strerror (rc)); | 87 | progfile, mu_strerror (rc)); |
88 | else | 88 | else |
89 | { | 89 | { |
90 | if (sieve_enable_log) | 90 | if (mu_script_sieve_log) |
91 | mu_script_log_enable (scr->scr, sd, clos->auth->name, | 91 | mu_script_log_enable (scr->scr, sd, clos->auth->name, |
92 | message_id_header); | 92 | message_id_header); |
93 | rc = mu_script_process_msg (scr->scr, sd, clos->msg); | 93 | rc = mu_script_process_msg (scr->scr, sd, clos->msg); | ... | ... |
-
Please register or sign in to post a comment