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

Added test to verify that both include glob-expression and include

Browse Source 
non-glob-expression works.
This commit is contained in:
Diego Fronza
2019-10-22 10:43:24 -03:00
parent a50ab3df86
commit f97ba7a7c2
8 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tests/system/include-multiplecfg/ns2/mars.com.db Normal file
View File

@@ -0,0 +1,13 @@
$TTL 86400
@ IN SOA dns1.mars.com. hostmaster.mars.com. (
2001062501 ; serial
21600 ; refresh after 6 hours
3600 ; retry after 1 hour
604800 ; expire after 1 week
86400 ) ; minimum TTL of 1 day
IN NS dns1.mars.com.
IN A 10.53.0.1
dns1 IN A 10.53.0.1

6
bin/tests/system/include-multiplecfg/ns2/mars.conf Normal file
View File

@@ -0,0 +1,6 @@
zone "mars.com" {
type master;
file "mars.com.db";
};

9
bin/tests/system/include-multiplecfg/ns2/named.conf.in
View File

@@ -18,10 +18,9 @@ options {
notify no;
};
#zone "." {
# type hint;
# file "../../common/root.hint";
#};
# Should include all files matching pattern.
include "zone*.conf";
# Shouldn't break standard file pattern.
include "mars.conf";

8
bin/tests/system/include-multiplecfg/ns2/zone1.com.db
View File

@@ -7,15 +7,7 @@ $TTL 86400
86400 ) ; minimum TTL of 1 day
IN NS dns1.zone1.com.
IN NS dns2.zone1.com.
IN MX 10 mail1.zone1.com.
IN MX 20 mail2.zone1.com.
IN A 10.53.0.1
dns1 IN A 10.53.0.1
dns2 IN A 10.53.0.2
mail1 IN A 10.53.0.1
mail2 IN A 10.53.0.2

2
bin/tests/system/include-multiplecfg/ns2/zone1.conf
View File

@@ -2,7 +2,5 @@
zone "zone1.com" {
type master;
file "zone1.com.db";
allow-transfer { any; };
allow-update { any; };
};

8
bin/tests/system/include-multiplecfg/ns2/zone2.com.db
View File

@@ -7,15 +7,7 @@ $TTL 86400
86400 ) ; minimum TTL of 1 day
IN NS dns1.zone2.com.
IN NS dns2.zone2.com.
IN MX 10 mail1.zone2.com.
IN MX 20 mail2.zone2.com.
IN A 10.53.0.1
dns1 IN A 10.53.0.1
dns2 IN A 10.53.0.2
mail1 IN A 10.53.0.1
mail2 IN A 10.53.0.2

2
bin/tests/system/include-multiplecfg/ns2/zone2.conf
View File

@@ -2,7 +2,5 @@
zone "zone2.com" {
type master;
file "zone2.com.db";
allow-transfer { any; };
allow-update { any; };
};

14
bin/tests/system/include-multiplecfg/tests.sh
View File

@@ -22,7 +22,7 @@ n=0
# Test 1 - check if zone1 was loaded.
n=`expr $n + 1`
echo_i "test $n: glob include zone1"
echo_i "checking glob include of zone1 config ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 zone1.com. a > dig.out.ns2.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
@@ -32,7 +32,7 @@ status=`expr $status + $ret`
# Test 2 - check if zone2 was loaded.
n=`expr $n + 1`
echo_i "test $n: glob include zone2"
echo_i "checking glob include of zone2 config ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 zone2.com. a > dig.out.ns2.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
@@ -40,5 +40,15 @@ grep '^zone2.com.' dig.out.ns2.$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
# Test 3 - check if standard file path (no magic chars) works.
n=`expr $n + 1`
echo_i "checking include of standard file path config ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 mars.com. a > dig.out.ns2.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null || ret=1
grep '^mars.com.' dig.out.ns2.$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1