From 2c003eefff31bb41dcef5ee80f003f277a008139 Mon Sep 17 00:00:00 2001
From: Eric Garver <e@erig.me>
Date: Tue, 18 Dec 2018 09:55:08 -0500
Subject: [PATCH] fw: On reload, when restoring NM interfaces also consider
 default zone

An empty zone, "", is used for interfaces implicitly assigned to the
default zone. We need to include those when reapplying the assignments.

Fixes: rhbz 1656962
Fixes: 242bc4e2e20c ("Add "FlushAllOnReload" config option")
Fixes: cd97204a06f3 ("fw: on reload() retain interfaces from NetworkManager")
---
 src/firewall/core/fw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
index 4ec2087ec48d..e614a4609edc 100644
--- a/src/firewall/core/fw.py
+++ b/src/firewall/core/fw.py
@@ -1039,7 +1039,7 @@ class Firewall(object):
         # Restore permanent interfaces from NetworkManager
         nm_bus_name = nm_get_bus_name()
         if nm_bus_name:
-            for zone in self.zone.get_zones():
+            for zone in self.zone.get_zones() + [""]:
                 for interface in nm_get_interfaces_in_zone(zone):
                     self.zone.add_interface(zone, interface, sender=nm_bus_name)
 
-- 
2.18.0