- Make sure callback changes for EDNS are not lost.

diff --git a/services/outside_network.c b/services/outside_network.c
index ca92707f33d09f0a589f1068b478e9ba0e8d1571..d11431169497a9c7ade44322a603232606dae25d 100644 (file)
--- 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 e1b4443bd83a43c643be7188b3c3e02b845316e2..3c394ca62fe3b1129b226c78de27fff3143891d0 100644 (file)
--- 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,