Blame SOURCES/libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch

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