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

3057. [bug] "rndc secroots" would abort after the first error

Browse Source 
and so could miss some views. [RT #23488]
This commit is contained in:
Evan Hunt
2011-03-03 16:16:47 +00:00
parent 5a742faf60
commit f385bac3b9
6 changed files with 79 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/tests/system/dlvauto/tests.sh
View File

@@ -12,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.2 2011/03/01 22:44:04 marka Exp $
# $Id: tests.sh,v 1.3 2011/03/03 16:16:46 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -42,4 +42,18 @@ else
status=1
fi
n=`expr $n + 1`
echo "I:checking that only the DLV key was imported from bind.keys ($n)"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 secroots 2>&1 | sed 's/^/I:ns2 /'
linecount=`grep "\./RSAMD5/.* ; managed" ns2/named.secroots | wc -l`
[ "$linecount" -eq 0 ] || ret=1
linecount=`grep "dlv.isc.org/RSAMD5/.* ; managed" ns2/named.secroots | wc -l`
[ "$linecount" -eq 2 ] || ret=1
linecount=`cat ns2/named.secroots | wc -l`
[ "$linecount" -eq 13 ] || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
exit $status