ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3375. [func] Check that 'rndc dumpdb' works on a empty cache.

Browse Source 
[RT #30808]
This commit is contained in:
ckb
2012-09-13 19:34:00 -05:00
parent e4263037ec 4b97f08c1f
commit 5f7545bf48
7 changed files with 71 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -1,5 +1,8 @@
3375. [func] Check that 'rndc dumpdb' works on a empty cache.
[RT #30808]
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]
3372. [bug] Silence spurious "deleted from unreachable cache"
messages. [RT #30501]

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

@@ -18,4 +18,7 @@
rm -f ns2/*.db ns2/*.jnl
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

@@ -35,5 +35,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
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"
exit $status

2
doc/private/SRCID
View File

@@ -1,4 +1,4 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
SRCID="( 2012/09/12 08:15:00 UTC )"
SRCID="( 2012/09/14 00:15:00 UTC )"

4
lib/isc/include/isc/file.h
View File

@@ -103,8 +103,8 @@ isc_result_t
isc_file_bopenunique(char *templet, FILE **fp);
/*!<
* \brief Create and open a file with a unique name based on 'templet'.
* isc_file_bopen*() open the file in binary mode in Windows.
* isc_file_open*() open the file in text mode in Windows.
* isc_file_bopen*() open the file in binary mode in Windows.
* isc_file_open*() open the file in text mode in Windows.
*
* Notes:
*\li 'template' is a reserved work in C++. If you want to complain

2
util/copyrights
View File

@@ -2287,7 +2287,7 @@
./lib/isc/win32/interfaceiter.c C 1999,2000,2001,2004,2007,2008,2009,2012
./lib/isc/win32/ipv6.c C 1999,2000,2001,2004,2007
./lib/isc/win32/keyboard.c C 2000,2001,2004,2007
./lib/isc/win32/libisc.def X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
./lib/isc/win32/libisc.def X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/isc/win32/libisc.dsp X 2001,2002,2003,2004,2005,2006,2007,2008,2009
./lib/isc/win32/libisc.dsw X 2001
./lib/isc/win32/libisc.mak X 2001,2002,2003,2004,2005,2006,2007,2008,2009