Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
638
Issues
638
List
Boards
Labels
Service Desk
Milestones
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
aa49af83
Commit
aa49af83
authored
Oct 02, 2012
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3385. [bug] named-checkconf didn't detect missing master lists
in also-notify clauses. [RT #30810]
parent
74069f29
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
55 additions
and
14 deletions
+55
-14
CHANGES
CHANGES
+3
-0
bin/tests/system/checkconf/bad-also-notify.conf
bin/tests/system/checkconf/bad-also-notify.conf
+25
-0
bin/tests/system/checkconf/bad-many.conf
bin/tests/system/checkconf/bad-many.conf
+0
-0
bin/tests/system/checkconf/bad-tsig.conf
bin/tests/system/checkconf/bad-tsig.conf
+0
-0
bin/tests/system/checkconf/tests.sh
bin/tests/system/checkconf/tests.sh
+8
-11
lib/bind9/check.c
lib/bind9/check.c
+15
-0
lib/dns/masterdump.c
lib/dns/masterdump.c
+1
-1
util/copyrights
util/copyrights
+3
-2
No files found.
CHANGES
View file @
aa49af83
3385. [bug] named-checkconf didn't detect missing master lists
in also-notify clauses. [RT #30810]
3384. [bug] Improved logging of crypto errors. [RT #30963]
3383. [security] A certain combination of records in the RBT could
...
...
bin/tests/system/checkconf/bad-also-notify.conf
0 → 100644
View file @
aa49af83
/*
*
Copyright
(
C
)
2012
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
/
or
distribute
this
software
for
any
*
purpose
with
or
without
fee
is
hereby
granted
,
provided
that
the
above
*
copyright
notice
and
this
permission
notice
appear
in
all
copies
.
*
*
THE
SOFTWARE
IS
PROVIDED
"AS IS"
AND
ISC
DISCLAIMS
ALL
WARRANTIES
WITH
*
REGARD
TO
THIS
SOFTWARE
INCLUDING
ALL
IMPLIED
WARRANTIES
OF
MERCHANTABILITY
*
AND
FITNESS
.
IN
NO
EVENT
SHALL
ISC
BE
LIABLE
FOR
ANY
SPECIAL
,
DIRECT
,
*
INDIRECT
,
OR
CONSEQUENTIAL
DAMAGES
OR
ANY
DAMAGES
WHATSOEVER
RESULTING
FROM
*
LOSS
OF
USE
,
DATA
OR
PROFITS
,
WHETHER
IN
AN
ACTION
OF
CONTRACT
,
NEGLIGENCE
*
OR
OTHER
TORTIOUS
ACTION
,
ARISING
OUT
OF
OR
IN
CONNECTION
WITH
THE
USE
OR
*
PERFORMANCE
OF
THIS
SOFTWARE
.
*/
/*
*
Missing
master
in
also
-
notify
clause
.
*/
zone
dummy
{
type
master
;
file
"xxxx"
;
also
-
notify
{
xxxx
; };
};
bin/tests/system/checkconf/bad.conf
→
bin/tests/system/checkconf/bad
-many
.conf
View file @
aa49af83
File moved
bin/tests/system/checkconf/badtsig.conf
→
bin/tests/system/checkconf/bad
-
tsig.conf
View file @
aa49af83
File moved
bin/tests/system/checkconf/tests.sh
View file @
aa49af83
...
...
@@ -34,17 +34,14 @@ cmp good.conf.in good.conf.out || ret=1
if
[
$ret
!=
0
]
;
then
echo
"I:failed"
;
fi
status
=
`
expr
$status
+
$ret
`
echo
"I: checking that named-checkconf handles a known bad config"
ret
=
0
$CHECKCONF
bad.conf
>
/dev/null 2>&1
&&
ret
=
1
if
[
$?
!=
1
]
;
then
echo
"I:failed"
;
ret
=
1
;
fi
status
=
`
expr
$status
+
$ret
`
echo
"I: checking that named-checkconf handles a known bad tsig secret"
ret
=
0
$CHECKCONF
badtsig.conf
>
/dev/null 2>&1
if
[
$?
!=
1
]
;
then
echo
"I:failed"
;
ret
=
1
;
fi
status
=
`
expr
$status
+
$ret
`
for
bad
in
bad
*
.conf
do
ret
=
0
echo
"I: checking that named-checkconf detects error in
$bad
"
$CHECKCONF
$bad
>
/dev/null 2>&1
if
[
$?
!=
1
]
;
then
echo
"I:failed"
;
ret
=
1
;
fi
status
=
`
expr
$status
+
$ret
`
done
echo
"I: checking named-checkconf dnssec warnings"
ret
=
0
...
...
lib/bind9/check.c
View file @
aa49af83
...
...
@@ -1548,6 +1548,21 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
}
/*
* Master & slave zones must have a "also-notify" field.
*/
if
(
ztype
==
MASTERZONE
||
ztype
==
SLAVEZONE
)
{
obj
=
NULL
;
tresult
=
cfg_map_get
(
zoptions
,
"also-notify"
,
&
obj
);
if
(
tresult
==
ISC_R_SUCCESS
)
{
isc_uint32_t
count
;
tresult
=
validate_masters
(
obj
,
config
,
&
count
,
logctx
,
mctx
);
if
(
tresult
!=
ISC_R_SUCCESS
&&
result
==
ISC_R_SUCCESS
)
result
=
tresult
;
}
}
/*
* Slave & stub zones must have a "masters" field.
*/
...
...
lib/dns/masterdump.c
View file @
aa49af83
...
...
@@ -1492,7 +1492,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
}
result
=
dns_dbiterator_first
(
dctx
->
dbiter
);
if
(
result
!=
ISC_R_SUCCESS
&&
result
!=
ISC_R_NOMORE
)
if
(
result
!=
ISC_R_SUCCESS
)
goto
cleanup
;
dctx
->
first
=
ISC_FALSE
;
...
...
util/copyrights
View file @
aa49af83
...
...
@@ -654,8 +654,9 @@
./bin/tests/system/cacheclean/ns1/named.conf CONF-C 2001,2004,2005,2007,2011
./bin/tests/system/cacheclean/ns2/named.conf CONF-C 2001,2004,2005,2007,2011
./bin/tests/system/cacheclean/tests.sh SH 2001,2004,2007,2011,2012
./bin/tests/system/checkconf/bad.conf CONF-C 2005,2007
./bin/tests/system/checkconf/badtsig.conf CONF-C 2012
./bin/tests/system/checkconf/bad-also-notify.conf CONF-C 2012
./bin/tests/system/checkconf/bad-many.conf CONF-C 2005,2012
./bin/tests/system/checkconf/bad-tsig.conf CONF-C 2012
./bin/tests/system/checkconf/clean.sh SH 2011,2012
./bin/tests/system/checkconf/dnssec.1 CONF-C 2011
./bin/tests/system/checkconf/dnssec.2 CONF-C 2011
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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