upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 02:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

3118. [bug] nsupdate could dump core on shutdown when using

Browse source 
SIG(0) keys. [RT #24604]
This commit is contained in:
Evan Hunt 2011-05-23 22:24:12 +00:00
parent 2c51b017ae
commit d9ebd3015c
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
3118. [bug] nsupdate could dump core on shutdown when using
SIG(0) keys. [RT #24604]
3113. [doc] Document the relationship between serial-query-rate
and NOTIFY messages.

9
bin/nsupdate/nsupdate.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsupdate.c,v 1.163.48.17 2011/03/12 04:57:24 tbox Exp $ */
/* $Id: nsupdate.c,v 1.163.48.18 2011/05/23 22:24:12 each Exp $ */
/*! \file */
@ -617,8 +617,10 @@ setup_keyfile(void) {
keyfile, isc_result_totext(result));
return;
}
} else
} else {
dst_key_attach(dstkey, &sig0key);
dst_key_free(&dstkey);
}
}
static void
@ -2707,6 +2709,9 @@ cleanup(void) {
}
#endif
if (sig0key != NULL)
dst_key_free(&sig0key);
ddebug("Shutting down task manager");
isc_taskmgr_destroy(&taskmgr);

3
bin/tests/system/nsupdate/clean.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.12.250.2 2011/02/03 12:16:45 tbox Exp $
# $Id: clean.sh,v 1.12.250.3 2011/05/23 22:24:12 each Exp $
#
# Clean up after zone transfer tests.
@ -29,3 +29,4 @@ rm -f */named.memstats
rm -f ns3/dnskey.test.db.signed.jnl ns3/dnskey.test.db ns3/dnskey.test.db.signed ns3/dsset-dnskey.test.
rm -f ns3/K*
rm -f dig.out.ns3.*
rm -f Kxxx.*

11
bin/tests/system/nsupdate/tests.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.25.332.2 2011/02/03 12:16:45 tbox Exp $
# $Id: tests.sh,v 1.25.332.3 2011/05/23 22:24:12 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@ -59,6 +59,15 @@ echo "I:comparing post-update copies to known good data"
$PERL ../digcomp.pl knowngood.ns1.after dig.out.ns1 || status=1
$PERL ../digcomp.pl knowngood.ns1.after dig.out.ns2 || status=1
ret=0
echo "I:check SIG(0) key is accepted"
key=`$KEYGEN -r random.data -a NSEC3RSASHA1 -b 512 -k -n ENTITY xxx 2> /dev/null`
echo "" | $NSUPDATE -k ${key}.private > /dev/null 2>&1 || ret=1
if [ $ret -ne 0 ]; then
echo "I:failed"
status=1
fi
if $PERL -e 'use Net::DNS;' 2>/dev/null
then
echo "I:running update.pl test"