<html><head><meta http-equiv=Content-Type content="text/html; charset=iso-8859-15"><META name="Author" content="Novell GroupWise WebAccess"></head><body style='font-family: Tahoma, sans-serif; font-size: 13px; '>Hi,<br><br>since the large NVTable patch has been re-applied (1c3a37764d), this patch should be committed soon, as syslog-ng currently still crashes when a mark is logged.<br><br> Peter<br><br><br><br/><div style='clear: both;'>Dipl.-Inf. Peter Eisenlohr<br>Geschäftsbereich Logistik<br>INFORM GmbH, Pascalstr. 23, 52076 Aachen, Germany<br>Telefon: (+49) 2408 9456-6000<br>E-Mail: peter.eisenlohr@inform-software.com, Web: http://www.inform-software.com<br>INFORM Institut fur Operations Research und Management GmbH<br>Registered AmtsG Aachen HRB1144 Gfhr. Adrian Weiler</div><br/>>>> Gergely Nagy <algernon@balabit.hu> 06.04.12 11.36 Uhr >>><br>The parent of AFInterSourceDriver should be LogSrcDriver, because<br>that's the struct we pass down to it anyway, and other parts of the<br>code will cast it back to LogSrcDriver, too.<br><br>But if its parent is LogDriver, as it was, we were corrupting the<br>later parts of the original LogSrcDriver, with values from<br>AFInterSourceDriver.<br><br>Many thanks to Peter Eisenlohr <peter.eisenlohr@inform-software.com><br>for initial debugging, and for pinpointing mark messages as the<br>triggers.<br><br>Reported-by: Peter Czanik <czanik@balabit.hu><br>Signed-off-by: Gergely Nagy <algernon@balabit.hu><br>---<br> lib/afinter.c | 10 +++++-----<br> lib/afinter.h | 2 +-<br> 2 files changed, 6 insertions(+), 6 deletions(-)<br><br>diff --git a/lib/afinter.c b/lib/afinter.c<br>index 23b1c82..b9d0ddf 100644<br>--- a/lib/afinter.c<br>+++ b/lib/afinter.c<br>@@ -304,7 +304,7 @@ afinter_source_new(AFInterSourceDriver *owner, LogSourceOptions *options)<br> AFInterSource *self = g_new0(AFInterSource, 1);<br> <br> log_source_init_instance(&self->super);<br>- log_source_set_options(&self->super, options, 0, SCS_INTERNAL, owner->super.id, NULL, FALSE);<br>+ log_source_set_options(&self->super.super, options, 0, SCS_INTERNAL, owner->super.super.id, NULL, FALSE);<br> afinter_source_init_watches(self);<br> self->super.super.init = afinter_source_init;<br> self->super.super.deinit = afinter_source_deinit;<br>@@ -328,7 +328,7 @@ afinter_sd_init(LogPipe *s)<br> return FALSE;<br> }<br> <br>- log_source_options_init(&self->source_options, cfg, self->super.group);<br>+ log_source_options_init(&self->source_options, cfg, self->super.super.group);<br> self->source = afinter_source_new(self, &self->source_options);<br> log_pipe_append(&self->source->super, s);<br> log_pipe_init(&self->source->super, cfg);<br>@@ -370,9 +370,9 @@ afinter_sd_new(void)<br> AFInterSourceDriver *self = g_new0(AFInterSourceDriver, 1);<br> <br> log_src_driver_init_instance((LogSrcDriver *)&self->super);<br>- self->super.super.init = afinter_sd_init;<br>- self->super.super.deinit = afinter_sd_deinit;<br>- self->super.super.free_fn = afinter_sd_free;<br>+ self->super.super.super.init = afinter_sd_init;<br>+ self->super.super.super.deinit = afinter_sd_deinit;<br>+ self->super.super.super.free_fn = afinter_sd_free;<br> log_source_options_defaults(&self->source_options);<br> return (LogDriver *)&self->super.super;<br> }<br>diff --git a/lib/afinter.h b/lib/afinter.h<br>index 108475f..1cd9d78 100644<br>--- a/lib/afinter.h<br>+++ b/lib/afinter.h<br>@@ -33,7 +33,7 @@<br> */<br> typedef struct _AFInterSourceDriver<br> {<br>- LogDriver super;<br>+ LogSrcDriver super;<br> LogSource *source;<br> LogSourceOptions source_options;<br> } AFInterSourceDriver;<br>-- <br>1.7.9.1<br><br><br>______________________________________________________________________________<br>Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng<br>Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng<br>FAQ: http://www.balabit.com/wiki/syslog-ng-faq<br><br></body></html>