From: John Ferlan <jferlan@redhat.com>
Date: Tue, 8 Jan 2013 21:21:50 +0000 (-0500)
Subject: nwfilter: Remove unprivileged code path to set base
X-Git-Tag: v0.10.2.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52667e2415b1b38a2ab35215251ae498940bc8d;p=thirdparty%2Flibvirt.git

nwfilter: Remove unprivileged code path to set base

https://bugzilla.redhat.com/show_bug.cgi?id=903184

Commit id f8ab364c removed ability to run this driver unprivileged. Coverity
detected the check and flagged it.
(cherry picked from commit aafe41971cc3f4a189edf5b322f399aabd869d74)

Conflicts:
	src/nwfilter/nwfilter_driver.c - whitespace changes in 1c04f99 not present
---

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index dda6da7d79..17a9e57117 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -218,14 +218,8 @@ nwfilterDriverStartup(int privileged)
         goto error;
     }
 
-    if (privileged) {
-        if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL)
-            goto out_of_memory;
-    } else {
-        base = virGetUserConfigDirectory();
-        if (!base)
-            goto error;
-    }
+    if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL)
+        goto out_of_memory;
 
     if (virAsprintf(&driverState->configDir,
                     "%s/nwfilter", base) == -1)