]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
util: remove test code accidentally committed to virFirewallDZoneExists
authorLaine Stump <laine@laine.org>
Sun, 3 Feb 2019 04:21:42 +0000 (23:21 -0500)
committerLaine Stump <laine@laine.org>
Sun, 3 Feb 2019 04:25:59 +0000 (23:25 -0500)
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>
src/util/virfirewalld.c

index ca03020f74d27acf88508a441c91bdc4531b332a..47bacdcf4aec29229e70de0af6dbd1a17f2ea89d 100644 (file)
@@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match)
     char **zones = NULL;
     bool result = false;
 
-    return true;
-
     if (virFirewallDGetZones(&zones, &nzones) < 0)
         goto cleanup;