aboutsummaryrefslogtreecommitdiffstats
path: root/package/dnsmasq
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-02-12 22:47:25 +0000
committerMike Baker <mbm@openwrt.org>2007-02-12 22:47:25 +0000
commita29a89cbc84d749c4d5c3027017ebf83bb7ecfcf (patch)
treed0074782a11a699a543e879c1d1f0b325a9fdf66 /package/dnsmasq
parent2c521d1050c9cde2baa0b4d14be289457c3265b7 (diff)
downloadupstream-a29a89cbc84d749c4d5c3027017ebf83bb7ecfcf.tar.gz
upstream-a29a89cbc84d749c4d5c3027017ebf83bb7ecfcf.tar.bz2
upstream-a29a89cbc84d749c4d5c3027017ebf83bb7ecfcf.zip
fix dnsmasq parsing of /etc/hosts for fqdn cases like "localhost."
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6291 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dnsmasq')
-rw-r--r--package/dnsmasq/patches/103-hosts-fqdn.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/package/dnsmasq/patches/103-hosts-fqdn.patch b/package/dnsmasq/patches/103-hosts-fqdn.patch
new file mode 100644
index 0000000000..0541614191
--- /dev/null
+++ b/package/dnsmasq/patches/103-hosts-fqdn.patch
@@ -0,0 +1,15 @@
+--- dnsmasq-2.35/src/cache.c.orig 2007-02-12 14:35:58.000000000 -0800
++++ dnsmasq-2.35/src/cache.c 2007-02-12 14:36:51.000000000 -0800
+@@ -720,10 +720,11 @@
+ while ((token = strtok(NULL, " \t\n\r")) && (*token != '#'))
+ {
+ struct crec *cache;
++ int fqdn = !!strchr(token, '.');
+ if (canonicalise(token))
+ {
+ /* If set, add a version of the name with a default domain appended */
+- if ((opts & OPT_EXPAND) && domain_suffix && !strchr(token, '.') &&
++ if ((opts & OPT_EXPAND) && domain_suffix && !fqdn &&
+ (cache = malloc(sizeof(struct crec) +
+ strlen(token)+2+strlen(domain_suffix)-SMALLDNAME)))
+ {