]> granicus.if.org Git - icinga2/commitdiff
Fix cookie with ActivateItems 7419/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Tue, 13 Aug 2019 14:09:26 +0000 (16:09 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Tue, 13 Aug 2019 14:09:26 +0000 (16:09 +0200)
lib/remote/configobjectutility.cpp

index 3ccb7b92634bf52584ca2028728676a2527987e3..9b85e062b02e346b5c81719ebf053eed8837c263 100644 (file)
@@ -212,9 +212,10 @@ bool ConfigObjectUtility::CreateObject(const Type::Ptr& type, const String& full
 
                /*
                 * Activate the config object.
+                * uq, items, runtimeCreated, silent, withModAttrs, cookie
                 * IMPORTANT: Forward the cookie aka origin in order to prevent sync loops in the same zone!
                 */
-               if (!ConfigItem::ActivateItems(upq, newItems, true, true, cookie)) {
+               if (!ConfigItem::ActivateItems(upq, newItems, true, true, false, cookie)) {
                        if (errors) {
                                Log(LogNotice, "ConfigObjectUtility")
                                        << "Failed to activate config object '" << fullName << "'. Aborting and emoving config path '" << path << "'.";