Commit 886bca9c 886bca9c5e36d89b65fe6a28d9eb34f987f913f9 by Sergey Poznyakoff

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.
1 parent d00dbd16
......@@ -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:
......
......@@ -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;
......