Blame SOURCES/firewalld-0.7-0001-fw-On-reload-when-restoring-NM-interfaces-also-consi.patch
|
 |
21c891 |
From 2c003eefff31bb41dcef5ee80f003f277a008139 Mon Sep 17 00:00:00 2001
|
|
|
21c891 |
From: Eric Garver <e@erig.me>
|
|
|
21c891 |
Date: Tue, 18 Dec 2018 09:55:08 -0500
|
|
|
21c891 |
Subject: [PATCH] fw: On reload, when restoring NM interfaces also consider
|
|
|
21c891 |
default zone
|
|
|
21c891 |
|
|
|
21c891 |
An empty zone, "", is used for interfaces implicitly assigned to the
|
|
|
21c891 |
default zone. We need to include those when reapplying the assignments.
|
|
|
21c891 |
|
|
|
21c891 |
Fixes: rhbz 1656962
|
|
|
21c891 |
Fixes: 242bc4e2e20c ("Add "FlushAllOnReload" config option")
|
|
|
21c891 |
Fixes: cd97204a06f3 ("fw: on reload() retain interfaces from NetworkManager")
|
|
|
21c891 |
---
|
|
|
21c891 |
src/firewall/core/fw.py | 2 +-
|
|
|
21c891 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
21c891 |
|
|
|
21c891 |
diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
|
|
|
21c891 |
index 4ec2087ec48d..e614a4609edc 100644
|
|
|
21c891 |
--- a/src/firewall/core/fw.py
|
|
|
21c891 |
+++ b/src/firewall/core/fw.py
|
|
|
21c891 |
@@ -1039,7 +1039,7 @@ class Firewall(object):
|
|
|
21c891 |
# Restore permanent interfaces from NetworkManager
|
|
|
21c891 |
nm_bus_name = nm_get_bus_name()
|
|
|
21c891 |
if nm_bus_name:
|
|
|
21c891 |
- for zone in self.zone.get_zones():
|
|
|
21c891 |
+ for zone in self.zone.get_zones() + [""]:
|
|
|
21c891 |
for interface in nm_get_interfaces_in_zone(zone):
|
|
|
21c891 |
self.zone.add_interface(zone, interface, sender=nm_bus_name)
|
|
|
21c891 |
|
|
|
21c891 |
--
|
|
|
21c891 |
2.18.0
|
|
|
21c891 |
|