From 209a6d8e15afb83c0bf146dd95fc203bb9983242 Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Mon, 16 Jan 2012 16:53:18 +0100 Subject: FQDN hostname for multihomed host was not always set to the correct name ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards --- ChangeLog | 2 ++ tools/syslogd.c | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fc754cd..611127d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ Version 4.8.1 [v4-stable], 2011-09-?? - bugfix: potential fatal abort in omgssapi Thanks to Tomas Heinrich for the patch. - added doc for omprog +- FQDN hostname for multihomed host was not always set to the correct name + if multiple aliases existed. Thanks to Tomas Heinreich for the patch. --------------------------------------------------------------------------- Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07 *************************************************************************** diff --git a/tools/syslogd.c b/tools/syslogd.c index f66cbee3..7254385e 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -3350,9 +3350,29 @@ int realMain(int argc, char **argv) */ hent = gethostbyname((char*)LocalHostName); if(hent) { + int i = 0; + + if(hent->h_aliases) { + size_t hnlen; + + hnlen = strlen((char *) LocalHostName); + + for (i = 0; hent->h_aliases[i]; i++) { + if (!strncmp(hent->h_aliases[i], (char *) LocalHostName, hnlen) + && hent->h_aliases[i][hnlen] == '.') { + /* found a matching hostname */ + break; + } + } + } + free(LocalHostName); - CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); - + if(hent->h_aliases && hent->h_aliases[i]) { + CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_aliases[i])); + } else { + CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); + } + if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { *p++ = '\0'; -- cgit