Fix how the HOSTALIAS and CONTACTALIAS macros work.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 27f069d0216b8f75a59b65da9d71f036fc4b2363..246fa44aa698079feb18f198bd552a51a1b1d3e3 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -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;
        }

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 53e297670f96992b478c7cae19ec15c54cb6fae6..c4ce9291f42cddfb64700256fdc5eb93e9d5e5a8 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -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();