diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:22:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:22:51 +0100 |
| commit | cec70434052c19e3de5197f5ad363efb874afd61 (patch) | |
| tree | 1d105bc7f4f5335330375c44ba5bf86e43ba65fb | |
| parent | 94cab477f5f308e3e8f24a58c381c1c92377c697 (diff) | |
| parent | 6b1a023f256030d19e12bbaeaeb236e4d664d90a (diff) | |
| download | rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.tar.gz rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.tar.xz rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
tools/syslogd.c
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | doc/v3compatibility.html | 6 |
2 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- doc bugfix: v3-compatiblity document had typo in config directive + thanks to Andrej for reporting this --------------------------------------------------------------------------- Version 3.21.9 [BETA] (rgerhards), 2008-12-04 - re-release of 3.21.8 with an additional fix, that could also lead @@ -342,6 +344,16 @@ Version 3.19.0 (rgerhards), 2008-05-06 - -c option no longer must be the first option - thanks to varmjofekoj for the patch --------------------------------------------------------------------------- +Version 3.18.7 (rgerhards), 2008-12-?? +- some legacy options were not correctly processed. + Thanks to varmojfekoj for the patch. +--------------------------------------------------------------------------- +Version 3.18.6 (rgerhards), 2008-12-08 +- security bugfix: $AllowedSender was not honored, all senders were + permitted instead (see http://www.rsyslog.com/Article322.phtml) + (backport from v3-stable, v3.20.9) +- minor bugfix: dual close() call on tcp session closure +--------------------------------------------------------------------------- Version 3.18.5 (rgerhards), 2008-10-09 - bugfix: imudp input module could cause segfault on HUP It did not properly de-init a variable acting as a linked list head. diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html index 51619947..ad8776bb 100644 --- a/doc/v3compatibility.html +++ b/doc/v3compatibility.html @@ -95,7 +95,7 @@ set the local address the server should listen to via <b>$UDPServerAddress <p>The following example configures an UDP syslog server at the local address 192.0.2.1 on port 514:</p> <p><b>$ModLoad imudp<br> -$UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun +$UDPServerAddress 192.0.2.1 # this MUST be before the $UDPServerRun directive!<br> $UDPServerRun 514</b></p> <p>"$UDPServerAddress *" means listen on all local interfaces. @@ -103,10 +103,10 @@ This is the default if no directive is specified.</p> <p>Please note that now multiple listeners are supported. For example, you can do the following:</p> <p><b>$ModLoad imudp<br> -$UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun +$UDPServerAddress 192.0.2.1 # this MUST be before the $UDPServerRun directive!<br> $UDPServerRun 514<br> -$UDPSeverAddress * # all local interfaces<br> +$UDPServerAddress * # all local interfaces<br> $UDPServerRun 1514</b></p> <p>These config file settings run two listeners: one at 192.0.2.1:514 and one on port 1514, which listens on all local |