diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | doc/manual.html | 2 | ||||
-rw-r--r-- | plugins/imklog/ksym.c | 3 | ||||
-rw-r--r-- | plugins/imklog/ksym_mod.c | 1 | ||||
-rw-r--r-- | plugins/imklog/linux.c | 4 | ||||
-rw-r--r-- | runtime/cfsysline.c | 4 | ||||
-rw-r--r-- | runtime/ctok.c | 2 | ||||
-rw-r--r-- | runtime/linkedlist.c | 2 | ||||
-rw-r--r-- | runtime/sysvar.c | 2 |
9 files changed, 16 insertions, 10 deletions
@@ -15,6 +15,7 @@ Version 3.19.0 (rgerhards), 2008-04-?? --------------------------------------------------------------------------- Version 3.17.2 (rgerhards), 2008-04-?? - this version is the new beta +- merged in imklog bug fix from v3-stable (3.16.1) --------------------------------------------------------------------------- Version 3.17.1 (rgerhards), 2008-04-15 - removed dependency on MAXHOSTNAMELEN as much as it made sense. @@ -67,6 +68,11 @@ Version 3.17.0 (rgerhards), 2008-04-08 Plus a number of bugfixes that were applied to v3-stable and beta branches (not mentioned here in detail). --------------------------------------------------------------------------- +Version 3.16.1 (rgerhards), 2008-05-02 +- fixed a bug in imklog which lead to startup problems (including + segfault) on some platforms under some circumsances. Thanks to + Vieri for reporting this bug and helping to troubleshoot it. +--------------------------------------------------------------------------- Version 3.16.0 (rgerhards), 2008-04-24 - new v3-stable (3.16.x) based on beta 3.15.x (RELP support) - bugfix: omsnmp had a too-small sized buffer for hostname+port. This diff --git a/doc/manual.html b/doc/manual.html index 894a7876..1719ef5e 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also <a href="professional_support.html">professional rsyslog support</a> available directly from the source!</p> -<p><b>This documentation is for version 3.17.1 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 3.17.2 (devel branch) of rsyslog.</b> Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might diff --git a/plugins/imklog/ksym.c b/plugins/imklog/ksym.c index 34ce909e..f636a7bb 100644 --- a/plugins/imklog/ksym.c +++ b/plugins/imklog/ksym.c @@ -202,8 +202,7 @@ extern int InitKsyms(char *mapfile) } - /* - * Read the kernel symbol table file and add entries for each + /* Read the kernel symbol table file and add entries for each * line. I suspect that the use of fscanf is not really in vogue * but it was quick and dirty and IMHO suitable for fixed format * data such as this. If anybody doesn't agree with this please diff --git a/plugins/imklog/ksym_mod.c b/plugins/imklog/ksym_mod.c index bef810b4..6e48e89e 100644 --- a/plugins/imklog/ksym_mod.c +++ b/plugins/imklog/ksym_mod.c @@ -163,7 +163,6 @@ extern int InitMsyms(void) else imklogLogIntMsg(LOG_ERR, "Error loading kernel symbols " \ "- %s\n", strerror(errno)); - fclose(ksyms); return(0); } diff --git a/plugins/imklog/linux.c b/plugins/imklog/linux.c index 8e4d3388..853c8b2c 100644 --- a/plugins/imklog/linux.c +++ b/plugins/imklog/linux.c @@ -229,8 +229,8 @@ static void LogLine(char *ptr, int len) */ *line = 0; /* force null terminator */ - dbgprintf("Line buffer full:\n"); - dbgprintf("\tLine: %s\n", line); + //dbgprintf("Line buffer full:\n"); + //dbgprintf("\tLine: %s\n", line); Syslog(LOG_INFO, line_buff); line = line_buff; diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 2124f11e..0043ce5c 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -3,7 +3,9 @@ * * File begun on 2007-07-30 by RGerhards * - * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/ctok.c b/runtime/ctok.c index 2a92e285..de2bd8a8 100644 --- a/runtime/ctok.c +++ b/runtime/ctok.c @@ -8,7 +8,7 @@ * * Module begun 2008-02-19 by Rainer Gerhards * - * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/linkedlist.c b/runtime/linkedlist.c index ce20651e..8f842e43 100644 --- a/runtime/linkedlist.c +++ b/runtime/linkedlist.c @@ -11,7 +11,7 @@ * * File begun on 2007-07-31 by RGerhards * - * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/sysvar.c b/runtime/sysvar.c index d59f2623..5eec8f67 100644 --- a/runtime/sysvar.c +++ b/runtime/sysvar.c @@ -5,7 +5,7 @@ * * Module begun 2008-02-25 by Rainer Gerhards * - * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * |