From: Laine Stump Date: Sun, 3 Feb 2019 04:21:42 +0000 (-0500) Subject: util: remove test code accidentally committed to virFirewallDZoneExists X-Git-Tag: v5.1.0-rc1~265 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9dcfed5ae6d5874ea0e67e47a6871707b8446a;p=thirdparty%2Flibvirt.git util: remove test code accidentally committed to virFirewallDZoneExists 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 --- diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index ca03020f74..47bacdcf4a 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match) char **zones = NULL; bool result = false; - return true; - if (virFirewallDGetZones(&zones, &nzones) < 0) goto cleanup;