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

3908. [bug] rndc now differentiates between a zone in multiple

Browse Source 
views and a zone that doesn't exist at all. [RT #36691]
This commit is contained in:
Mark Andrews
2014-08-02 14:43:26 +10:00
parent 323bb31d7c
commit c38341ec43
9 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tests/system/zonechecks/tests.sh
View File

@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.10 2012/02/02 03:26:55 marka Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -237,5 +235,16 @@ checkfor "files: reload.db$" rndc.out.removeinclude
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I: checking 'rdnc zonestatus' with duplicated zone name"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus duplicate.example > rndc.out.duplicate 2>&1
checkfor "zone 'duplicate.example' was found in multiple views" rndc.out.duplicate
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus duplicate.example in primary > rndc.out.duplicate 2>&1
checkfor "name: duplicate.example" rndc.out.duplicate
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus nosuchzone.example > rndc.out.duplicate 2>&1
checkfor "no matching zone 'nosuchzone.example' in any view" rndc.out.duplicate
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status