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) ...@@ -461,6 +461,7 @@ _log_ctl (struct _mu_stream *str, int code, int opcode, void *arg)
461 break; 461 break;
462 462
463 case MU_IOCTL_FILTER: 463 case MU_IOCTL_FILTER:
464 case MU_IOCTL_SYSLOGSTREAM:
464 return mu_stream_ioctl (sp->transport, code, opcode, arg); 465 return mu_stream_ioctl (sp->transport, code, opcode, arg);
465 466
466 default: 467 default:
......
...@@ -199,6 +199,7 @@ pop_source () ...@@ -199,6 +199,7 @@ pop_source ()
199 return 1; 199 return 1;
200 } 200 }
201 /* Restore previous context */ 201 /* Restore previous context */
202 input_stream = context_stack->input;
202 mu_sieve_locus = context_stack->locus; 203 mu_sieve_locus = context_stack->locus;
203 mu_sieve_locus.mu_line++; /* #include rule did not increment it */ 204 mu_sieve_locus.mu_line++; /* #include rule did not increment it */
204 sieve_source_inode = context_stack->i_node; 205 sieve_source_inode = context_stack->i_node;
......