diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-20 14:23:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-20 14:23:00 +0200 |
| commit | b9ece5d2ff1b3510ae6cbc13da766a4b85ff3ff5 (patch) | |
| tree | 1b3c874a147b645d43ec80a9e449229d3e68480c | |
| parent | 16fb5cd701d4c12f8ad573dde8ff52c9eaecb79f (diff) | |
| parent | daa76ad94428599336ddafdd6854dc0b71356180 (diff) | |
| download | rsyslog-b9ece5d2ff1b3510ae6cbc13da766a4b85ff3ff5.tar.gz rsyslog-b9ece5d2ff1b3510ae6cbc13da766a4b85ff3ff5.tar.bz2 rsyslog-b9ece5d2ff1b3510ae6cbc13da766a4b85ff3ff5.zip | |
Merge branch 'v4-devel' into beta
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -21,6 +21,9 @@ Version 4.5.2 [DEVEL] (rgerhards), 2009-07-?? are now unsigned (as they always should have been) and so the dangling mis-indexing does no longer happen. This bug potentially affected all installations, even if only some may actually have seen a segfault. +- 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). --------------------------------------------------------------------------- Version 4.5.1 [DEVEL] (rgerhards), 2009-07-15 - CONFIG CHANGE: $HUPisRestart default is now "off". We are doing this diff --git a/tools/syslogd.c b/tools/syslogd.c index 3846e6a9..88588621 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1218,7 +1218,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; } |