diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:17 +0200 |
| commit | f89c7834caf60de773811e206260cc7ee9dac5d2 (patch) | |
| tree | 29557114fbc63c4bf38570a977700aa8bbffb9af /runtime/glbl.c | |
| parent | bc250f0b0826051896204391126e01964881bf12 (diff) | |
| parent | 734f0031f3366c83552de8b0e628949d47ff9487 (diff) | |
| download | rsyslog-f89c7834caf60de773811e206260cc7ee9dac5d2.tar.gz | |
Merge commit 'upstream/5.8.1'
Diffstat (limited to 'runtime/glbl.c')
| -rw-r--r-- | runtime/glbl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index 68eb276..ec4992c 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -188,6 +188,11 @@ GetLocalHostName(void) { uchar *pszRet; + if(LocalHostNameOverride != NULL) { + pszRet = LocalHostNameOverride; + goto done; + } + if(LocalHostName == NULL) pszRet = (uchar*) "[localhost]"; else { @@ -196,6 +201,7 @@ GetLocalHostName(void) else pszRet = LocalHostName; } +done: return(pszRet); } |