summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-22 10:08:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-22 10:08:10 +0200
commit162c9e91e970cc9475bc86ffd00fd1d939e1e487 (patch)
tree758b108b20eb989d72b0f849c534b6f6af2035b6
parentdf35bb49f56dacb0d26b2e3add694e3790a6a7ea (diff)
downloadrsyslog-3.21.6.zip
rsyslog-3.21.6.tar.gz
rsyslog-3.21.6.tar.xz
preparing for 3.21.6v3.21.6
plus solving a compile problem for im3195 (which is not used in practice, thus this did not show up before...)
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--plugins/im3195/im3195.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 97acfd4..c4a668b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
---------------------------------------------------------------------------
-Version 3.21.6 [DEVEL] (rgerhards), 2008-10-??
+Version 3.21.6 [DEVEL] (rgerhards), 2008-10-22
- consolidated time calls during msg object creation, improves performance
and consistency
+- bugfix: solved a segfault condition
- bugfix: subsecond time properties generated by imfile, imklog and
internal messages could be slightly inconsistent
- added capability to support multiple module search pathes. Thank
to Marius Tomaschewski for providing the patch.
+- bugfix: im3195 did no longer compile
---------------------------------------------------------------------------
Version 3.21.5 [DEVEL] (rgerhards), 2008-09-30
- performance optimization: unnecessary time() calls during message
diff --git a/configure.ac b/configure.ac
index 4d74c95..69744c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.21.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.21.6],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/manual.html b/doc/manual.html
index a2f34a8..884c43c 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.21.5 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.21.6 (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/im3195/im3195.c b/plugins/im3195/im3195.c
index 32dd8dc..1c2502f 100644
--- a/plugins/im3195/im3195.c
+++ b/plugins/im3195/im3195.c
@@ -83,7 +83,7 @@ void OnReceive(srAPIObj __attribute__((unused)) *pMyAPI, srSLMGObj* pSLMG)
srSLMGGetRawMSG(pSLMG, &pszRawMsg);
parseAndSubmitMessage(fromHost, fromHostIP, pszRawMsg, strlen((char*)pszRawMsg),
- MSG_PARSE_HOSTNAME, NOFLAG, eFLOWCTL_FULL_DELAY);
+ MSG_PARSE_HOSTNAME, NOFLAG, eFLOWCTL_FULL_DELAY, (uchar*)"im3195");
}