From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 18 Feb 2011 14:32:02 +0000 (+0100)
Subject: Drop empty argument from dnsmasq call
X-Git-Tag: CVE-2011-1146~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acab8a97cebf48c85f88951654cbac369344aceb;p=thirdparty%2Flibvirt.git

Drop empty argument from dnsmasq call

since dnsmasq >= 2.56 now bails out with empty arguments. See
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613944
for the Debian bug and
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589885
for the upstream reasoning.
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 98c59c9ac5..e666cbb1ff 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -477,7 +477,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
     virCommandAddArgPair(cmd, "--pid-file", pidfile);
 
     /* *no* conf file */
-    virCommandAddArgList(cmd, "--conf-file=", "", NULL);
+    virCommandAddArg(cmd, "--conf-file=");
 
     virCommandAddArgList(cmd,
                          "--except-interface", "lo",