Hello community,
here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2014-10-05 20:32:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rsyslog (Old)
and /work/SRC/openSUSE:Factory/.rsyslog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2014-10-02 14:14:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2014-10-05 20:33:49.000000000 +0200
@@ -1,0 +2,12 @@
+Sat Oct 4 20:08:12 UTC 2014 - andreas.stieger@gmx.de
+
+- rsyslog Version 8.4.2 [v8-stable] 2014-10-02 [bnc#899756]
+ This release primarily contains a correction for the previous fix
+ for the PRI vulnerability which was incomplete.
+ - bugfix: the fix for CVE-2014-3634 did not handle all cases
+ This is corrected now. see also: CVE-2014-3683
+ - fixed a build problem on some platforms
+ - behaviour change: "msg" of messages with invalid PRI set to
+ "rawmsg"
+
+-------------------------------------------------------------------
Old:
----
rsyslog-8.4.1.tar.gz
rsyslog-doc-8.4.1.tar.gz
New:
----
rsyslog-8.4.2.tar.gz
rsyslog-doc-8.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rsyslog.spec ++++++
--- /var/tmp/diff_new_pack.5jdU4T/_old 2014-10-05 20:33:50.000000000 +0200
+++ /var/tmp/diff_new_pack.5jdU4T/_new 2014-10-05 20:33:50.000000000 +0200
@@ -20,7 +20,7 @@
Summary: The enhanced syslogd for Linux and Unix
License: (GPL-3.0+ and Apache-2.0)
Group: System/Daemons
-Version: 8.4.1
+Version: 8.4.2
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
++++++ rsyslog-8.4.1.tar.gz -> rsyslog-8.4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/ChangeLog new/rsyslog-8.4.2/ChangeLog
--- old/rsyslog-8.4.1/ChangeLog 2014-09-26 11:58:12.000000000 +0200
+++ new/rsyslog-8.4.2/ChangeLog 2014-10-02 12:28:25.000000000 +0200
@@ -1,4 +1,16 @@
---------------------------------------------------------------------------
+Version 8.4.2 [v8-stable] 2014-10-02
+- bugfix: the fix for CVE-2014-3634 did not handle all cases
+ This is corrected now.
+ see also: CVE-2014-3683
+- fixed a build problem on some platforms
+ Thanks to Olaf for the patch
+- behaviour change: "msg" of messages with invalid PRI set to "rawmsg"
+ When the PRI is invalid, the rest of the header cannot be valid. So
+ we move all of it to MSG and do not try to parse it out. Note that
+ this is not directly related to the security issue but rather done
+ because it makes most sense.
+---------------------------------------------------------------------------
Version 8.4.1 [v8-stable] 2014-09-30
- imudp: add for bracketing mode, which makes parsing stats easier
- permit at-sign in variable names
@@ -422,6 +434,18 @@
statement. Also, it can still be build without problems, the option must
just explicitely be given.
---------------------------------------------------------------------------
+Version 7.6.7 [v7.6-stable] 2014-10-02
+- bugfix: the fix for CVE-2014-3634 did not handle all cases
+ This is corrected now.
+ see also: CVE-2014-3683
+- fixed a build problem on some platforms
+ Thanks to Olaf for the patch
+- behaviour change: "msg" of messages with invalid PRI set to "rawmsg"
+ When the PRI is invalid, the rest of the header cannot be valid. So
+ we move all of it to MSG and do not try to parse it out. Note that
+ this is not directly related to the security issue but rather done
+ because it makes most sense.
+---------------------------------------------------------------------------
Version 7.6.6 [v7.6-stable] 2014-09-30
- bugfix: potential abort when a message with PRI > 191 was processed
if the "pri-text" property was used in active templates, this could
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/configure new/rsyslog-8.4.2/configure
--- old/rsyslog-8.4.1/configure 2014-09-26 11:59:11.000000000 +0200
+++ new/rsyslog-8.4.2/configure 2014-10-02 12:29:07.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for rsyslog 8.4.1.
+# Generated by GNU Autoconf 2.68 for rsyslog 8.4.2.
#
# Report bugs to .
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='rsyslog'
PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='8.4.1'
-PACKAGE_STRING='rsyslog 8.4.1'
+PACKAGE_VERSION='8.4.2'
+PACKAGE_STRING='rsyslog 8.4.2'
PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
PACKAGE_URL=''
@@ -1621,7 +1621,7 @@
# 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 8.4.1 to adapt to many kinds of systems.
+\`configure' configures rsyslog 8.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1691,7 +1691,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rsyslog 8.4.1:";;
+ short | recursive ) echo "Configuration of rsyslog 8.4.2:";;
esac
cat <<\_ACEOF
@@ -1949,7 +1949,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rsyslog configure 8.4.1
+rsyslog configure 8.4.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2528,7 +2528,7 @@
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 8.4.1, which was
+It was created by rsyslog $as_me 8.4.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3343,7 +3343,7 @@
# Define the identity of the package.
PACKAGE='rsyslog'
- VERSION='8.4.1'
+ VERSION='8.4.2'
cat >>confdefs.h <<_ACEOF
@@ -21331,7 +21331,7 @@
# 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 8.4.1, which was
+This file was extended by rsyslog $as_me 8.4.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21397,7 +21397,7 @@
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 8.4.1
+rsyslog config.status 8.4.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/configure.ac new/rsyslog-8.4.2/configure.ac
--- old/rsyslog-8.4.1/configure.ac 2014-09-26 11:57:03.000000000 +0200
+++ new/rsyslog-8.4.2/configure.ac 2014-10-02 12:27:22.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[8.4.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[8.4.2],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE([subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/grammar/lexer.c new/rsyslog-8.4.2/grammar/lexer.c
--- old/rsyslog-8.4.1/grammar/lexer.c 2014-09-26 12:01:26.000000000 +0200
+++ new/rsyslog-8.4.2/grammar/lexer.c 2014-10-02 12:31:03.000000000 +0200
@@ -1511,7 +1511,7 @@
#line 32 "lexer.l"
#include "config.h"
#include "parserif.h"
-extern char *strdup(char*); /* somehow we do not get this from string.h... */
+extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
/*%option noyywrap nodefault case-insensitive */
/* avoid compiler warning: `yyunput' defined but not used */
#define YY_NO_INPUT 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/grammar/lexer.l new/rsyslog-8.4.2/grammar/lexer.l
--- old/rsyslog-8.4.1/grammar/lexer.l 2014-09-26 11:56:29.000000000 +0200
+++ new/rsyslog-8.4.2/grammar/lexer.l 2014-10-02 12:27:30.000000000 +0200
@@ -31,7 +31,7 @@
%{
#include "config.h"
#include "parserif.h"
-extern char *strdup(char*); /* somehow we do not get this from string.h... */
+extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
%}
%option noyywrap nodefault case-insensitive yylineno
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/runtime/parser.c new/rsyslog-8.4.2/runtime/parser.c
--- old/rsyslog-8.4.1/runtime/parser.c 2014-09-26 11:57:03.000000000 +0200
+++ new/rsyslog-8.4.2/runtime/parser.c 2014-10-02 12:27:22.000000000 +0200
@@ -4,7 +4,7 @@
*
* Module begun 2008-10-09 by Rainer Gerhards (based on previous code from syslogd.c)
*
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2014 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of the rsyslog runtime library.
*
@@ -596,7 +596,7 @@
static inline rsRetVal
ParsePRI(msg_t *pMsg)
{
- int pri;
+ unsigned pri;
uchar *msg;
int lenMsg;
DEFiRet;
@@ -610,22 +610,21 @@
MsgSetAfterPRIOffs(pMsg, 0);
} else {
if(*msg == '<') {
- /* while we process the PRI, we also fill the PRI textual representation
- * inside the msg object. This may not be ideal from an OOP point of view,
- * but it offers us performance...
- */
pri = 0;
- while(--lenMsg > 0 && isdigit((int) *++msg)) {
+ while(--lenMsg > 0 && isdigit((int) *++msg) && pri <= LOG_MAXPRI) {
pri = 10 * pri + (*msg - '0');
}
- if(*msg == '>')
+ if(*msg == '>') {
++msg;
+ } else {
+ pri = LOG_PRI_INVLD;
+ }
if(pri > LOG_MAXPRI)
pri = LOG_PRI_INVLD;
}
pMsg->iFacility = pri2fac(pri);
pMsg->iSeverity = pri2sev(pri);
- MsgSetAfterPRIOffs(pMsg, msg - pMsg->pszRawMsg);
+ MsgSetAfterPRIOffs(pMsg, (pri == LOG_PRI_INVLD) ? 0 : msg - pMsg->pszRawMsg);
}
RETiRet;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/runtime/rsyslog.h new/rsyslog-8.4.2/runtime/rsyslog.h
--- old/rsyslog-8.4.1/runtime/rsyslog.h 2014-09-26 11:57:03.000000000 +0200
+++ new/rsyslog-8.4.2/runtime/rsyslog.h 2014-10-02 12:27:22.000000000 +0200
@@ -83,7 +83,7 @@
#define LOG_NFACILITIES 24+1 /* plus one for our special "invld" facility! */
#define LOG_MAXPRI 191 /* highest supported valid PRI value --> RFC3164, RFC5424 */
#undef LOG_MAKEPRI
-#define LOG_PRI_INVLD LOG_INVLD|LOG_DEBUG /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */
+#define LOG_PRI_INVLD (LOG_INVLD|LOG_DEBUG) /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */
#define LOG_EMERG 0 /* system is unusable */
#define LOG_ALERT 1 /* action must be taken immediately */
@@ -122,7 +122,7 @@
*/
static inline int pri2fac(const int pri)
{
- int fac = pri >> 3;
+ unsigned fac = pri >> 3;
return (fac > 23) ? LOG_FAC_INVLD : fac;
}
static inline int pri2sev(const int pri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/Makefile.am new/rsyslog-8.4.2/tests/Makefile.am
--- old/rsyslog-8.4.1/tests/Makefile.am 2014-09-26 11:57:08.000000000 +0200
+++ new/rsyslog-8.4.2/tests/Makefile.am 2014-10-02 12:27:22.000000000 +0200
@@ -13,6 +13,10 @@
fac_mail.sh \
fac_news.sh \
fac_uucp.sh \
+ fac_invld1.sh \
+ fac_invld2.sh \
+ fac_invld3.sh \
+ fac_invld4_rfc5424.sh \
rfc5424parser.sh \
arrayqueue.sh \
global_vars.sh \
@@ -362,6 +366,14 @@
testsuites/fac_news.conf \
fac_uucp.sh \
testsuites/fac_uucp.conf \
+ fac_invld1.sh \
+ testsuites/fac_invld1.conf \
+ fac_invld2.sh \
+ testsuites/fac_invld2.conf \
+ fac_invld3.sh \
+ testsuites/fac_invld3.conf \
+ fac_invld4_rfc5424.sh \
+ testsuites/fac_invld4_rfc5424.conf \
rs_optimizer_pri.sh \
testsuites/rs_optimizer_pri.conf \
rscript_prifilt.sh \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/Makefile.in new/rsyslog-8.4.2/tests/Makefile.in
--- old/rsyslog-8.4.1/tests/Makefile.in 2014-09-26 11:59:34.000000000 +0200
+++ new/rsyslog-8.4.2/tests/Makefile.in 2014-10-02 12:29:22.000000000 +0200
@@ -60,6 +60,10 @@
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_mail.sh \
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_news.sh \
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_uucp.sh \
+@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld1.sh \
+@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld2.sh \
+@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld3.sh \
+@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld4_rfc5424.sh \
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ rfc5424parser.sh \
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ arrayqueue.sh \
@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ global_vars.sh \
@@ -653,6 +657,14 @@
testsuites/fac_news.conf \
fac_uucp.sh \
testsuites/fac_uucp.conf \
+ fac_invld1.sh \
+ testsuites/fac_invld1.conf \
+ fac_invld2.sh \
+ testsuites/fac_invld2.conf \
+ fac_invld3.sh \
+ testsuites/fac_invld3.conf \
+ fac_invld4_rfc5424.sh \
+ testsuites/fac_invld4_rfc5424.conf \
rs_optimizer_pri.sh \
testsuites/rs_optimizer_pri.conf \
rscript_prifilt.sh \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld1.sh new/rsyslog-8.4.2/tests/fac_invld1.sh
--- old/rsyslog-8.4.1/tests/fac_invld1.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/fac_invld1.sh 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,10 @@
+# added 2014-10-01 by Rgerhards
+
+# This file is part of the rsyslog project, released under ASL 2.0
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup fac_invld1.conf
+source $srcdir/diag.sh tcpflood -m1000 -P 1011
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
+source $srcdir/diag.sh seq-check 0 999
+source $srcdir/diag.sh exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld2.sh new/rsyslog-8.4.2/tests/fac_invld2.sh
--- old/rsyslog-8.4.1/tests/fac_invld2.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/fac_invld2.sh 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,10 @@
+# added 2014-10-01 by Rgerhards
+
+# This file is part of the rsyslog project, released under ASL 2.0
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup fac_invld2.conf
+source $srcdir/diag.sh tcpflood -m1000 -P 3500000000
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
+source $srcdir/diag.sh seq-check 0 999
+source $srcdir/diag.sh exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld3.sh new/rsyslog-8.4.2/tests/fac_invld3.sh
--- old/rsyslog-8.4.1/tests/fac_invld3.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/fac_invld3.sh 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,10 @@
+# added 2014-10-01 by Rgerhards
+
+# This file is part of the rsyslog project, released under ASL 2.0
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup fac_invld3.conf
+source $srcdir/diag.sh tcpflood -m1000 -P x112
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
+source $srcdir/diag.sh seq-check 0 999
+source $srcdir/diag.sh exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld4_rfc5424.sh new/rsyslog-8.4.2/tests/fac_invld4_rfc5424.sh
--- old/rsyslog-8.4.1/tests/fac_invld4_rfc5424.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/fac_invld4_rfc5424.sh 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,10 @@
+# added 2014-10-01 by Rgerhards
+
+# This file is part of the rsyslog project, released under ASL 2.0
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup fac_invld4_rfc5424.conf
+source $srcdir/diag.sh tcpflood -y -m1000 -P 8000000000000000000000000000000
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
+source $srcdir/diag.sh seq-check 0 999
+source $srcdir/diag.sh exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld1.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld1.conf
--- old/rsyslog-8.4.1/tests/testsuites/fac_invld1.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/testsuites/fac_invld1.conf 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,7 @@
+$IncludeConfig diag-common.conf
+
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+template(type="string" name="outfmt" string="%msg:F,58:4%\n")
+invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld2.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld2.conf
--- old/rsyslog-8.4.1/tests/testsuites/fac_invld2.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/testsuites/fac_invld2.conf 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,7 @@
+$IncludeConfig diag-common.conf
+
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+template(type="string" name="outfmt" string="%msg:F,58:4%\n")
+invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld3.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld3.conf
--- old/rsyslog-8.4.1/tests/testsuites/fac_invld3.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/testsuites/fac_invld3.conf 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,7 @@
+$IncludeConfig diag-common.conf
+
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+template(type="string" name="outfmt" string="%msg:F,58:4%\n")
+invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld4_rfc5424.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld4_rfc5424.conf
--- old/rsyslog-8.4.1/tests/testsuites/fac_invld4_rfc5424.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/rsyslog-8.4.2/tests/testsuites/fac_invld4_rfc5424.conf 2014-10-02 07:56:37.000000000 +0200
@@ -0,0 +1,7 @@
+$IncludeConfig diag-common.conf
+
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+template(type="string" name="outfmt" string="%msg:F,58:4%\n")
+invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tools/pmrfc3164.c new/rsyslog-8.4.2/tools/pmrfc3164.c
--- old/rsyslog-8.4.1/tools/pmrfc3164.c 2014-09-26 11:56:29.000000000 +0200
+++ new/rsyslog-8.4.2/tools/pmrfc3164.c 2014-10-02 12:27:22.000000000 +0200
@@ -84,6 +84,9 @@
lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* note: offAfterPRI is already the number of PRI chars (do not add one!) */
p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI; /* point to start of text, after PRI */
setProtocolVersion(pMsg, MSG_LEGACY_PROTOCOL);
+ if(pMsg->iFacility == (LOG_INVLD>>3))
+ FINALIZE; /* don't parse out from invalid messages! */
+
/* Check to see if msg contains a timestamp. We start by assuming
* that the message timestamp is the time of reception (which we
@@ -199,7 +202,7 @@
}
}
- /* The rest is the actual MSG */
+finalize_it:
MsgSetMSGoffs(pMsg, p2parse - pMsg->pszRawMsg);
ENDparse
++++++ rsyslog-doc-8.4.1.tar.gz -> rsyslog-doc-8.4.2.tar.gz ++++++
++++ no output (probably identical)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org