/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Aug 23 23:17:09 2011 UTC (2 years, 7 months ago) by nirbheek
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Bump for the 0.9.0 release, go forth and test. Also, remove old ebuilds and unused patches.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

1 From b05b77fa2668df4a4d8830685b138b4c57b1e777 Mon Sep 17 00:00:00 2001
2 From: Dan Williams <dcbw@redhat.com>
3 Date: Sat, 05 Mar 2011 05:52:44 +0000
4 Subject: dnsmasq: send no config file instead of a bogus one (lp:725041) (debian #615082)
5
6 ---
7 diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
8 index 701c078..3ca4b21 100644
9 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
10 +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
11 @@ -278,17 +278,10 @@ create_dm_cmd_line (const char *iface,
12 /* dnsmasq may read from it's default config file location, which if that
13 * location is a valid config file, it will combine with the options here
14 * and cause undesirable side-effects. Like sending bogus IP addresses
15 - * as the gateway or whatever. So give dnsmasq a bogus config file
16 - * location to avoid screwing up the configuration we're passing to it.
17 + * as the gateway or whatever. So tell dnsmasq not to use any config file
18 + * at all.
19 */
20 - memset (buf, 0, sizeof (buf));
21 - strcpy (buf, "/tmp/");
22 - for (i = 5; i < 15; i++)
23 - buf[i] = (char) (g_random_int_range ((guint32) 'a', (guint32) 'z') & 0xFF);
24 - strcat (buf, ".conf");
25 -
26 nm_cmd_line_add_string (cmd, "--conf-file");
27 - nm_cmd_line_add_string (cmd, buf);
28
29 nm_cmd_line_add_string (cmd, "--no-hosts");
30 nm_cmd_line_add_string (cmd, "--keep-in-foreground");
31 --
32 cgit v0.8.3-6-g21f6

  ViewVC Help
Powered by ViewVC 1.1.20