- Fix #1400: allowing use of global cache on ECS-forwarding unless

  always-forward.

git-svn-id: file:///svn/unbound/trunk@4352 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 7cd7f1295f06deddf1c7ee69a52d1ec93d7615f9..b890c8c8f4f34102c65dc8fd3023f07f46c6c323 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+18 September 2017: Ralph
+       - Fix #1400: allowing use of global cache on ECS-forwarding unless
+         always-forward.
+
 18 September 2017: Wouter
        - tag 1.6.6 (is 1.6.6rc2)
        - Fix that looping modules always stop the query, and don't pass

diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index c906e4e536641d533516fd2c9dbb4da2c35d13d3..4b8a4b2112759aa4f17e22fd6c6ce24945dd341f 100644 (file)
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -722,6 +722,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
                sq->ecs_server_out.subnet_scope_mask = 0;
                sq->ecs_server_out.subnet_validdata = 1;
                if(sq->ecs_server_out.subnet_source_mask != 0 &&
+                       qstate->env->cfg->client_subnet_always_forward &&
                        sq->subnet_downstream)
                        /* ECS specific data required, do not look at the global
                         * cache in other modules. */