29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
|
From cbe2802ebc62d8a04ceca2329014e835f1536423 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Garver <eric@garver.life>
|
||
|
|
Date: Thu, 14 Apr 2022 10:14:30 -0400
|
||
|
|
Subject: [PATCH] fix(zone): combined: forward must not default to True
|
||
|
|
|
||
|
|
Since we're reading on-disk config, assume forward = False as is done in
|
||
|
|
zone_reader().
|
||
|
|
|
||
|
|
Conflict: NA
|
||
|
|
Reference: https://github.com/firewalld/firewalld/commit/cbe2802ebc62d8a04ceca2329014e835f1536423
|
||
|
|
(cherry picked from commit 386a7327736160cb6a2d642325a26043b622a475)
|
||
|
|
---
|
||
|
|
src/firewall/core/fw.py | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
|
||
|
|
index 4d0ada35..547167c6 100644
|
||
|
|
--- a/src/firewall/core/fw.py
|
||
|
|
+++ b/src/firewall/core/fw.py
|
||
|
|
@@ -519,6 +519,7 @@ class Firewall(object):
|
||
|
|
combined_zone.check_name(combined_zone.name)
|
||
|
|
combined_zone.path = path
|
||
|
|
combined_zone.default = False
|
||
|
|
+ combined_zone.forward = False # see note in zone_reader()
|
||
|
|
else:
|
||
|
|
combine = False
|
||
|
|
|
||
|
|
--
|
||
|
|
2.23.0
|