From 162c9e91e970cc9475bc86ffd00fd1d939e1e487 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards
Date: Wed, 22 Oct 2008 10:08:10 +0200
Subject: preparing for 3.21.6
plus solving a compile problem for im3195 (which is not used
in practice, thus this did not show up before...)
---
ChangeLog | 4 +++-
configure.ac | 2 +-
doc/manual.html | 2 +-
plugins/im3195/im3195.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 97acfd46..c4a668b9 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 4d74c957..69744c8f 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 a2f34a89..884c43c0 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 professional
rsyslog support available directly from the source!
-This documentation is for version 3.21.5 (devel branch) of rsyslog.
+
This documentation is for version 3.21.6 (devel branch) of rsyslog.
Visit the rsyslog status page to obtain current
version information and project status.
If you like rsyslog, you might
diff --git a/plugins/im3195/im3195.c b/plugins/im3195/im3195.c
index 32dd8dc1..1c2502fe 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");
}
--
cgit