mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 16:45:24 +00:00
Code Issues Releases Wiki Activity

3375. [bug] 'rndc dumpdb' failed on empty caches. [RT #30808]

Browse Source
This commit is contained in:
Mark Andrews
2012-09-14 07:53:19 +10:00
parent e272bc7e5b
commit 5f26ffc2b4
5 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
3375. [bug] 'rndc dumpdb' failed on empty caches. [RT #30808]
3374. [bug] isc_parse_uint32 failed to return a range error on 3374. [bug] isc_parse_uint32 failed to return a range error on
systems with 64 bit longs [RT #30232] systems with 64 bit longs [RT #30232]

5
bin/tests/system/rndc/clean.sh
View File

@@ -18,4 +18,7 @@
rm -f ns2/*.db ns2/*.jnl rm -f ns2/*.db ns2/*.jnl
rm -f ns2/session.key rm -f ns2/session.key
rm -f ns2/named.memstats rm -f ns2/named.stats
rm -f ns3/named_dump.db
rm -f ns*/named.memstats
rm -f ns*/named.run

45
bin/tests/system/rndc/ns3/named.conf Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
controls { /* empty */ };
options {
port 5300;
pid-file "named.pid";
listen-on { 10.53.0.3; };
listen-on-v6 { none; };
recursion no;
};
key rndc_key {
secret "1234abcd8765";
algorithm hmac-md5;
};
key secondkey {
secret "abcd1234abcd8765";
algorithm hmac-md5;
};
controls {
inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; secondkey; };
};
zone "." {
type hint;
file "../../common/root.hint";
};

14
bin/tests/system/rndc/tests.sh
View File

@@ -239,5 +239,19 @@ $RNDC -s 10.53.0.2 -p 9953 -c ns2/secondkey.conf status > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
echo "I:test 'rndc dumpdb' on a empty cache"
ret=0
$RNDC -s 10.53.0.3 -p 9953 -c ../common/rndc.conf dumpdb > /dev/null || ret=1
for i in 1 2 3 4 5 6 7 8 9
do
tmp=0
grep "Dump complete" ns3/named_dump.db > /dev/null || tmp=1
[ $tmp -eq 0 ] && break
sleep 1
done
[ $tmp -eq 1 ] && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status" echo "I:exit status: $status"
exit $status exit $status

2
lib/dns/masterdump.c
View File

@@ -1492,7 +1492,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
} }
result = dns_dbiterator_first(dctx->dbiter); result = dns_dbiterator_first(dctx->dbiter);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS && result != ISC_R_NOMORE)
goto cleanup; goto cleanup;
dctx->first = ISC_FALSE; dctx->first = ISC_FALSE;