diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:28:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:28:06 +0200 |
| commit | f7f0902f65b7693b8b3ebc3064b5ea188e614bf9 (patch) | |
| tree | 39e9d3d6d3533afff62c72044dea723e6c70a2c3 /tools/syslogd.c | |
| parent | 1a08fa5ded3087a3b60d87a20d25a4ec589eba21 (diff) | |
| parent | a6c743e5ec5d213d3aa6404553fe65d59f065799 (diff) | |
| download | rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.gz rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.bz2 rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.zip | |
Merge branch 'nextmaster' into oracle
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index b23c12a7..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 @@ -3091,6 +3091,7 @@ GlobalClassExit(void) objRelease(net, LM_NET_FILENAME);/* TODO: the dependency on net shall go away! -- rgerhards, 2008-03-07 */ objRelease(conf, CORE_COMPONENT); objRelease(expr, CORE_COMPONENT); + vmClassExit(); /* this is hack, currently core_modules do not get this automatically called */ objRelease(vm, CORE_COMPONENT); objRelease(var, CORE_COMPONENT); objRelease(datetime, CORE_COMPONENT); |