More bugfixes.

diff --git a/base/configobject.cpp b/base/configobject.cpp
index 6a6dd32424277ab37c4963e284c26d6b9d86d3d1..163b1e21010830c2651f5e12119196c36eba97f4 100644 (file)
--- a/base/configobject.cpp
+++ b/base/configobject.cpp
@@ -68,9 +68,9 @@ void ConfigObject::SetLocal(bool value)
 
 bool ConfigObject::IsLocal(void) const
 {
-       bool value;
+       bool value = false;
        GetProperties()->GetProperty("__local", &value);
-       return (value != 0);
+       return value;
 }
 
 void ConfigObject::SetAbstract(bool value)
@@ -80,9 +80,9 @@ void ConfigObject::SetAbstract(bool value)
 
 bool ConfigObject::IsAbstract(void) const
 {
-       long value;
+       bool value = false;
        GetProperties()->GetProperty("__abstract", &value);
-       return (value != 0);
+       return value;
 }
 
 void ConfigObject::Commit(void)

diff --git a/base/observable.h b/base/observable.h
index 6fafa0b4794cc2c72604fe28e6fc96c847badc87..8dc13f332e6c121ebf59eee95505710d404c26be 100644 (file)
--- a/base/observable.h
+++ b/base/observable.h
@@ -74,8 +74,8 @@ public:
         */
        void operator()(const TArgs& args)
        {
-               vector<ObserverType>::size_type i = 0;
-               for (i = 0; i < m_Observers.size(); i++) {
+               typename vector<ObserverType>::size_type i = 0;
+               for (i = 0; i < m_Observers.size(); ) {
                        int result = m_Observers[i](args);
 
                        if (result == -1)

diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index 642c4df4ac3c31ceff7753bae6b6ff643bc8a0fd..cede383c49c8bf263f3654f0b7d98d738b824517 100644 (file)
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -62,6 +62,7 @@ int IcingaApplication::Main(const vector<string>& args)
 
        /* load config file */
        ConfigObject::Ptr fileComponentConfig = make_shared<ConfigObject>("component", "configfile");
+       fileComponentConfig->SetLocal(true);
        fileComponentConfig->SetProperty("configFilename", args[1]);
        fileComponentConfig->Commit();