diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
| commit | fd4a54698cee48da073622f7d6ac49c94ccb1808 (patch) | |
| tree | b16110018cd3a21a19561f45376403e1e8815cfb /runtime/glbl.c | |
| parent | 88ff647aef4c6db3c444c6d080f9886350ca9584 (diff) | |
| parent | 87a01476e2a63ab7b6740b6b4182281d271ef382 (diff) | |
| download | rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.gz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.xz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
tools/omfwd.c
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 0114b1ac..71901dee 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); } |