Fix macros.

Refs #5855

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 253d76bf5d3a2346241d6b3cd646204b17271fe7..cdf5aaf50da35f1e3ee5d6099c0bd31123295aec 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -369,13 +369,13 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
                                return true;
                        }
                }
+       }
 
-               Dictionary::Ptr vars = GetVars();
+       Dictionary::Ptr vars = GetVars();
 
-               if (vars && vars->Contains(key)) {
-                       *result = vars->Get(key);
-                       return true;
-               }
+       if (vars && vars->Contains(macro)) {
+               *result = vars->Get(macro);
+               return true;
        }
 
        return false;

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index a1d527536e19674916e4a75773a22ba86a78fad3..621a70c1ac03183e29c328abfa8170ee892dd156 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -156,12 +156,13 @@ bool IcingaApplication::ResolveMacro(const String& macro, const CheckResult::Ptr
                        return true;
                }
 
-               Dictionary::Ptr vars = GetVars();
+       }
 
-               if (vars && vars->Contains(key)) {
-                       *result = vars->Get(key);
-                       return true;
-               }
+       Dictionary::Ptr vars = GetVars();
+
+       if (vars && vars->Contains(macro)) {
+               *result = vars->Get(macro);
+               return true;
        }
 
        return false;

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 62c4fffb8d52a827a5a33c01f1edd7aedbe238af..c12f0b9acafd423b4e51c567e1773b4d7b4b010e 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -199,13 +199,13 @@ bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Stri
                                return true;
                        }
                }
+       }
 
-               Dictionary::Ptr vars = GetVars();
+       Dictionary::Ptr vars = GetVars();
 
-               if (vars && vars->Contains(key)) {
-                       *result = vars->Get(key);
-                       return true;
-               }
+       if (vars && vars->Contains(macro)) {
+               *result = vars->Get(macro);
+               return true;
        }
 
        return false;

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 62c0d1fe0febff4bbc0deaf1a45fa6d16c1e1523..1feb9f8c76ac85849ffc63e4972a5f3ca4a7350f 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -79,13 +79,13 @@ bool User::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
                        *result = GetDisplayName();
                        return true;
                }
+       }
 
-               Dictionary::Ptr vars = GetVars();
+       Dictionary::Ptr vars = GetVars();
 
-               if (vars && vars->Contains(key)) {
-                       *result = vars->Get(key);
-                       return true;
-               }
+       if (vars && vars->Contains(macro)) {
+               *result = vars->Get(macro);
+               return true;
        }
 
        return false;