]> granicus.if.org Git - icinga2/commitdiff
Bugfix: %require didn't work if parent type had a validator for the same attribute.
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 6 Feb 2013 12:21:55 +0000 (13:21 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 6 Feb 2013 12:21:55 +0000 (13:21 +0100)
lib/config/configtype.cpp

index 55c4087a2139df67454c34baf10780e893a5d51b..0c4dfadc49fa5749d6fdb0955544f8764795b459 100644 (file)
@@ -147,9 +147,12 @@ void ConfigType::ValidateDictionary(const Dictionary::Ptr& dictionary,
                        if (subRuleList)
                                subRuleLists.push_back(subRuleList);
 
+                       if (overallResult == ValidationOK)
+                               continue;
+
                        if (result == ValidationOK) {
                                overallResult = result;
-                               break;
+                               continue;
                        }
 
                        if (result == ValidationInvalidType)