diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
| commit | 9ed218dc2ce9826e60d345482a5cdaabd25f4163 (patch) | |
| tree | 430cd7b85c1a01c809eb0f61a5ba7d5ef9b5c3a1 /tools/syslogd.c | |
| parent | 7f846c53d6519476b6118282ba6b3bad625e43a3 (diff) | |
| parent | 40254dcc8cf3d9ab17f30f417a95709cbf9204bf (diff) | |
| download | rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.gz rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.bz2 rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.zip | |
Merge branch 'master' into master-tcp-compress-stream
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 77adb2cb..1b38bf92 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -567,7 +567,6 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu assert(pBatch != NULL); pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */ preprocessBatch(pBatch); -dbgprintf("DDDD: batches ShutdownImmediate is %p\n", pBatch->pbShutdownImmediate); ruleset.ProcessBatch(pBatch); //TODO: the BATCH_STATE_COMM must be set somewhere down the road, but we //do not have this yet and so we emulate -- 2010-06-10 @@ -1531,7 +1530,7 @@ queryLocalHostname(void) glbl.SetLocalDomain(LocalDomain); if ( strlen((char*)LocalDomain) ) { - CHKmalloc(LocalFQDNName = (uchar*)malloc(strlen((char*)LocalDomain)+strlen((char*)LocalHostName)+1)); + CHKmalloc(LocalFQDNName = (uchar*)malloc(strlen((char*)LocalDomain)+strlen((char*)LocalHostName)+2));/* one for dot, one for NUL! */ if ( sprintf((char*)LocalFQDNName,"%s.%s",(char*)LocalHostName,(char*)LocalDomain) ) glbl.SetLocalFQDNName(LocalFQDNName); } |