diff options
| author | Michael Biebl <biebl@debian.org> | 2011-03-06 17:45:57 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-03-06 17:45:57 +0100 |
| commit | 1760e95bcd76dafd48afe3043d64ea72f96d7a24 (patch) | |
| tree | 1ae208b35391255debdea26089fe36b2eb935b09 /debian | |
| parent | b5dc04cfd5fb5c86829dc9686e20ebe59ff08297 (diff) | |
dnsmasq: Use --conf-file without additional parameter
* debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch
- Newer versions of dnsmasq validate the option parameters more strictly.
Instead of passing a bogus file name simply use --conf-file without
additional parameters. (Closes: #615082)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 67ce972e..d27cd916 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.8.2-6) UNRELEASED; urgency=low + + * debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch + - Newer versions of dnsmasq validate the option parameters more strictly. + Instead of passing a bogus file name simply use --conf-file without + additional parameters. (Closes: #615082) + + -- Michael Biebl <biebl@debian.org> Sun, 06 Mar 2011 17:12:47 +0100 + network-manager (0.8.2-5) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch b/debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch new file mode 100644 index 00000000..96a179a7 --- /dev/null +++ b/debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch @@ -0,0 +1,44 @@ +From 6bf63e913c8246345167f937963c2c14da59ee23 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 4 Mar 2011 23:52:44 -0600 +Subject: [PATCH] dnsmasq: send no config file instead of a bogus one (lp:725041) (debian #615082) + +--- + src/dnsmasq-manager/nm-dnsmasq-manager.c | 12 ++---------- + 1 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c +index 701c078..ca2f9dc 100644 +--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c ++++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c +@@ -254,7 +254,6 @@ create_dm_cmd_line (const char *iface, + struct in_addr addr; + char buf[INET_ADDRSTRLEN + 15]; + char localaddr[INET_ADDRSTRLEN + 1]; +- int i; + + dm_binary = nm_find_dnsmasq (); + if (!dm_binary) { +@@ -278,17 +277,10 @@ create_dm_cmd_line (const char *iface, + /* dnsmasq may read from it's default config file location, which if that + * location is a valid config file, it will combine with the options here + * and cause undesirable side-effects. Like sending bogus IP addresses +- * as the gateway or whatever. So give dnsmasq a bogus config file +- * location to avoid screwing up the configuration we're passing to it. ++ * as the gateway or whatever. So tell dnsmasq not to use any config file ++ * at all. + */ +- memset (buf, 0, sizeof (buf)); +- strcpy (buf, "/tmp/"); +- for (i = 5; i < 15; i++) +- 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); + + nm_cmd_line_add_string (cmd, "--no-hosts"); + nm_cmd_line_add_string (cmd, "--keep-in-foreground"); +-- +1.7.4.1 + diff --git a/debian/patches/series b/debian/patches/series index ccf6b407..28605828 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 80-keyfile-ignore-temporary-files.patch 81-keyfile-quiet-keyfile-plugin-when-re-read-connection.patch 82-core-handle-device-removal.patch +83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch |