From: John Ferlan <jferlan@redhat.com>
Date: Mon, 2 Dec 2013 19:36:51 +0000 (-0500)
Subject: nwfilter: Remove Coverity DEADCODE warning
X-Git-Tag: CVE-2013-6436~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a298ec0407b9f1233c983fb1174e13dc7e25aef;p=thirdparty%2Flibvirt.git

nwfilter: Remove Coverity DEADCODE warning

The nwfilterStateInitialize() would only assign sysbus inside
a WITH_DBUS conditional, thus leaving a subsequent check for sysbus
and nwfilterDriverInstallDBusMatches() as a no-op

Rather than try to add WITH_DBUS conditions which ended up conflicting
with the usage of HAVE_FIREWALLD conditionals, just remove the WITH_DBUS
since virdbus.c has entry points for with and without conditions.
---

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index d521adffed..d21dd82ac5 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -177,11 +177,9 @@ nwfilterStateInitialize(bool privileged,
     if (!privileged)
         return 0;
 
-#if WITH_DBUS
     if (virDBusHasSystemBus() &&
         !(sysbus = virDBusGetSystemBus()))
         return -1;
-#endif /* WITH_DBUS */
 
     if (VIR_ALLOC(driverState) < 0)
         return -1;