Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
2bef3713
Commit
2bef3713
authored
Jun 23, 2005
by
Mark Andrews
Browse files
1890. [func] Add a system test for named-checkconf. [RT #14931]
parent
80874188
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
2bef3713
1890. [func] Add a system test for named-checkconf. [RT #14931]
1889. [func] The lame cache is now done on a <qname,qclass,qtype>
basis as some servers only appear to be lame for
certain query types. [RT #14916]
...
...
bin/check/named-checkconf.c
View file @
2bef3713
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.3
4
2005/06/2
0
0
1:03:48
marka Exp $ */
/* $Id: named-checkconf.c,v 1.3
5
2005/06/2
3
0
6:52:22
marka Exp $ */
/*! \file */
...
...
@@ -400,10 +400,6 @@ main(int argc, char **argv) {
RUNTIME_CHECK
(
isc_hash_create
(
mctx
,
ectx
,
DNS_NAME_MAXWIRE
)
==
ISC_R_SUCCESS
);
RUNTIME_CHECK
(
isc_entropy_create
(
mctx
,
&
ectx
)
==
ISC_R_SUCCESS
);
RUNTIME_CHECK
(
isc_hash_create
(
mctx
,
ectx
,
DNS_NAME_MAXWIRE
)
==
ISC_R_SUCCESS
);
dns_result_register
();
RUNTIME_CHECK
(
cfg_parser_create
(
mctx
,
logc
,
&
parser
)
==
ISC_R_SUCCESS
);
...
...
@@ -430,8 +426,6 @@ main(int argc, char **argv) {
cfg_parser_destroy
(
&
parser
);
isc_hash_destroy
();
isc_log_destroy
(
&
logc
);
isc_hash_destroy
();
...
...
bin/tests/system/checkconf/bad.conf
0 → 100644
View file @
2bef3713
/*
*
Copyright
(
C
)
2005
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
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
.
*/
/* $
Id
:
bad
.
conf
,
v
1
.
2
2005
/
06
/
23
06
:
52
:
23
marka
Exp
$ */
options
{
avoid
-
v4
-
udp
-
ports
{
100
; }
avoid
-
v6
-
udp
-
ports
{
100
; };
blackhole
{
10
.
0
.
0
.
0
/
8
; };
coresize
1
G
;
datasize
100
M
;
deallocate
-
on
-
exit
yes
;
directory
"."
;
dump
-
file
"named_dumpdb"
;
fake
-
iquery
yes
;
files
1000
;
has
-
old
-
clients
no
;
heartbeat
-
interval
30
;
host
-
statistics
yes
;
host
-
statistics
-
max
100
;
hostname
none
;
interface
-
interval
30
;
listen
-
on
port
90
{
any
; };
listen
-
on
port
100
{
127
.
0
.
0
.
1
; };
listen
-
on
-
v6
port
53
{
none
; };
match
-
mapped
-
addresses
yes
;
memstatistics
-
file
"named.memstats"
;
multiple
-
cnames
no
;
named
-
xfer
"this is no longer needed"
;
pid
-
file
none
;
port
5300
;
querylog
yes
;
recursing
-
file
"named.recursing"
;
random
-
device
"/dev/random"
;
recursive
-
clients
3000
;
serial
-
queries
10
;
serial
-
query
-
rate
100
;
server
-
id
none
;
};
bin/tests/system/checkconf/good.conf
0 → 100644
View file @
2bef3713
/*
*
Copyright
(
C
)
2005
Internet
Systems
Consortium
,
Inc
. (
"ISC"
)
*
*
Permission
to
use
,
copy
,
modify
,
and
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
.
*/
/* $
Id
:
good
.
conf
,
v
1
.
2
2005
/
06
/
23
06
:
52
:
23
marka
Exp
$ */
/*
*
This
is
just
a
random
selection
of
configuration
options
.
*/
options
{
avoid
-
v4
-
udp
-
ports
{
100
; };
avoid
-
v6
-
udp
-
ports
{
100
; };
blackhole
{
10
.
0
.
0
.
0
/
8
; };
coresize
1
G
;
datasize
100
M
;
deallocate
-
on
-
exit
yes
;
directory
"."
;
dump
-
file
"named_dumpdb"
;
fake
-
iquery
yes
;
files
1000
;
has
-
old
-
clients
no
;
heartbeat
-
interval
30
;
host
-
statistics
yes
;
host
-
statistics
-
max
100
;
hostname
none
;
interface
-
interval
30
;
listen
-
on
port
90
{
any
; };
listen
-
on
port
100
{
127
.
0
.
0
.
1
; };
listen
-
on
-
v6
port
53
{
none
; };
match
-
mapped
-
addresses
yes
;
memstatistics
-
file
"named.memstats"
;
multiple
-
cnames
no
;
named
-
xfer
"this is no longer needed"
;
pid
-
file
none
;
port
5300
;
querylog
yes
;
recursing
-
file
"named.recursing"
;
random
-
device
"/dev/random"
;
recursive
-
clients
3000
;
serial
-
queries
10
;
serial
-
query
-
rate
100
;
server
-
id
none
;
};
bin/tests/system/checkconf/tests.sh
0 → 100644
View file @
2bef3713
# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and 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.
# $Id: tests.sh,v 1.1 2005/06/23 06:52:23 marka Exp $
SYSTEMTESTTOP
=
..
.
$SYSTEMTESTTOP
/conf.sh
status
=
0
echo
"I: checking that named-checkconf handles a known good config"
ret
=
0
$CHECKCONF
good.conf
>
/dev/null 2>&1
||
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
=
1
$CHECKCONF
bad.conf
>
/dev/null 2>&1
||
ret
=
0
if
[
$ret
!=
0
]
;
then
echo
"I:failed"
;
fi
status
=
`
expr
$status
+
$ret
`
echo
"I:exit status:
$status
"
exit
$status
bin/tests/system/conf.sh.in
View file @
2bef3713
...
...
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: conf.sh.in,v 1.3
0
2005/06/2
2
0
0:10:30
marka Exp $
# $Id: conf.sh.in,v 1.3
1
2005/06/2
3
0
6:52:22
marka Exp $
#
# Common configuration data for system tests, to be sourced into
...
...
@@ -38,13 +38,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate
KEYGEN
=
$TOP
/bin/dnssec/dnssec-keygen
SIGNER
=
$TOP
/bin/dnssec/dnssec-signzone
CHECKZONE
=
$TOP
/bin/check/named-checkzone
CHECKCONF
=
$TOP
/bin/check/named-checkconf
# The "stress" test is not run by default since it creates enough
# load on the machine to make it unusable to other users.
# v6synth
SUBDIRS
=
"cacheclean checknames dnssec forward glue ixfr limits
lwresd
\
masterfile masterformat notify nsupdate resolver sortlist stub
tkey
\
unknown upforwd views xfer xferquota zonechecks"
SUBDIRS
=
"cacheclean
checkconf
checknames dnssec forward glue ixfr limits
\
lwresd
masterfile masterformat notify nsupdate resolver sortlist stub
\
tkey
unknown upforwd views xfer xferquota zonechecks"
# PERL will be an empty string if no perl interpreter was found.
PERL
=
@PERL@
...
...
util/copyrights
View file @
2bef3713
...
...
@@ -421,6 +421,9 @@
./bin/tests/system/cacheclean/ns2/.cvsignore X 2001
./bin/tests/system/cacheclean/ns2/named.conf CONF-C 2001,2004
./bin/tests/system/cacheclean/tests.sh SH 2001,2004
./bin/tests/system/checkconf/bad.conf CONF-C 2005
./bin/tests/system/checkconf/good.conf CONF-C 2005
./bin/tests/system/checkconf/tests.sh SH 2005
./bin/tests/system/checknames/clean.sh SH 2004
./bin/tests/system/checknames/ns1/fail.example.db.in ZONE 2004
./bin/tests/system/checknames/ns1/fail.update.db.in ZONE 2004
...
...
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