From 598ecacee6438d7a9004162f1f1c7734b985cda3 Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Tue, 1 Feb 2022 15:16:58 -0500
Subject: [PATCH] fix(service): adding includes to a built in service

Conflict: NA
Reference: https://github.com/firewalld/firewalld/commit/598ecacee6438d7a9004162f1f1c7734b985cda3

Fixes: bcdc1e2bf1e7 ("fix: dbus: add missing APIs for service includes")
(cherry picked from commit 72ef57a1d700055a0fc2de29c63a22dbb69328e3)
---
 src/firewall/server/config_service.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/firewall/server/config_service.py b/src/firewall/server/config_service.py
index dae3a4c6..3dcf63fe 100644
--- a/src/firewall/server/config_service.py
+++ b/src/firewall/server/config_service.py
@@ -685,7 +685,7 @@ class FirewallDConfigService(DbusServiceObject):
         log.debug1("%s.setIncludes('%s')", self._log_prefix, includes)
         self.parent.accessCheck(sender)
         settings = {"includes": includes[:]}
-        self.config.set_service_config_dict(self.obj, settings)
+        self.obj = self.config.set_service_config_dict(self.obj, settings)
         self.Updated(self.obj.name)
 
     @dbus_service_method(config.dbus.DBUS_INTERFACE_CONFIG_SERVICE,
@@ -697,7 +697,7 @@ class FirewallDConfigService(DbusServiceObject):
         self.parent.accessCheck(sender)
         settings = self.config.get_service_config_dict(self.obj)
         settings.setdefault("includes", []).append(include)
-        self.config.set_service_config_dict(self.obj, settings)
+        self.obj = self.config.set_service_config_dict(self.obj, settings)
         self.Updated(self.obj.name)
 
     @dbus_service_method(config.dbus.DBUS_INTERFACE_CONFIG_SERVICE,
@@ -709,7 +709,7 @@ class FirewallDConfigService(DbusServiceObject):
         self.parent.accessCheck(sender)
         settings = self.config.get_service_config_dict(self.obj)
         settings["includes"].remove(include)
-        self.config.set_service_config_dict(self.obj, settings)
+        self.obj = self.config.set_service_config_dict(self.obj, settings)
         self.Updated(self.obj.name)
 
     @dbus_service_method(config.dbus.DBUS_INTERFACE_CONFIG_SERVICE,
-- 
2.23.0