[master] NTAs did not survive reoad/reconfig

4251.	[bug]		NTAs were deleted when the server was reconfigured
			or reloaded. [RT #41058]

diff --git a/CHANGES b/CHANGES
index 914afd9d00c6964b84432902f848e14650d303ef..914f27c825f9a858856295dcd420a799449a8477 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4251.  [bug]           NTAs were deleted when the server was reconfigured
+                       or reloaded. [RT #41058]
+
 4250.  [func]          Log the TSIG key in use during inbound zone
                        transfers. [RT #41075]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index ff5ac5e9831773338e0dadb372583c68f5636211..1b820bc41638ddf9d29c73bc64c9a43d503556e1 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6786,6 +6786,8 @@ load_configuration(const char *filename, ns_server_t *server,
                        goto cleanup;
        }
 
+       (void) ns_server_loadnta(server);
+
        result = ISC_R_SUCCESS;
 
  cleanup:
@@ -7055,8 +7057,6 @@ run_server(isc_task_t *task, isc_event_t *event) {
        isc_hash_init();
 
        CHECKFATAL(load_zones(server, ISC_TRUE), "loading zones");
-
-       (void) ns_server_loadnta(server);
 }
 
 void

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index fd3f6fc2d14ca7dd31a88d60385930ca9451446f..e124d5e52ad49a3037e45d0d4371360cfdcaea6a 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1674,11 +1674,13 @@ ret=0
 #
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta -f -l 20s bogus.example 2>&1 | sed 's/^/I:ns4 /'
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta badds.example 2>&1 | sed 's/^/I:ns4 /'
+$RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 reconfig # reconfig should maintain NTAs
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta -d > rndc.out.ns4.test$n.1
 lines=`wc -l < rndc.out.ns4.test$n.1`
 [ "$lines" -eq 2 ] || ret=1
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta secure.example 2>&1 | sed 's/^/I:ns4 /'
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta fakenode.secure.example 2>&1 | sed 's/^/I:ns4 /'
+$RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 reload # reload should maintain NTAs
 $RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 nta -d > rndc.out.ns4.test$n.2
 lines=`wc -l < rndc.out.ns4.test$n.2`
 [ "$lines" -eq 4 ] || ret=1

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index dc0e4d9c5cab457ccc44bab823b9915653de4ba7..4493dac52484fcc940190f82770fe7ebaaa39b01 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -692,7 +692,6 @@
     </itemizedlist>
   </section>
   <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
-
     <itemizedlist>
       <listitem>
        <para>
@@ -864,6 +863,12 @@
              already in progress. [RT #39649]
            </para>
          </listitem>
+         <listitem>
+           <para>
+             Negative trust anchors (NTAs) were incorrectly deleted
+             when the server was reloaded or reconfigured. [RT #41058]
+           </para>
+         </listitem>
        </itemizedlist>
       </listitem>
     </itemizedlist>