fix secondkey test, properly

This commit is contained in:
Evan Hunt 2012-06-20 22:44:06 -07:00
parent 72012bd370
commit 55479af81f
4 changed files with 29 additions and 6 deletions

View file

@ -0,0 +1,27 @@
/*
* Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium.
*
* 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.
*/
/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
options {
default-key "secondkey";
};
key secondkey {
secret "abcd1234abcd8765";
algorithm hmac-md5;
};

View file

@ -1,4 +0,0 @@
key secondkey {
secret "abcd1234abcd8765";
algorithm hmac-md5;
};

View file

@ -227,7 +227,7 @@ status=`expr $status + $ret`
echo "I:test using second key"
ret=0
$RNDC -s 10.53.0.2 -p 9953 -c ../common/rndc.conf -k ns2/secondkey.key status > /dev/null || ret=1
$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`

View file

@ -1130,7 +1130,7 @@
./bin/tests/system/resolver/tests.sh SH 2000,2001,2004,2007,2009,2010,2011,2012
./bin/tests/system/rndc/clean.sh SH 2011
./bin/tests/system/rndc/ns2/named.conf CONF-C 2011,2012
./bin/tests/system/rndc/ns2/secondkey.key X 2012
./bin/tests/system/rndc/ns2/secondkey.conf CONF-C 2012
./bin/tests/system/rndc/setup.sh SH 2011
./bin/tests/system/rndc/tests.sh SH 2011,2012
./bin/tests/system/rpz/.gitignore X 2012