Commit 1e34fe90 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

                        directive for inline slave zones.  [RT #33662]
parent ff8ab6be
3582. [bug] Silence false positive warning regarding missing file
directive for inline slave zones. [RT #33662]
3581. [bug] Changed the tcp-listen-queue default to 10. [RT #33029]
3580. [bug] Addressed a possible race in acache.c [RT #33602]
......
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; };
};
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; };
};
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; };
};
......@@ -107,6 +107,18 @@ n=`$CHECKCONF bad-dnssec.conf 2>&1 | grep "dnssec-loadkeys-interval.*requires in
[ $n -eq 1 ] || ret=1
n=`$CHECKCONF bad-dnssec.conf 2>&1 | grep "update-check-ksk.*requires inline" | wc -l`
[ $n -eq 1 ] || ret=1
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: checking named-checkconf DLZ warnings"
ret=0
......
......@@ -1930,8 +1930,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
obj = NULL;
res1 = cfg_map_get(zoptions, "inline-signing", &obj);
if ((tresult != ISC_R_SUCCESS &&
(ztype == MASTERZONE || ztype == HINTZONE)) ||
(ztype == SLAVEZONE && res1 == ISC_R_SUCCESS)) {
(ztype == MASTERZONE || ztype == HINTZONE ||
(ztype == SLAVEZONE && res1 == ISC_R_SUCCESS &&
cfg_obj_asboolean(obj))))) {
cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
"zone '%s': missing 'file' entry",
znamestr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment