- Fix #1247: forward-first: ssl handshake failed on root nameservers.

diff --git a/doc/Changelog b/doc/Changelog
index 74b455246acbce1d730efe29e3b2c798c43ce8b0..cd09dba647f06e1307e3e31ce5a0ff13cd962d89 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 June 2025: Yorgos
+       - Fix #1247: forward-first: ssl handshake failed on root nameservers.
+
 20 June 2025: Yorgos
        - Fix #1293: EDE 6 is attached to insecure cached answers when client
          sends the CD bit.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 0bf5523c5efae5f9359b76e4f1269dfe5f21a736..267eac5b96eb8808395305a7ab83eedabe07cef8 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2180,6 +2180,10 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
                                        a->lame, a->tls_auth_name, -1, NULL);
                        }
                        lock_rw_unlock(&qstate->env->hints->lock);
+                       /* copy over some configuration since we update the
+                        * delegation point in place */
+                       iq->dp->tcp_upstream = dp->tcp_upstream;
+                       iq->dp->ssl_upstream = dp->ssl_upstream;
                }
                iq->dp->has_parent_side_NS = 1;
        } else if(!iq->dp->has_parent_side_NS) {