[PATCH] dnsmasq: fix sending the conf-file parameter to dnsmasq

[Mathieu Trudel-Lapierre <mathieu tl gmail com>]

Hi,

Please see the attached patch. It fixes an issue reported downstream on
https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/725041

dnsmasq, starting in version 2.56, expects parameters requiring
arguments to have the arguments "attached" to them with an =. This
makes dnsmasq fail on startup when loading a connection in internet
sharing mode.

This seems to already handled correctly in src/dns-manager/nm-dns-dnsmasq.c.

Mathieu Trudel-Lapierre <mathieu tl gmail com>
Freenode: cyphermox, Jabber: mathieu tl gmail com
4096R/EE018C93 1967 8F7D 03A1 8F38 732E  FF82 C126 33E1 EE01 8C93

From 0a364dab87075844ae85d6b98a3bc0fe2a11f8bb Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu-tl ubuntu com>
Date: Fri, 25 Feb 2011 21:14:10 -0500
Subject: [PATCH] dnsmasq: fix sending the conf-file parameter to dnsmasq

---
 src/dnsmasq-manager/nm-dnsmasq-manager.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index 701c078..97668b0 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -287,8 +287,10 @@ create_dm_cmd_line (const char *iface,
 		buf[i] = (char) (g_random_int_range ((guint32) 'a', (guint32) 'z') & 0xFF);
 	strcat (buf, ".conf");
 
-	nm_cmd_line_add_string (cmd, "--conf-file");
-	nm_cmd_line_add_string (cmd, buf);
+	s = g_string_new ("--conf-file=");
+	g_string_append (s, buf);
+	nm_cmd_line_add_string (cmd, s->str);
+	g_string_free (s, TRUE);
 
 	nm_cmd_line_add_string (cmd, "--no-hosts");
 	nm_cmd_line_add_string (cmd, "--keep-in-foreground");
-- 
1.7.4.1