tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix how the HOSTALIAS and CONTACTALIAS macros work.

This commit is contained in:
Gunnar Beutner 2013-07-02 09:54:24 +02:00
parent 4cd4228f64
commit 184f503c2a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/host.cpp
View File

@ -541,11 +541,11 @@ String Host::StateToString(HostState state)
bool Host::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *result) const
{
if (macro == "HOSTNAME" || macro == "HOSTALIAS") {
if (macro == "HOSTNAME") {
*result = GetName();
return true;
}
else if (macro == "HOSTDISPLAYNAME") {
else if (macro == "HOSTDISPLAYNAME" || macro == "HOSTALIAS") {
*result = GetDisplayName();
return true;
}

2
lib/icinga/user.cpp
View File

@ -103,7 +103,7 @@ bool User::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *
*result = GetName();
return true;
} else if (macro == "CONTACTALIAS") {
*result = GetName();
*result = GetDisplayName();
return true;
} else {
Dictionary::Ptr macros = GetMacros();