summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-11 18:21:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-11 18:21:57 +0200
commitb8916d5cf10130b34ba8982a88d912e9f3f1e1c4 (patch)
treeb225654843018dbc8db9f144700188be199c334b
parent76c80165e969a37c0fc176661879661c20e9a198 (diff)
downloadrsyslog-b8916d5cf10130b34ba8982a88d912e9f3f1e1c4.tar.gz
rsyslog-b8916d5cf10130b34ba8982a88d912e9f3f1e1c4.tar.bz2
rsyslog-b8916d5cf10130b34ba8982a88d912e9f3f1e1c4.zip
change lumberjack cookie to "@cee" from "@cee "
CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
-rw-r--r--ChangeLog6
-rw-r--r--plugins/mmjsonparse/mmjsonparse.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e30c49ba..db39911f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
---------------------------------------------------------------------------
Version 6.4.3 [V6-STABLE] 2012-??-??
+- change lumberjack cookie to "@cee" from "@cee "
+ CEE originally specified the cookie with SP, whereas other lumberjack
+ tools used it without space. In order to keep interop with lumberjack,
+ we now use the cookie without space as well. I hope this can be changed
+ in CEE as well when it is released at a later time.
+ Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
- bugfix: comments inside objects (e.g. action()) were not properly handled
- bugfix: sysklogd-emulating standard template was no longer present in v6
This was obviously lost during the transition to the new config format.
diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
index 03147b59..111ecc2f 100644
--- a/plugins/mmjsonparse/mmjsonparse.c
+++ b/plugins/mmjsonparse/mmjsonparse.c
@@ -99,7 +99,7 @@ BEGINtryResume
CODESTARTtryResume
ENDtryResume
-#define COOKIE "@cee: "
+#define COOKIE "@cee:"
#define LEN_COOKIE (sizeof(COOKIE)-1)
BEGINdoAction
msg_t *pMsg;