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

Detect and error loops in --cname configuration.

Browse Source
This commit is contained in:
Simon Kelley
2017-01-19 17:22:00 +00:00
parent 0ef1334d78
commit 903df07bcb
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/option.c
View File

@@ -4663,11 +4663,44 @@ void read_opts(int argc, char **argv, char *compile_opts)
if (daemon->cnames)
{
struct cname *cn;
struct cname *cn, *cn2, *cn3;
#define NOLOOP 1
#define TESTLOOP 2
/* Fill in TTL for CNAMES noe we have local_ttl.
Also prepare to do loop detection. */
for (cn = daemon->cnames; cn; cn = cn->next)
if (cn->ttl == -1)
cn->ttl = daemon->local_ttl;
{
if (cn->ttl == -1)
cn->ttl = daemon->local_ttl;
cn->flag = 0;
cn->targetp = NULL;
for (cn2 = daemon->cnames; cn2; cn2 = cn2->next)
if (hostname_isequal(cn->target, cn2->alias))
{
cn->targetp = cn2;
break;
}
}
/* Find any CNAME loops.*/
for (cn = daemon->cnames; cn; cn = cn->next)
{
for (cn2 = cn->targetp; cn2; cn2 = cn2->targetp)
{
if (cn2->flag == NOLOOP)
break;
if (cn2->flag == TESTLOOP)
die(_("CNAME loop involving %s"), cn->alias, EC_BADCONF);
cn2->flag = TESTLOOP;
}
for (cn3 = cn->targetp; cn3 != cn2; cn3 = cn3->targetp)
cn3->flag = NOLOOP;
}
}
if (daemon->if_addrs)