diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
commit | e577d6bc7968ede9ed0cb8693b95478daf0ffb08 (patch) | |
tree | d2d35558840b174f42646fcb51d9cd897178b654 /tools/syslogd.c | |
parent | 4f70113457993c536fc948d5b3b3e69dc7a92a8a (diff) | |
parent | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff) | |
download | rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.gz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.xz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 9f8c88f4..84fe8453 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2401,7 +2401,7 @@ queryLocalHostname(void) } /* LocalDomain is "" or part of LocalHostName, allocate a new string */ - CHKmalloc(LocalDomain = (uchar*)strdup(LocalDomain)); + CHKmalloc(LocalDomain = (uchar*)strdup((char*)LocalDomain)); /* Convert to lower case to recognize the correct domain laterly */ for(p = LocalDomain ; *p ; p++) |