summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:54:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-29 13:54:53 +0200
commit6ddb3249e6bac6c573a5ab45eba65fba91c1d9e9 (patch)
tree6ffc6dfb496a8dab86a815fa8821a98d021c76f8
parent43c45bfebcc672d6fbec2d4d659609d1ea48eda6 (diff)
downloadrsyslog-6ddb3249e6bac6c573a5ab45eba65fba91c1d9e9.tar.gz
rsyslog-6ddb3249e6bac6c573a5ab45eba65fba91c1d9e9.tar.xz
rsyslog-6ddb3249e6bac6c573a5ab45eba65fba91c1d9e9.zip
fixed copy&paste error in previous commit
(testcase was only present in v4, so I did not spot the issue immediately)
-rw-r--r--ChangeLog1
-rw-r--r--tools/syslogd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2269dc05..e9075ab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
are specified. Thanks to Michael Biebl for helping to debug this one.
- relaxed GnuTLS version requirement to 1.4.0 after confirmation from the
field that this version is sufficient
+- bugfix: parser did not properly handle empty structured data
---------------------------------------------------------------------------
Version 3.22.0 [v3-stable] (rgerhards), 2009-04-21
This is the first stable release that includes the full functionality
diff --git a/tools/syslogd.c b/tools/syslogd.c
index f8149613..13eaede2 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1252,7 +1252,7 @@ static int parseRFCStructuredData(char **pp2parse, char *pResult)
if(*p2parse != '[')
return 1; /* this is NOT structured data! */
- if(*p2parse != '-') { /* empty structured data? */
+ if(*p2parse == '-') { /* empty structured data? */
*pResult++ = '-';
++p2parse;
} else {