From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Tue, 13 Aug 2019 14:09:26 +0000 (+0200)
Subject: Fix cookie with ActivateItems
X-Git-Tag: v2.11.0~1^2~38^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F7419%2Fhead;p=icinga2

Fix cookie with ActivateItems
---

diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp
index 3ccb7b926..9b85e062b 100644
--- a/lib/remote/configobjectutility.cpp
+++ b/lib/remote/configobjectutility.cpp
@@ -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 << "'.";