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