mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-20 19:52:10 +00:00
Make --rev-server work in the presence of --bogus-priv.
This commit is contained in:
1 parent
3a8b0f6fcc
commit
5a7212c70e
2 files changed
+37
-7
No files matched your search
@@ -99,6 +99,10 @@ version 2.77
|
|||||||
when the script accidentally emits error messages.
|
when the script accidentally emits error messages.
|
||||||
Thanks to Petr Mensik for the patch.
|
Thanks to Petr Mensik for the patch.
|
||||||
|
|
||||||
|
Make --rev-server for an RFC1918 subnet work even in the
|
||||||
|
presence of the --bogus-priv flag. Thanks to
|
||||||
|
Vladislav Grishenko for the patch.
|
||||||
|
|
||||||
|
|
||||||
version 2.76
|
version 2.76
|
||||||
Include 0.0.0.0/8 in DNS rebind checks. This range
|
Include 0.0.0.0/8 in DNS rebind checks. This range
|
||||||
|
|||||||
+33
-7
@@ -1459,13 +1459,39 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
|
|||||||
#endif
|
#endif
|
||||||
(is_arpa == F_IPV4 && private_net(addr.addr.addr4, 1))))
|
(is_arpa == F_IPV4 && private_net(addr.addr.addr4, 1))))
|
||||||
{
|
{
|
||||||
/* if not in cache, enabled and private IPV4 address, return NXDOMAIN */
|
struct server *serv;
|
||||||
ans = 1;
|
unsigned int namelen = strlen(name);
|
||||||
sec_data = 0;
|
char *nameend = name + namelen;
|
||||||
nxdomain = 1;
|
|
||||||
if (!dryrun)
|
/* see if have rev-server set */
|
||||||
log_query(F_CONFIG | F_REVERSE | is_arpa | F_NEG | F_NXDOMAIN,
|
for (serv = daemon->servers; serv; serv = serv->next)
|
||||||
name, &addr, NULL);
|
{
|
||||||
|
unsigned int domainlen;
|
||||||
|
char *matchstart;
|
||||||
|
|
||||||
|
if ((serv->flags & (SERV_HAS_DOMAIN | SERV_NO_ADDR)) != SERV_HAS_DOMAIN)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
domainlen = strlen(serv->domain);
|
||||||
|
if (domainlen == 0 || domainlen > namelen)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
matchstart = nameend - domainlen;
|
||||||
|
if (hostname_isequal(matchstart, serv->domain) &&
|
||||||
|
(namelen == domainlen || *(matchstart-1) == '.' ))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if no configured server, not in cache, enabled and private IPV4 address, return NXDOMAIN */
|
||||||
|
if (!serv)
|
||||||
|
{
|
||||||
|
ans = 1;
|
||||||
|
sec_data = 0;
|
||||||
|
nxdomain = 1;
|
||||||
|
if (!dryrun)
|
||||||
|
log_query(F_CONFIG | F_REVERSE | is_arpa | F_NEG | F_NXDOMAIN,
|
||||||
|
name, &addr, NULL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user