[SCM] GNU Mailutils branch, master, updated. release-2.2-313-g886bca9

[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=886bca9c5e36d89b65fe6a28d9eb34f987f913f9

The branch, master has been updated
       via  886bca9c5e36d89b65fe6a28d9eb34f987f913f9 (commit)
      from  d00dbd163287bbc53bef4f764dc91b2a9f3bfe44 (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 886bca9c5e36d89b65fe6a28d9eb34f987f913f9
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Dec 23 02:16:37 2010 +0200

    Bugfixes.
    
    * libmailutils/stream/logstream.c (_log_ctl): Handle MU_IOCTL_SYSLOGSTREAM,
    pass it to the transport stream.
    * libmu_sieve/sieve.l (pop_source): Restore input_stream.
    * libmu_sieve/util.c (mu_sieve_error, mu_sieve_debug)
    (mu_sieve_log_action): Set location information on the errstream.

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

Summary of changes:
 libmailutils/stream/logstream.c |    1 +
 libmu_sieve/sieve.l             |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libmailutils/stream/logstream.c b/libmailutils/stream/logstream.c
index 5029793..8733df7 100644
--- a/libmailutils/stream/logstream.c
+++ b/libmailutils/stream/logstream.c
@@ -461,6 +461,7 @@ _log_ctl (struct _mu_stream *str, int code, int opcode, 
void *arg)
       break;
 
     case MU_IOCTL_FILTER:
+    case MU_IOCTL_SYSLOGSTREAM:
       return mu_stream_ioctl (sp->transport, code, opcode, arg);
             
     default:
diff --git a/libmu_sieve/sieve.l b/libmu_sieve/sieve.l
index ff0dea6..a722403 100644
--- a/libmu_sieve/sieve.l
+++ b/libmu_sieve/sieve.l
@@ -199,6 +199,7 @@ pop_source ()
       return 1;
     }
   /* Restore previous context */
+  input_stream = context_stack->input;
   mu_sieve_locus = context_stack->locus;
   mu_sieve_locus.mu_line++; /* #include rule did not increment it */
   sieve_source_inode = context_stack->i_node;


hooks/post-receive
-- 
GNU Mailutils