Use object name if HOSTADDRESS macro isn't defined.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 246fa44aa698079feb18f198bd552a51a1b1d3e3..2119a72d78750eb2d494ebc3c8e889fcdfe8aee7 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -610,18 +610,21 @@ bool Host::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *res
 
        Dictionary::Ptr macros = GetMacros();
 
-       if (macros) {
-               String name = macro;
+       String name = macro;
 
-               if (name == "HOSTADDRESS")
-                       name = "address";
-               else if (macro == "HOSTADDRESS6")
-                       name = "address6";
+       if (name == "HOSTADDRESS")
+               name = "address";
+       else if (macro == "HOSTADDRESS6")
+               name = "address6";
 
-               if (macros->Contains(name)) {
-                       *result = macros->Get(name);
-                       return true;
-               }
+       if (macros && macros->Contains(name)) {
+               *result = macros->Get(name);
+               return true;
+       }
+
+       if (macro == "HOSTADDRESS" || macro == "HOSTADDRESS6") {
+               *result = GetName();
+               return true;
        }
 
        return false;