summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-07 15:24:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-07 15:24:59 +0200
commita6c743e5ec5d213d3aa6404553fe65d59f065799 (patch)
tree8ec5ec4d77dea8a12280b965c2c5ba7f5051158f /tools
parent7db9f96fe9ecb9f8e05d45cc888aa488d8aed85f (diff)
parent845c6f59b91e9988f856556cbb0e88e275e8e591 (diff)
downloadrsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.gz
rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.xz
rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.zip
Merge branch 'master' into nextmaster
Conflicts: ChangeLog
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index c85c4371..0badac19 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1496,7 +1496,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
* the fields. I think this logic shall work with any type of syslog message.
*/
bTAGCharDetected = 0;
- if(pMsg->bParseHOSTNAME) {
+ if(flags & PARSE_HOSTNAME) {
/* TODO: quick and dirty memory allocation */
/* the memory allocated is far too much in most cases. But on the plus side,
* it is quite fast... - rgerhards, 2007-09-20