From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Fri, 14 Jan 2022 14:18:43 +0000 (+0100)
Subject: - Make sure callback changes for EDNS are not lost.
X-Git-Tag: release-1.15.0rc1~31^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=773d1f29111b40445ec4bedf416c1f7b64c0605b;p=thirdparty%2Funbound.git

- Make sure callback changes for EDNS are not lost.
---

diff --git a/services/outside_network.c b/services/outside_network.c
index ca92707f3..d11431169 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -3278,6 +3278,7 @@ outnet_serviced_query(struct outside_network* outnet,
 	}
 	/* Restore the option list; we can explicitly use the copied one from
 	 * now on. */
+	per_upstream_opt_list = qstate->edns_opts_back_out;
 	qstate->edns_opts_back_out = backed_up_opt_list;
 
 	if((client_string_addr = edns_string_addr_lookup(
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index e1b4443bd..3c394ca62 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1243,6 +1243,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 		}
 		/* Restore the option list; we can explicitly use the copied
 		 * one from now on. */
+		per_upstream_opt_list = qstate->edns_opts_back_out;
 		qstate->edns_opts_back_out = backed_up_opt_list;
 		if((client_string_addr = edns_string_addr_lookup(
 			&env->edns_strings->client_strings,