Add a patch to fix a warning in omjournal

This commit is contained in:
Tomas Heinrich 2014-02-07 14:18:23 +01:00
parent 501400125b
commit 0ba70cd0e8
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From e921bfe82068a1767311181ad7f4c78ed86e2577 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@redhat.com>
Date: Thu, 16 Jan 2014 11:43:55 +0100
Subject: [PATCH] bugfix: invert the logic for issuing a warning
---
plugins/omjournal/omjournal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/omjournal/omjournal.c b/plugins/omjournal/omjournal.c
index 160c369..937d277 100644
--- a/plugins/omjournal/omjournal.c
+++ b/plugins/omjournal/omjournal.c
@@ -153,7 +153,7 @@ ENDdoAction
BEGINparseSelectorAct
CODESTARTparseSelectorAct
CODE_STD_STRING_REQUESTparseSelectorAct(1)
- if(strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) {
+ if(!strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) {
errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED,
"omjournal supports only v6+ config format, use: "
"action(type=\"omjournal\" ...)");
--
1.8.4.3

View File

@ -26,6 +26,8 @@ Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch
Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
# merged upstream
Patch3: rsyslog-7.3.15-imuxsock-warning.patch
# merged upstream
Patch4: rsyslog-7.4.8-omjournal-warning.patch
Patch5: rsyslog-7.4.7-numeric-uid.patch
Patch6: rsyslog-7.4.7-atomicops.patch
@ -247,6 +249,7 @@ of source ports.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@ -482,6 +485,8 @@ done
rsyslog-7.4.7-bz1030044-remove-ads.patch
- add an explicit requirement on the version of libestr
- drop the "v5" string from the conf file as it's misleading
- add rsyslog-7.4.8-omjournal-warning.patch to fix
a condition for issuing a warning in omjournal
* Sun Feb 09 2014 Lubomir Rintel <lkundrak@v3.sk> 7.4.7-3
- Fixed 32-bit PowerPC build