diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:45:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:45:43 +0200 |
| commit | f58dd9c146d227758bcc065639c31995c6c23800 (patch) | |
| tree | b8a9f21999a35d48c71af5c9bf3843a187881597 /ChangeLog | |
| parent | a34d37a9e32a851002c07538532789b33d91f862 (diff) | |
| parent | 581daa5418548dda4c9b5438878559a1bbd4b087 (diff) | |
| download | rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.tar.gz rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.tar.xz rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.zip | |
Merge branch 'v4-beta' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -282,6 +282,18 @@ Version 5.7.3 [V5-BETA] (rgerhards), 2011-02-07 - added $LocalHostName config directive - bugfix: fixed build problems on some platforms namely those that have 32bit atomic operations but not 64 bit ones +--------------------------------------------------------------------------- +Version 4.7.5 [v4-beta] (al), 2011-09-01 +- bugfix/security: off-by-two bug in legacy syslog parser, CVE-2011-3200 +- bugfix: potential misadressing in property replacer +- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c) +--------------------------------------------------------------------------- +Version 4.7.4 [v4-beta] (rgerhards), 2011-07-11 +- added support for the ":omusrmsg:" syntax in configuring user messages +- added support for the ":omfile:" syntax in configuring user messages +- added $LocalHostName config directive +- bugfix: PRI was invalid on Solaris for message from local log socket +>>>>>>> 581daa5418548dda4c9b5438878559a1bbd4b087 - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect - bugfix: imfile did duplicate messages under some circumstances |