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

Merge in xfer test changes from 9.5

Browse Source
This commit is contained in:
Evan Hunt
2008-01-22 05:00:24 +00:00
parent e6e075b0cd
commit 705c6a0dac
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/xfer/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.9.12.6 2007/08/28 07:19:11 tbox Exp $
# $Id: clean.sh,v 1.9.12.7 2008/01/22 05:00:24 each Exp $
#
# Clean up after zone transfer tests.
@@ -24,3 +24,4 @@
rm -f dig.out.ns2 dig.out.ns3
rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
rm -f ns3/example.bk ns3/tsigzone.bk ns3/example.bk.jnl
rm -f */named.memstats

12
bin/tests/system/xfer/ns2/named.conf
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.15.12.7 2007/08/28 07:19:11 tbox Exp $ */
/* $Id: named.conf,v 1.15.12.8 2008/01/22 05:00:24 each Exp $ */
controls { /* empty */ };
@@ -35,8 +35,12 @@ options {
include "../../common/controls.conf";
key tsigzone. {
algorithm hmac-md5;
secret "1234abcd8765";
algorithm hmac-md5;
secret "1234abcd8765";
};
acl tzkey {
key tsigzone.;
};
zone "." {
@@ -52,5 +56,5 @@ zone "example" {
zone "tsigzone" {
type master;
file "tsigzone.db";
allow-transfer { key tsigzone.; };
allow-transfer { tzkey; };
};

4
bin/tests/system/xfer/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.24.12.10 2007/08/28 07:19:11 tbox Exp $
# $Id: tests.sh,v 1.24.12.11 2008/01/22 05:00:24 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -66,7 +66,7 @@ $DIG $DIGOPTS tsigzone. \
> dig.out.ns3 || tmp=1
grep ";" dig.out.ns3 > /dev/null
if test $? -ne 0 ; then break; fi
echo "I: TSIG zone re-transfer"
echo "I: plain zone re-transfer"
sleep 5
done
if test $tmp -eq 1 ; then status=1; fi