From 633f2335b9305514b36b50455063070c4888be61 Mon Sep 17 00:00:00 2001

From: Eric Garver <eric@garver.life>

Date: Wed, 10 Feb 2021 16:35:12 -0500

Subject: [PATCH 17/22] fix(dbus): properties: IPv4 and IPv6 should be true if

 using nftables

(cherry picked from commit 85feb6cf091d4e03c1175770a7cacb9d994f1126)

(cherry picked from commit 94cc358fe90f4926e588f568edec9fd4efe49370)

---

 src/firewall/server/firewalld.py | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/firewall/server/firewalld.py b/src/firewall/server/firewalld.py

index 895e9635d1aa..f74e6e6ae6ff 100644

--- a/src/firewall/server/firewalld.py

+++ b/src/firewall/server/firewalld.py

@@ -158,13 +158,13 @@ class FirewallD(slip.dbus.service.Object):

             return dbus.String(self.fw.get_state())

         elif prop == "IPv4":

-            return dbus.Boolean(self.fw.ip4tables_enabled)

+            return dbus.Boolean(self.fw.is_ipv_enabled("ipv4"))

         elif prop == "IPv4ICMPTypes":

             return dbus.Array(self.fw.ipv4_supported_icmp_types, "s")

         elif prop == "IPv6":

-            return dbus.Boolean(self.fw.ip6tables_enabled)

+            return dbus.Boolean(self.fw.is_ipv_enabled("ipv6"))

         elif prop == "IPv6_rpfilter":

             return dbus.Boolean(self.fw.ipv6_rpfilter_enabled)

-- 

2.27.0