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

Fix parsing of NZFs saved by rndc addzone with view specified (#39845)

Browse Source 
(cherry picked from commit 0439bfedd9)

Conflicts:
	bin/named/server.c
	bin/tests/system/addzone/tests.sh
This commit is contained in:
Mukund Sivaraman
2015-06-23 14:54:34 +05:30
parent 17bb17af46
commit 8134e7662e
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/tests/system/addzone/tests.sh
View File

@@ -267,6 +267,17 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:checking rndc reload causes named to reload the external view's NZF file ($n)"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
$DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.ext.$n > /dev/null || ret=1
grep '^a.added.example' dig.out.ns2.ext.$n > /dev/null || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:deleting newly added zone ($n)"
ret=0