diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2015-02-14 20:08:56 +0000 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2015-02-14 20:08:56 +0000 |
| commit | caeea190f12efd20139f694aac4942d1ac00019f (patch) | |
| tree | 467f3abab5b34a2a0d9ae7722ecc3ce09aab58ee | |
| parent | 8ff70de618eb7de9147dbfbd4deca4a2dd62f0cb (diff) | |
| download | dnsmasq-caeea190f12efd20139f694aac4942d1ac00019f.tar.gz | |
Make dynamic hosts files work when --no-hosts set.
| -rw-r--r-- | src/cache.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/cache.c b/src/cache.c index 43245b7..c95624c 100644 --- a/src/cache.c +++ b/src/cache.c @@ -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 |