diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-16 17:39:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-16 17:39:11 +0200 |
| commit | 42c0f21ced49f23644aa52a18e1995f867e4fd18 (patch) | |
| tree | 2e1093d112f1fc296f2fe21b9e3f5f17466f06c5 | |
| parent | 2e4334e36c1680f76698452e05d64c772b7ec323 (diff) | |
| parent | 5bb38abf3dcf5ad30e386e234d23ff0ad7b02f36 (diff) | |
| download | rsyslog-42c0f21ced49f23644aa52a18e1995f867e4fd18.tar.gz rsyslog-42c0f21ced49f23644aa52a18e1995f867e4fd18.tar.bz2 rsyslog-42c0f21ced49f23644aa52a18e1995f867e4fd18.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | doc/imuxsock.html | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -96,6 +96,9 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.4.5 [v7.4-stable] 2013-09-?? +- bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was + misspelled + Thanks to David Lang for alerting us - bugfix: small memory leak in imfile when $ResetConfigVariables was used Thanks to Grégory Nuyttens for reporting this bug and providig a fix - bugfix: segfault on startup if TLS was used but no CA cert set diff --git a/doc/imuxsock.html b/doc/imuxsock.html index 80c3bc5a..ddd45af1 100644 --- a/doc/imuxsock.html +++ b/doc/imuxsock.html @@ -270,7 +270,7 @@ equivalent to: SysSock.IgnoreTimestamp.</li> <li><b>$InputUnixListenSocketHostName</b> <hostname> equivalent to: HostName.</li> <li><b>$InputUnixListenSocketAnnotate</b> <on/<b>off</b>> equivalent to: Annotate.</li> <li><b>$SystemLogSocketAnnotate</b> <on/<b>off</b>> equivalent to: SysSock.Annotate.</li> -<li><b>$SystemLogSocketParseTrusted</b> <on/<b>off</b>> equivalent to: SysSock.ParseTrusted.</li> +<li><b>$SystemLogParseTrusted</b> <on/<b>off</b>> equivalent to: SysSock.ParseTrusted.</li> </ul> <b>Caveats/Known Bugs:</b><br> |