[SCM] GNU Mailutils branch, master, updated. release-3.1.1-59-gfe6c328

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=fe6c328bb2819bd3144b1f2aef3e975923037f65

The branch, master has been updated
       via  fe6c328bb2819bd3144b1f2aef3e975923037f65 (commit)
      from  d569c130f2cee770ab0aba6ee2a65382967b324e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe6c328bb2819bd3144b1f2aef3e975923037f65
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Jan 30 11:12:19 2017 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 maidag/maidag.c |    4 +---
 maidag/script.c |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/maidag/maidag.c b/maidag/maidag.c
index e28854c..a7ac1fa 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -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);
 
diff --git a/maidag/script.c b/maidag/script.c
index f66370b..e65a9b6 100644
--- a/maidag/script.c
+++ b/maidag/script.c
@@ -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);


hooks/post-receive
-- 
GNU Mailutils