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
commit018d3bc7a5b85f9bfa2e97b9d15b0abb360cec82 (patch)
tree17262aa0c2a033fe144c88d9d8113bc694946e85
parent1b4f762e2b07601b1705aefce9c9daca70462dba (diff)
downloadupstream-018d3bc7a5b85f9bfa2e97b9d15b0abb360cec82.tar.gz
upstream-018d3bc7a5b85f9bfa2e97b9d15b0abb360cec82.tar.bz2
upstream-018d3bc7a5b85f9bfa2e97b9d15b0abb360cec82.zip
fix static domain wildcards in dnsmasq (broken by upgrade to 2.26)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3135 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dnsmasq/patches/102-domain_wildcard_fix.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/package/dnsmasq/patches/102-domain_wildcard_fix.patch
new file mode 100644
index 0000000000..041cd67cf0
--- /dev/null
+++ b/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;