From 73b73fe5c31bcaf9052d9bbb13f38ff3a13fd22d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Aug 2009 14:18:41 +0200 Subject: 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. --- ChangeLog | 4 ++++ doc/rsyslog_conf_global.html | 4 +++- doc/status.html | 8 ++++---- tools/syslogd.c | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97ee9207..84f3971a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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.all selector lines that should provide this +functionality.
  • $AllowedSender
  • $ControlCharacterEscapePrefix
    • 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 @@ rsyslog status page

    rsyslog status page

    -

    This page reflects the status as of 2009-07-28.

    +

    This page reflects the status as of 2009-08-20.

    Current Releases

    -

    v5 development: 5.1.3 [2009-07-28] - -change log - -download +

    v5 development: 5.1.4 [2009-08-20] - +change log - +download
    v4 development: 4.5.1 [2009-07-15] - change log - 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; } -- cgit v1.2.3