Commit 6b851914 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] NTAs did not survive reoad/reconfig

4251.	[bug]		NTAs were deleted when the server was reconfigured
			or reloaded. [RT #41058]
parent 09f82f50
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 4250. [func] Log the TSIG key in use during inbound zone
transfers. [RT #41075] transfers. [RT #41075]
......
...@@ -6786,6 +6786,8 @@ load_configuration(const char *filename, ns_server_t *server, ...@@ -6786,6 +6786,8 @@ load_configuration(const char *filename, ns_server_t *server,
goto cleanup; goto cleanup;
} }
(void) ns_server_loadnta(server);
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
cleanup: cleanup:
...@@ -7055,8 +7057,6 @@ run_server(isc_task_t *task, isc_event_t *event) { ...@@ -7055,8 +7057,6 @@ run_server(isc_task_t *task, isc_event_t *event) {
isc_hash_init(); isc_hash_init();
CHECKFATAL(load_zones(server, ISC_TRUE), "loading zones"); CHECKFATAL(load_zones(server, ISC_TRUE), "loading zones");
(void) ns_server_loadnta(server);
} }
void void
......
...@@ -1674,11 +1674,13 @@ ret=0 ...@@ -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 -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 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 $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=`wc -l < rndc.out.ns4.test$n.1`
[ "$lines" -eq 2 ] || ret=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 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 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 $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=`wc -l < rndc.out.ns4.test$n.2`
[ "$lines" -eq 4 ] || ret=1 [ "$lines" -eq 4 ] || ret=1
......
...@@ -692,7 +692,6 @@ ...@@ -692,7 +692,6 @@
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info> <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
...@@ -864,6 +863,12 @@ ...@@ -864,6 +863,12 @@
already in progress. [RT #39649] already in progress. [RT #39649]
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Negative trust anchors (NTAs) were incorrectly deleted
when the server was reloaded or reconfigured. [RT #41058]
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment