Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
b75970ef
Commit
b75970ef
authored
Dec 14, 2018
by
Mark Andrews
Browse files
named-checkconf triggered a assertion when a mirror zone had a bad name
parent
314a25e4
Pipeline
#8214
passed with stages
in 21 minutes and 59 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
b75970ef
5116. [bug] Named/named-checkconf triggered a assertion when
a mirror zone's name is bad. [GL #778]
5115. [bug] Allow unsupported algorithms in zone when not used for
signing with dnssec-signzone. [GL #783]
...
...
bin/tests/system/checkconf/bad-mirror-zonename.conf
0 → 100644
View file @
b75970ef
zone
"\0example"
{
type
mirror
;
file
"example.db"
;
};
lib/bind9/check.c
View file @
b75970ef
...
...
@@ -1958,7 +1958,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
unsigned
int
i
;
dns_rdataclass_t
zclass
;
dns_fixedname_t
fixedname
;
dns_name_t
*
zname
=
NULL
;
dns_name_t
*
zname
=
NULL
;
/* NULL if parsing of zone name fails. */
isc_buffer_t
b
;
bool
root
=
false
;
bool
rfc1918
=
false
;
...
...
@@ -1977,10 +1977,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
};
static
optionstable
dialups
[]
=
{
{
"notify"
,
CFG_ZONE_MASTER
|
CFG_ZONE_SLAVE
},
{
"notify-passive"
,
CFG_ZONE_SLAVE
},
{
"passive"
,
CFG_ZONE_SLAVE
|
CFG_ZONE_STUB
},
{
"refresh"
,
CFG_ZONE_SLAVE
|
CFG_ZONE_STUB
},
{
"notify"
,
CFG_ZONE_MASTER
|
CFG_ZONE_SLAVE
},
{
"notify-passive"
,
CFG_ZONE_SLAVE
},
{
"passive"
,
CFG_ZONE_SLAVE
|
CFG_ZONE_STUB
},
{
"refresh"
,
CFG_ZONE_SLAVE
|
CFG_ZONE_STUB
},
};
znamestr
=
cfg_obj_asstring
(
cfg_tuple_get
(
zconfig
,
"name"
));
...
...
@@ -2273,7 +2273,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
* server list is used in the absence of one explicitly specified.
*/
if
(
ztype
==
CFG_ZONE_SLAVE
||
ztype
==
CFG_ZONE_STUB
||
(
ztype
==
CFG_ZONE_MIRROR
&&
!
dns_name_equal
(
zname
,
dns_rootname
)))
(
ztype
==
CFG_ZONE_MIRROR
&&
zname
!=
NULL
&&
!
dns_name_equal
(
zname
,
dns_rootname
)))
{
obj
=
NULL
;
if
(
cfg_map_get
(
zoptions
,
"masters"
,
&
obj
)
!=
ISC_R_SUCCESS
)
{
...
...
@@ -2567,7 +2568,6 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
}
}
/*
* Check that max-zone-ttl isn't used with masterfile-format map
*/
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment