]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch
Merge remote-tracking branch 'ms/x86_64' into next
[ipfire-2.x.git] / src / patches / dnsmasq / 003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch
1 From 3a3965ac21b1b759eab8799b6edb09195b671306 Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Sun, 9 Aug 2015 17:45:06 +0100
4 Subject: [PATCH] Don't answer non-auth queries for auth zones locally when
5 --localise-queries set.
6
7 ---
8 src/forward.c | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11 diff --git a/src/forward.c b/src/forward.c
12 index 2731b90..b76a974 100644
13 --- a/src/forward.c
14 +++ b/src/forward.c
15 @@ -1365,7 +1365,7 @@ void receive_query(struct listener *listen, time_t now)
16
17 #ifdef HAVE_AUTH
18 /* find queries for zones we're authoritative for, and answer them directly */
19 - if (!auth_dns)
20 + if (!auth_dns && !option_bool(OPT_LOCALISE))
21 for (zone = daemon->auth_zones; zone; zone = zone->next)
22 if (in_zone(zone, daemon->namebuff, NULL))
23 {
24 @@ -1904,7 +1904,7 @@ unsigned char *tcp_request(int confd, time_t now,
25
26 #ifdef HAVE_AUTH
27 /* find queries for zones we're authoritative for, and answer them directly */
28 - if (!auth_dns)
29 + if (!auth_dns && !option_bool(OPT_LOCALISE))
30 for (zone = daemon->auth_zones; zone; zone = zone->next)
31 if (in_zone(zone, daemon->namebuff, NULL))
32 {
33 --
34 1.7.10.4