|
 |
9c6c51 |
From b2998798bddb9ffd98917cabd9d31578bf6724f3 Mon Sep 17 00:00:00 2001
|
|
|
9c6c51 |
Message-Id: <b2998798bddb9ffd98917cabd9d31578bf6724f3@dist-git>
|
|
|
9c6c51 |
From: Laine Stump <laine@laine.org>
|
|
|
9c6c51 |
Date: Sat, 2 Feb 2019 23:32:54 -0500
|
|
|
9c6c51 |
Subject: [PATCH] util: remove test code accidentally committed to
|
|
|
9c6c51 |
virFirewallDZoneExists
|
|
|
9c6c51 |
MIME-Version: 1.0
|
|
|
9c6c51 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c6c51 |
Content-Transfer-Encoding: 8bit
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Just before pushing the series containing commit 3bba4825 I had added
|
|
|
9c6c51 |
a "return true" to the top of virFirewallDZoneExists() to measure the
|
|
|
9c6c51 |
impact of calling that function once per network during startup. I
|
|
|
9c6c51 |
found that the effect was minimal, but forgot to remove the "return
|
|
|
9c6c51 |
true" before pushing. This unfortunately causes a failure to start
|
|
|
9c6c51 |
networks on systems that have a firewalld version that doesn't support
|
|
|
9c6c51 |
our libvirt zone file (i.e. pretty much everyone).
|
|
|
9c6c51 |
|
|
|
9c6c51 |
This patch removes the unintended line.
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Laine Stump <laine@laine.org>
|
|
|
9c6c51 |
(cherry picked from commit 7c9dcfed5ae6d5874ea0e67e47a6871707b8446a)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
https://bugzilla.redhat.com/1650320
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
---
|
|
|
9c6c51 |
src/util/virfirewalld.c | 2 --
|
|
|
9c6c51 |
1 file changed, 2 deletions(-)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
|
|
|
9c6c51 |
index 8dd6ac2b8a..8aeb31db80 100644
|
|
|
9c6c51 |
--- a/src/util/virfirewalld.c
|
|
|
9c6c51 |
+++ b/src/util/virfirewalld.c
|
|
|
9c6c51 |
@@ -238,8 +238,6 @@ virFirewallDZoneExists(const char *match)
|
|
|
9c6c51 |
char **zones = NULL;
|
|
|
9c6c51 |
bool result = false;
|
|
|
9c6c51 |
|
|
|
9c6c51 |
- return true;
|
|
|
9c6c51 |
-
|
|
|
9c6c51 |
if (virFirewallDGetZones(&zones, &nzones) < 0)
|
|
|
9c6c51 |
goto cleanup;
|
|
|
9c6c51 |
|
|
|
9c6c51 |
--
|
|
|
9c6c51 |
2.20.1
|
|
|
9c6c51 |
|