summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-01-08 12:49:02 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-01-08 12:49:02 +0100
commitbbb2066d17824f366d0f83a010cae6ebe99d4fa0 (patch)
tree540efffa73888dc44ea5ffc55fefc201e18d0966
parent3b0f635bd579c4cc00e189871e77ef120a6c6a4d (diff)
downloadrsyslog-bbb2066d17824f366d0f83a010cae6ebe99d4fa0.tar.gz
rsyslog-bbb2066d17824f366d0f83a010cae6ebe99d4fa0.tar.bz2
rsyslog-bbb2066d17824f366d0f83a010cae6ebe99d4fa0.zip
bugfix: mmjsonparse errornously returned action error when no CEE cookie was present.
-rw-r--r--ChangeLog2
-rw-r--r--plugins/mmjsonparse/mmjsonparse.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 792a8d53..12db54e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ Version 7.2.5 [v7-stable] 2013-01-??
Thanks to Martin Körper for the patch
- bugfix: doGetFileCreateMode() had invalid validity check ;)
Thanks to Chandler Latour for the patch.
+- bugfix: mmjsonparse errornously returned action error when no CEE cookie
+ was present.
----------------------------------------------------------------------------
Version 7.2.4 [v7-stable] 2012-12-07
- enhance: permit RFC3339 timestamp in local log socket messages
diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
index 40cfa919..a13962ab 100644
--- a/plugins/mmjsonparse/mmjsonparse.c
+++ b/plugins/mmjsonparse/mmjsonparse.c
@@ -172,6 +172,7 @@ finalize_it:
jval = json_object_new_string((char*)buf);
json_object_object_add(json, "msg", jval);
msgAddJSON(pMsg, (uchar*)"!", json);
+ iRet = RS_RET_OK;
}
MsgSetParseSuccess(pMsg, bSuccess);
ENDdoAction