From: Mike Baker <mbm@openwrt.org>
Date: Mon, 12 Feb 2007 22:47:25 +0000 (+0000)
Subject: fix dnsmasq parsing of /etc/hosts for fqdn cases like "localhost."
X-Git-Tag: reboot~29947
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b478e36af219d9ed24e5fbbf82911385a613e71c;p=oweals%2Fopenwrt.git

fix dnsmasq parsing of /etc/hosts for fqdn cases like "localhost."

SVN-Revision: 6291
---

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)))
+ 	       {