Merge branch 'v3-stable' into beta

Conflicts:

	configure.ac
	doc/manual.html

7 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c376f383..c69357ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,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/cfsysline.c b/cfsysline.c
index 1fd03a46..1aebc354 100644
--- a/cfsysline.c
+++ b/cfsysline.c
@@ -3,6 +3,8 @@
  *
  * File begun on 2007-07-30 by RGerhards
  *
+ * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH.
+ *
  * This file is part of rsyslog.
  *
  * Rsyslog is free software: you can redistribute it and/or modify
diff --git a/ctok.c b/ctok.c
index 98d5b63b..de2bd8a8 100644
--- a/ctok.c
+++ b/ctok.c
@@ -8,6 +8,8 @@
  *
  * Module begun 2008-02-19 by Rainer Gerhards
  *
+ * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH.
+ *
  * This file is part of the rsyslog runtime library.
  *
  * The rsyslog runtime library is free software: you can redistribute it and/or modify
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/linkedlist.c b/linkedlist.c
index 9adf40c4..383cf488 100644
--- a/linkedlist.c
+++ b/linkedlist.c
@@ -11,6 +11,8 @@
  *
  * File begun on 2007-07-31 by RGerhards
  *
+ * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH.
+ *
  * This file is part of rsyslog.
  *
  * Rsyslog is free software: you can redistribute it and/or modify
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/sysvar.c b/sysvar.c
index 14e32b96..5eec8f67 100644
--- a/sysvar.c
+++ b/sysvar.c
@@ -5,6 +5,8 @@
  *
  * Module begun 2008-02-25 by Rainer Gerhards
  *
+ * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH.
+ *
  * This file is part of the rsyslog runtime library.
  *
  * The rsyslog runtime library is free software: you can redistribute it and/or modify