Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend non-terminal name handling to all locally configured RRs.

Browse Source
This commit is contained in:
Simon Kelley
2019-10-29 22:58:55 +00:00
parent 84449bf41c
commit 376cb97685
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/cache.c
View File

@@ -1179,6 +1179,12 @@ void cache_reload(void)
struct host_record *hr; struct host_record *hr;
struct name_list *nl; struct name_list *nl;
struct cname *a; struct cname *a;
struct crec lrec;
struct mx_srv_record *mx;
struct txt_record *txt;
struct interface_name *intr;
struct ptr_record *ptr;
struct naptr *naptr;
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
struct ds_config *ds; struct ds_config *ds;
#endif #endif
@@ -1288,7 +1294,40 @@ void cache_reload(void)
if (!(ah->flags & AH_INACTIVE)) if (!(ah->flags & AH_INACTIVE))
total_size = read_hostsfile(ah->fname, ah->index, total_size, (struct crec **)daemon->packet, revhashsz); total_size = read_hostsfile(ah->fname, ah->index, total_size, (struct crec **)daemon->packet, revhashsz);
} }
/* Make non-terminal records for all locally-define RRs */
lrec.flags = F_FORWARD | F_CONFIG | F_NAMEP | F_IMMORTAL;
for (txt = daemon->txt; txt; txt = txt->next)
{
lrec.name.namep = txt->name;
make_non_terminals(&lrec);
}
for (naptr = daemon->naptr; naptr; naptr = naptr->next)
{
lrec.name.namep = naptr->name;
make_non_terminals(&lrec);
}
for (mx = daemon->mxnames; mx; mx = mx->next)
{
lrec.name.namep = mx->name;
make_non_terminals(&lrec);
}
for (intr = daemon->int_names; intr; intr = intr->next)
{
lrec.name.namep = intr->name;
make_non_terminals(&lrec);
}
for (ptr = daemon->ptr; ptr; ptr = ptr->next)
{
lrec.name.namep = ptr->name;
make_non_terminals(&lrec);
}
#ifdef HAVE_INOTIFY #ifdef HAVE_INOTIFY
set_dynamic_inotify(AH_HOSTS, total_size, (struct crec **)daemon->packet, revhashsz); set_dynamic_inotify(AH_HOSTS, total_size, (struct crec **)daemon->packet, revhashsz);
#endif #endif
@@ -1441,7 +1480,7 @@ static void make_non_terminals(struct crec *source)
if (!is_outdated_cname_pointer(crecp) && if (!is_outdated_cname_pointer(crecp) &&
(crecp->flags & F_FORWARD) && (crecp->flags & F_FORWARD) &&
(crecp->flags & type) && (crecp->flags & type) &&
!(crecp->flags & (F_IPV4 | F_IPV6 | F_CNAME | F_DNSKEY | F_DS)) && !(crecp->flags & (F_IPV4 | F_IPV6 | F_CNAME | F_SRV | F_DNSKEY | F_DS)) &&
hostname_isequal(name, cache_get_name(crecp))) hostname_isequal(name, cache_get_name(crecp)))
{ {
*up = crecp->hash_next; *up = crecp->hash_next;
@@ -1498,7 +1537,7 @@ static void make_non_terminals(struct crec *source)
if (crecp) if (crecp)
{ {
crecp->flags = (source->flags | F_NAMEP) & ~(F_IPV4 | F_IPV6 | F_CNAME | F_DNSKEY | F_DS | F_REVERSE); crecp->flags = (source->flags | F_NAMEP) & ~(F_IPV4 | F_IPV6 | F_CNAME | F_SRV | F_DNSKEY | F_DS | F_REVERSE);
crecp->ttd = source->ttd; crecp->ttd = source->ttd;
crecp->name.namep = name; crecp->name.namep = name;