diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-20 14:18:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-20 14:18:41 +0200 |
| commit | 73b73fe5c31bcaf9052d9bbb13f38ff3a13fd22d (patch) | |
| tree | 7171e95a1af50342a3852d204889ee5033c15c28 | |
| parent | c7f746d8349b395b95b3aa70eb395afb07b9c4c7 (diff) | |
| download | rsyslog-73b73fe5c31bcaf9052d9bbb13f38ff3a13fd22d.tar.gz rsyslog-73b73fe5c31bcaf9052d9bbb13f38ff3a13fd22d.tar.xz rsyslog-73b73fe5c31bcaf9052d9bbb13f38ff3a13fd22d.zip | |
bugfix: hostnames with dashes in them were incorrectly treated as malformed
... thus causing them to be treated as TAG (this was a regression
introduced from the "rfc3164 strict" change in 4.5.0). Testbench has been
updated to include a smaple message with a hostname containing a dash.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/rsyslog_conf_global.html | 4 | ||||
| -rw-r--r-- | doc/status.html | 8 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
4 files changed, 12 insertions, 6 deletions
@@ -4,6 +4,10 @@ Version 5.1.5 [DEVEL] (rgerhards), 2009-08-?? this option permites to process mark messages under all circumstances, even if an action was recently called. This can be useful to use mark messages as a kind of heartbeat. +- bugfix: hostnames with dashes in them were incorrectly treated as + malformed, thus causing them to be treated as TAG (this was a regression + introduced from the "rfc3164 strict" change in 4.5.0). Testbench has been + updated to include a smaple message with a hostname containing a dash. --------------------------------------------------------------------------- Version 5.1.4 [DEVEL] (rgerhards), 2009-08-20 - legacy syslog parser changed so that it now accepts date stamps in diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index 4a88a97e..fa9c7eef 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -111,7 +111,9 @@ that no rebind is done. This directive is useful for use with load-balancers.</l are written to actions only if the action was not recently executed (by default, recently means within the past 20 minutes). If this setting is switched to "on", mark messages are always sent to actions, no matter how recently they have been executed. In this mode, mark messages can be used as a kind of -heartbeat. +heartbeat. Note that this option auto-resets to "off", so if you intend to use it with multiple +actions, it must be specified in front off <b>all</b> selector lines that should provide this +functionality. </li> <li><a href="rsconf1_allowedsender.html">$AllowedSender</a></li> <li><a href="rsconf1_controlcharacterescapeprefix.html">$ControlCharacterEscapePrefix</a></li> diff --git a/doc/status.html b/doc/status.html index 0b3f45ad..b73bc85a 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,12 +2,12 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2009-07-28.</p> +<p>This page reflects the status as of 2009-08-20.</p> <h2>Current Releases</h2> -<p><b>v5 development:</b> 5.1.3 [2009-07-28] - -<a href="http://www.rsyslog.com/Article390.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-168.phtml">download</a> +<p><b>v5 development:</b> 5.1.4 [2009-08-20] - +<a href="http://www.rsyslog.com/Article392.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-170.phtml">download</a> <br><b>v4 development:</b> 4.5.1 [2009-07-15] - <a href="http://www.rsyslog.com/Article388.phtml">change log</a> - diff --git a/tools/syslogd.c b/tools/syslogd.c index 40e9e92c..ff671138 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1225,7 +1225,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags) if(flags & PARSE_HOSTNAME) { i = 0; while((isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.' - || p2parse[i] == '_') && i < CONF_TAG_MAXSIZE) { + || p2parse[i] == '_' || p2parse[i] == '-') && i < CONF_TAG_MAXSIZE) { bufParseHOSTNAME[i] = p2parse[i]; ++i; } |