[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Drop empty argument from dnsmasq call



On Fri, Feb 18, 2011 at 11:37:53AM -0700, Eric Blake wrote:
[..snip..] 
> This might as well be the shorter (and faster):
> 
> virCommandAddArg(cmd, "--conf-file=");
> 
> now that it is only one argument.
Like in the attached patch?
 -- Guido
>From 1781c7d690b4b6733e3a06ee3f72367efc9ad342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx sigxcpu org>
Date: Fri, 18 Feb 2011 15:32:02 +0100
Subject: [PATCH] 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.
---
 src/network/bridge_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 98c59c9..e666cbb 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",
-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]