|
 |
40251c |
From e84f00aee61d5055c2da2c9c1aff683f20b84f56 Mon Sep 17 00:00:00 2001
|
|
|
087194 |
From: Eric Garver <eric@garver.life>
|
|
|
087194 |
Date: Tue, 4 Feb 2020 13:12:31 -0500
|
|
|
40251c |
Subject: [PATCH 38/39] fix: firewall-offline-cmd: Don't print warning about
|
|
|
087194 |
AllowZoneDrifting
|
|
|
087194 |
|
|
|
087194 |
If we're called from firewall-offline-cmd, don't log the warning. It's
|
|
|
087194 |
overly verbose to warn on every invocation.
|
|
|
087194 |
|
|
|
087194 |
Fixes: afadd377b09d ("feat: AllowZoneDrifting config option")
|
|
|
087194 |
(cherry picked from commit eefcb1a712ffca5e08dcefa6aa17c935c16b835f)
|
|
|
40251c |
(cherry picked from commit ba1f1a744ca543b4e9359ab26b4b1f9ff70fcb64)
|
|
|
087194 |
---
|
|
|
087194 |
src/firewall/core/fw.py | 9 +++++----
|
|
|
087194 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
087194 |
|
|
|
087194 |
diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
|
|
|
40251c |
index 6206ed586988..ebadd6cce20e 100644
|
|
|
087194 |
--- a/src/firewall/core/fw.py
|
|
|
087194 |
+++ b/src/firewall/core/fw.py
|
|
|
40251c |
@@ -293,10 +293,11 @@ class Firewall(object):
|
|
|
087194 |
self._allow_zone_drifting = False
|
|
|
087194 |
else:
|
|
|
087194 |
self._allow_zone_drifting = True
|
|
|
087194 |
- log.warning("AllowZoneDrifting is enabled. This is considered "
|
|
|
087194 |
- "an insecure configuration option. It will be "
|
|
|
087194 |
- "removed in a future release. Please consider "
|
|
|
087194 |
- "disabling it now.")
|
|
|
087194 |
+ if not self._offline:
|
|
|
087194 |
+ log.warning("AllowZoneDrifting is enabled. This is considered "
|
|
|
087194 |
+ "an insecure configuration option. It will be "
|
|
|
087194 |
+ "removed in a future release. Please consider "
|
|
|
087194 |
+ "disabling it now.")
|
|
|
087194 |
log.debug1("AllowZoneDrifting is set to '%s'",
|
|
|
087194 |
self._allow_zone_drifting)
|
|
|
087194 |
|
|
|
087194 |
--
|
|
|
087194 |
2.23.0
|
|
|
087194 |
|