aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-02-05 03:59:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-02-05 03:59:55 +0000
commit797a88865ed57337ca5dfc7d3293bd02f005cfb1 (patch)
tree5c1d11220edff74ac44f27c1051c4c6c7fa6c64f
parent5e3468929bcf9d8a3e3b8660c9131ccbde84f57a (diff)
downloadupstream-797a88865ed57337ca5dfc7d3293bd02f005cfb1.tar.gz
upstream-797a88865ed57337ca5dfc7d3293bd02f005cfb1.tar.bz2
upstream-797a88865ed57337ca5dfc7d3293bd02f005cfb1.zip
fix static domain wildcards in dnsmasq (broken by upgrade to 2.26)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3135 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch
new file mode 100644
index 00000000000..041cd67cf08
--- /dev/null
+++ b/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch
@@ -0,0 +1,12 @@
+diff -urN dnsmasq.old/src/forward.c dnsmasq.dev/src/forward.c
+--- dnsmasq.old/src/forward.c 2006-01-16 20:34:04.000000000 +0100
++++ dnsmasq.dev/src/forward.c 2006-02-05 04:41:37.148190000 +0100
+@@ -164,7 +164,7 @@
+ if (namelen >= domainlen &&
+ hostname_isequal(matchstart, serv->domain) &&
+ domainlen >= matchlen &&
+- (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' ))
++ (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' || domainlen == 0))
+ {
+ unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6;
+ *type = SERV_HAS_DOMAIN;