diff options
| author | Michael Biebl <biebl@debian.org> | 2011-03-18 20:18:01 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-03-18 20:18:01 +0100 |
| commit | 7638c999f0a44ad6c1734d53ad3d057cbaf04273 (patch) | |
| tree | a3b60d74304f5717135fa7f430a52c4519be6b39 /src/dnsmasq-manager | |
| parent | 3d5624f02b77c669786cd29dc942dfe78b77ec81 (diff) | |
| parent | e22c6e05e9ebc6cce941762020c5710b8014677b (diff) | |
Merge commit 'upstream/0.8.3.998'
Diffstat (limited to 'src/dnsmasq-manager')
| -rw-r--r-- | src/dnsmasq-manager/Makefile.in | 5 | ||||
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.c | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in index 8cb698bc..fb62d61b 100644 --- a/src/dnsmasq-manager/Makefile.in +++ b/src/dnsmasq-manager/Makefile.in @@ -183,6 +183,10 @@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ +NM_MICRO_VERSION = @NM_MICRO_VERSION@ +NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ OBJDUMP = @OBJDUMP@ @@ -197,6 +201,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 701c0782..ca2f9dc4 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"); |