]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Make dynamic hosts files work when --no-hosts set.
authorSimon Kelley <simon@thekelleys.org.uk>
Sat, 14 Feb 2015 20:08:56 +0000 (20:08 +0000)
committerSimon Kelley <simon@thekelleys.org.uk>
Sat, 14 Feb 2015 20:08:56 +0000 (20:08 +0000)
src/cache.c

index 43245b771b53df7b0ff25c4055f0ca2c40b9e3de..c95624c42b1c68aae94d9a1165eecb155785a247 100644 (file)
@@ -1133,17 +1133,18 @@ void cache_reload(void)
     {
       if (daemon->cachesize > 0)
        my_syslog(LOG_INFO, _("cleared cache"));
-      return;
     }
-  
-  if (!option_bool(OPT_NO_HOSTS))
-    total_size = read_hostsfile(HOSTSFILE, SRC_HOSTS, total_size, (struct crec **)daemon->packet, revhashsz);
-  
-  daemon->addn_hosts = expand_filelist(daemon->addn_hosts);
-  for (ah = daemon->addn_hosts; ah; ah = ah->next)
-    if (!(ah->flags & AH_INACTIVE))
-      total_size = read_hostsfile(ah->fname, ah->index, total_size, (struct crec **)daemon->packet, revhashsz);
-  
+  else
+    {
+      if (!option_bool(OPT_NO_HOSTS))
+       total_size = read_hostsfile(HOSTSFILE, SRC_HOSTS, total_size, (struct crec **)daemon->packet, revhashsz);
+      
+      daemon->addn_hosts = expand_filelist(daemon->addn_hosts);
+      for (ah = daemon->addn_hosts; ah; ah = ah->next)
+       if (!(ah->flags & AH_INACTIVE))
+         total_size = read_hostsfile(ah->fname, ah->index, total_size, (struct crec **)daemon->packet, revhashsz);
+    }
+
 #ifdef HAVE_INOTIFY
   set_dynamic_inotify(AH_HOSTS, total_size, (struct crec **)daemon->packet, revhashsz);
 #endif