Blame SOURCES/0015-fix-client-addService-needs-to-reduce-tuple-size.patch

725d6a
From 1eb5d5c57edb6e35895fa4ae4314f652da423d92 Mon Sep 17 00:00:00 2001
725d6a
From: Eric Garver <eric@garver.life>
725d6a
Date: Fri, 24 Apr 2020 11:27:10 -0400
725d6a
Subject: [PATCH 15/45] fix(client): addService needs to reduce tuple size
725d6a
725d6a
The dbus API only allows 8 elements. Reduce the tuple to the correct
725d6a
size as it's common for clients to do
725d6a
725d6a
    settings =  FirewallClientServiceSettings()
725d6a
    [..]
725d6a
    addService(settings.settings)
725d6a
725d6a
(cherry picked from commit e2ab8a6e584e6ba2adb0a5e0a13fbb6d7eb39b0c)
725d6a
(cherry picked from commit 3eae583907a953b71df16747bbabefd24fbdc3ab)
725d6a
---
725d6a
 src/firewall/client.py | 4 +++-
725d6a
 1 file changed, 3 insertions(+), 1 deletion(-)
725d6a
725d6a
diff --git a/src/firewall/client.py b/src/firewall/client.py
725d6a
index efe5d7db1273..ea27c0186509 100644
725d6a
--- a/src/firewall/client.py
725d6a
+++ b/src/firewall/client.py
725d6a
@@ -2488,7 +2488,9 @@ class FirewallClientConfig(object):
725d6a
         elif type(settings) is dict:
725d6a
             path = self.fw_config.addService2(name, settings)
725d6a
         else:
725d6a
-            path = self.fw_config.addService(name, tuple(settings))
725d6a
+            # tuple based dbus API has 8 elements. Slice what we're given down
725d6a
+            # to the expected size.
725d6a
+            path = self.fw_config.addService(name, tuple(settings[:8]))
725d6a
         return FirewallClientConfigService(self.bus, path)
725d6a
 
725d6a
     # icmptype
725d6a
-- 
725d6a
2.27.0
725d6a