From 366cf57abdb1a9fec6f5dc3563e2243d1a883a1a Mon Sep 17 00:00:00 2001
From: Michael Biebl
Date: Sun, 12 Feb 2012 11:22:00 +0100
Subject: Imported Upstream version 5.8.7
---
ChangeLog | 27 ++++++++++++++++++++++++++-
action.c | 2 +-
action.h | 32 ++++++++++++++++----------------
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/imfile.html | 4 +++-
doc/imgssapi.html | 5 ++---
doc/manual.html | 2 +-
doc/rsyslog_conf_modules.html | 1 +
outchannel.c | 30 ++++++++++++++----------------
outchannel.h | 30 ++++++++++++++----------------
parse.c | 30 ++++++++++++++----------------
parse.h | 29 ++++++++++++++---------------
plugins/im3195/im3195.c | 29 ++++++++++++++---------------
plugins/imdiag/imdiag.c | 29 ++++++++++++++---------------
plugins/imfile/imfile.c | 29 ++++++++++++++---------------
plugins/immark/immark.c | 29 ++++++++++++++---------------
plugins/immark/immark.h | 29 ++++++++++++++---------------
plugins/impstats/impstats.c | 38 ++++++++++++++------------------------
plugins/imptcp/imptcp.c | 33 ++++++++++++++++-----------------
plugins/imrelp/imrelp.c | 29 ++++++++++++++---------------
plugins/imtcp/imtcp.c | 32 ++++++++++++++++----------------
plugins/imuxsock/imuxsock.c | 7 +++++--
plugins/omgssapi/omgssapi.c | 4 +---
plugins/omlibdbi/omlibdbi.c | 29 ++++++++++++++---------------
plugins/ommail/ommail.c | 29 ++++++++++++++---------------
plugins/omprog/omprog.c | 29 ++++++++++++++---------------
plugins/omrelp/omrelp.c | 29 ++++++++++++++---------------
plugins/omsnmp/omsnmp.c | 32 ++++++++++++++------------------
plugins/omsnmp/omsnmp.h | 31 ++++++++++++++-----------------
plugins/omstdout/omstdout.c | 29 ++++++++++++++---------------
plugins/omtesting/omtesting.c | 29 ++++++++++++++---------------
plugins/omuxsock/omuxsock.c | 35 ++++++++++++++---------------------
runtime/atomic.h | 30 ++++++++++++++----------------
runtime/cfsysline.c | 30 ++++++++++++++----------------
runtime/cfsysline.h | 30 ++++++++++++++----------------
runtime/conf.c | 36 ++++++++++++++++--------------------
runtime/conf.h | 29 ++++++++++++++---------------
runtime/ctok.c | 30 ++++++++++++++----------------
runtime/ctok.h | 30 ++++++++++++++----------------
runtime/ctok_token.c | 30 ++++++++++++++----------------
runtime/ctok_token.h | 30 ++++++++++++++----------------
runtime/datetime.c | 30 ++++++++++++++----------------
runtime/datetime.h | 30 ++++++++++++++----------------
runtime/debug.c | 30 ++++++++++++++----------------
runtime/debug.h | 30 ++++++++++++++----------------
runtime/errmsg.c | 33 +++++++++++++++++----------------
runtime/errmsg.h | 30 ++++++++++++++----------------
runtime/expr.c | 30 ++++++++++++++----------------
runtime/expr.h | 30 ++++++++++++++----------------
runtime/linkedlist.c | 30 ++++++++++++++----------------
runtime/linkedlist.h | 30 ++++++++++++++----------------
runtime/module-template.h | 16 ++++++++--------
runtime/msg.c | 10 +++++-----
runtime/nsd.h | 30 ++++++++++++++----------------
runtime/nsd_gtls.c | 10 +++++++---
runtime/nsd_gtls.h | 30 ++++++++++++++----------------
runtime/nsd_ptcp.h | 30 ++++++++++++++----------------
runtime/nsdsel_gtls.c | 30 ++++++++++++++----------------
runtime/nsdsel_gtls.h | 30 ++++++++++++++----------------
runtime/nssel.c | 30 ++++++++++++++----------------
runtime/nssel.h | 30 ++++++++++++++----------------
runtime/obj-types.h | 30 ++++++++++++++----------------
runtime/obj.c | 30 ++++++++++++++----------------
runtime/obj.h | 30 ++++++++++++++----------------
runtime/objomsr.c | 30 ++++++++++++++----------------
runtime/objomsr.h | 30 ++++++++++++++----------------
runtime/parser.h | 29 ++++++++++++++---------------
runtime/prop.c | 30 ++++++++++++++----------------
runtime/prop.h | 30 ++++++++++++++----------------
runtime/regexp.c | 30 ++++++++++++++----------------
runtime/regexp.h | 30 ++++++++++++++----------------
runtime/rule.c | 30 ++++++++++++++----------------
runtime/rule.h | 30 ++++++++++++++----------------
runtime/ruleset.h | 30 ++++++++++++++----------------
runtime/srUtils.h | 30 ++++++++++++++----------------
runtime/srutils.c | 2 ++
runtime/statsobj.c | 2 ++
runtime/stringbuf.c | 30 ++++++++++++++----------------
runtime/stringbuf.h | 31 ++++++++++++++-----------------
runtime/strms_sess.c | 30 ++++++++++++++----------------
runtime/strms_sess.h | 30 ++++++++++++++----------------
runtime/strmsrv.c | 30 ++++++++++++++----------------
runtime/strmsrv.h | 30 ++++++++++++++----------------
runtime/sync.c | 30 ++++++++++++++----------------
runtime/sync.h | 30 ++++++++++++++----------------
runtime/syslogd-types.h | 30 ++++++++++++++----------------
runtime/sysvar.c | 30 ++++++++++++++----------------
runtime/sysvar.h | 2 +-
runtime/unicode-helper.h | 30 ++++++++++++++----------------
runtime/var.h | 30 ++++++++++++++----------------
runtime/vm.h | 30 ++++++++++++++----------------
runtime/vmop.c | 30 ++++++++++++++----------------
runtime/vmop.h | 30 ++++++++++++++----------------
runtime/vmprg.c | 30 ++++++++++++++----------------
runtime/vmprg.h | 30 ++++++++++++++----------------
runtime/vmstk.c | 30 ++++++++++++++----------------
runtime/vmstk.h | 30 ++++++++++++++----------------
runtime/wti.c | 30 ++++++++++++++----------------
runtime/wti.h | 30 ++++++++++++++----------------
runtime/wtp.h | 30 ++++++++++++++----------------
runtime/zlibw.c | 30 ++++++++++++++----------------
runtime/zlibw.h | 30 ++++++++++++++----------------
tcpclt.c | 29 ++++++++++++++---------------
tcpclt.h | 29 ++++++++++++++---------------
tcps_sess.c | 32 ++++++++++++++++----------------
tcps_sess.h | 29 ++++++++++++++---------------
tcpsrv.c | 35 +++++++++++++++++++----------------
tcpsrv.h | 29 ++++++++++++++---------------
threads.c | 29 ++++++++++++++---------------
threads.h | 29 ++++++++++++++---------------
tools/omdiscard.c | 29 ++++++++++++++---------------
tools/omdiscard.h | 32 +++++++++++++++-----------------
tools/omfile.c | 32 ++++++++++++++++----------------
tools/omfile.h | 31 +++++++++++++++----------------
tools/omfwd.h | 31 +++++++++++++++----------------
tools/ompipe.c | 29 ++++++++++++++---------------
tools/ompipe.h | 29 ++++++++++++++---------------
tools/omshell.c | 29 ++++++++++++++---------------
tools/omshell.h | 29 ++++++++++++++---------------
tools/omusrmsg.c | 36 ++++++++++++++++--------------------
tools/omusrmsg.h | 34 ++++++++++++++++------------------
tools/rsyslog.conf.5 | 2 +-
tools/syslogd.c | 22 +++++++++++++++++++++-
tools/syslogd.h | 29 ++++++++++++++---------------
125 files changed, 1623 insertions(+), 1756 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 67d793f..4570977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
---------------------------------------------------------------------------
+Version 5.8.7 [V5-stable] 2012-01-17
+- bugfix: instabilities when using RFC5424 header fields
+ Thanks to Kaiwang Chen for the patch
+- bugfix: imuxsock did truncate part of received message if it did not
+ contain a proper date. The truncation occured because we removed that
+ part of the messages that was expected to be the date.
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
+- bugfix: potential abort after reading invalid X.509 certificate
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
+ Thanks to Tomas Heinrich for the patch
+- bugfix: stats counter were not properly initialized on creation
+- FQDN hostname for multihomed host was not always set to the correct name
+ if multiple aliases existed. Thanks to Tomas Heinreich for the patch.
+---------------------------------------------------------------------------
Version 5.8.6 [V5-stable] 2011-10-21
- bugfix: missing whitespace after property-based filter was not detected
- bugfix: $OMFileFlushInterval period was doubled - now using correct value
@@ -839,12 +853,20 @@ increase.
- increased ompgsql performance by adapting to new transactional
output module interface
---------------------------------------------------------------------------
-Version 4.8.1 [v4-beta], 2011-09-??
+Version 4.8.1 [v4-stable], 2011-09-??
- bugfix: $ActionExecOnlyOnce interval did not work properly
Thanks to Tomas Heinrich for the patch
- bugfix: potential abort if ultra-large file io buffers are used and
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
+- bugfix: potential abort after reading invalid X.509 certificate
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
+ Thanks to Tomas Heinrich for the patch.
+- bugfix: potential fatal abort in omgssapi
+ Thanks to Tomas Heinrich for the patch.
+- added doc for omprog
+- FQDN hostname for multihomed host was not always set to the correct name
+ if multiple aliases existed. Thanks to Tomas Heinreich for the patch.
---------------------------------------------------------------------------
Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07
***************************************************************************
@@ -1634,6 +1656,9 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- bugfix: action resume interval incorrectly handled, thus took longer to
+ resume
+- bugfix: cosmetic: proper constant used instead of number in open call
- bugfix: timestamp was incorrectly calculated for timezones with minute
offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
diff --git a/action.c b/action.c
index 0d31d21..278625c 100644
--- a/action.c
+++ b/action.c
@@ -627,7 +627,7 @@ static rsRetVal actionTryResume(action_t *pThis, int *pbShutdownImmediate)
* here. -- rgerhards, 2009-03-18
*/
datetime.GetTime(&ttNow); /* cache "now" */
- if(ttNow > pThis->ttResumeRtry) {
+ if(ttNow >= pThis->ttResumeRtry) {
actionSetState(pThis, ACT_STATE_RTRY); /* back to retries */
}
}
diff --git a/action.h b/action.h
index bae64d3..0c08d3d 100644
--- a/action.h
+++ b/action.h
@@ -1,26 +1,26 @@
/* action.h
* Header file for the action object
*
- * File begun on 2007-08-06 by RGerhards (extracted from syslogd.c)
+ * File begun on 2007-08-06 by RGerhards (extracted from syslogd.c, which
+ * was under BSD license at the time of rsyslog fork)
*
- * Copyright 2007 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2012 Adiscon GmbH.
*
* This file is part of rsyslog.
*
- * Rsyslog is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Rsyslog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rsyslog. If not, see .
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * -or-
+ * see COPYING.ASL20 in the source distribution
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#ifndef ACTION_H_INCLUDED
#define ACTION_H_INCLUDED 1
diff --git a/configure b/configure
index 510faea..fc79217 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for rsyslog 5.8.6.
+# Generated by GNU Autoconf 2.66 for rsyslog 5.8.7.
#
# Report bugs to .
#
@@ -562,8 +562,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rsyslog'
PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='5.8.6'
-PACKAGE_STRING='rsyslog 5.8.6'
+PACKAGE_VERSION='5.8.7'
+PACKAGE_STRING='rsyslog 5.8.7'
PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
PACKAGE_URL=''
@@ -1475,7 +1475,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rsyslog 5.8.6 to adapt to many kinds of systems.
+\`configure' configures rsyslog 5.8.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1545,7 +1545,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rsyslog 5.8.6:";;
+ short | recursive ) echo "Configuration of rsyslog 5.8.7:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rsyslog configure 5.8.6
+rsyslog configure 5.8.7
generated by GNU Autoconf 2.66
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2299,7 +2299,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rsyslog $as_me 5.8.6, which was
+It was created by rsyslog $as_me 5.8.7, which was
generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@ -3114,7 +3114,7 @@ fi
# Define the identity of the package.
PACKAGE='rsyslog'
- VERSION='5.8.6'
+ VERSION='5.8.7'
cat >>confdefs.h <<_ACEOF
@@ -17336,7 +17336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rsyslog $as_me 5.8.6, which was
+This file was extended by rsyslog $as_me 5.8.7, which was
generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17402,7 +17402,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rsyslog config.status 5.8.6
+rsyslog config.status 5.8.7
configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 5a77a8a..6fbc84a 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],[5.8.6],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.8.7],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/imfile.html b/doc/imfile.html
index 60726ce..c44171d 100644
--- a/doc/imfile.html
+++ b/doc/imfile.html
@@ -15,7 +15,9 @@ text file is a file consisting of printable characters with lines
being delimited by LF.
The file is read line-by-line and any line read is passed to
rsyslog's rule engine. The rule engine applies filter conditons and
-selects which actions needs to be carried out.
+selects which actions needs to be carried out. Empty lines are not
+processed, as they would result in empty syslog records. They are simply
+ignored.
As new lines are written they are taken from the file and
processed. Please note that this happens based on a polling interval
and not immediately. The file monitor support file rotation. To fully
diff --git a/doc/imgssapi.html b/doc/imgssapi.html
index ec183fe..dd90fec 100644
--- a/doc/imgssapi.html
+++ b/doc/imgssapi.html
@@ -38,7 +38,7 @@ Sets the maximum number of sessions supported
This sets up a GSS server on port 1514 that also permits to
receive plain tcp syslog messages (on the same port):
-