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

3582. [bug] Silence false positive warning regarding missing file

Browse Source 
directive for inline slave zones.  [RT #33662]
(cherry picked from commit 1e34fe9044)
This commit is contained in:
Mark Andrews
2013-06-04 11:34:03 +10:00
parent 286ef95ba5
commit 5123e11853
6 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/tests/system/checkconf/inline-bad.conf Normal file
View File

@@ -0,0 +1,14 @@
acl "transferees" {};
masters "stealthMasters" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;};
zone "example.net" {
type slave;
key-directory "/var/lib/bind/example.net";
auto-dnssec maintain;
inline-signing yes;
masters { stealthMasters; };
notify explicit;
also-notify { publicSlaves; };
allow-transfer { localhost; transferees; };
};

15
bin/tests/system/checkconf/inline-good.conf Normal file
View File

@@ -0,0 +1,15 @@
acl "transferees" {};
masters "stealthMasters" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;};
zone "example.net" {
type slave;
file "/var/cache/bind/example.net.db";
key-directory "/var/lib/bind/example.net";
auto-dnssec maintain;
inline-signing yes;
masters { stealthMasters; };
notify explicit;
also-notify { publicSlaves; };
allow-transfer { localhost; transferees; };
};

14
bin/tests/system/checkconf/inline-no.conf Normal file
View File

@@ -0,0 +1,14 @@
acl "transferees" {};
masters "stealthMasters" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;};
zone "example.net" {
type slave;
key-directory "/var/lib/bind/example.net";
auto-dnssec maintain;
inline-signing no;
masters { stealthMasters; };
notify explicit;
also-notify { publicSlaves; };
allow-transfer { localhost; transferees; };
};

10
bin/tests/system/checkconf/tests.sh
View File

@@ -104,5 +104,15 @@ n=`$CHECKCONF bad-dnssec.conf 2>&1 | grep "update-check-ksk.*requires inline" |
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I: check file + inline-signing for slave zones"
n=`$CHECKCONF inline-no.conf 2>&1 | grep "missing 'file' entry" | wc -l`
[ $n -eq 0 ] || ret=1
n=`$CHECKCONF inline-good.conf 2>&1 | grep "missing 'file' entry" | wc -l`
[ $n -eq 0 ] || ret=1
n=`$CHECKCONF inline-bad.conf 2>&1 | grep "missing 'file' entry" | wc -l`
[ $n -eq 1 ] || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status