mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9

Browse Source
This commit is contained in:
Jeremy C. Reed
2014-04-10 17:16:23 -05:00
parent 7ee973f74c 4f1435ca32
commit d06f13912c
42 changed files with 7624 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@@ -1,3 +1,10 @@
--- 9.10.0 released ---
3806. [test] Improved system test portability. [RT #35625]
3805. [contrib] Added contrib/perftcpdns, a performance testing tool
for DNS over TCP. [RT #35710]
--- 9.10.0rc1 released ---
3804. [bug] Corrected a race condition in dispatch.c in which

4
bin/dnssec/Makefile.in
View File

@@ -56,12 +56,12 @@ SRCS = dnssec-dsfromkey.c dnssec-keyfromlabel.c dnssec-keygen.c \
MANPAGES = dnssec-dsfromkey.8 dnssec-keyfromlabel.8 dnssec-keygen.8 \
dnssec-revoke.8 dnssec-settime.8 dnssec-signzone.8 \
dnssec-verify.8
dnssec-verify.8 dnssec-importkey.8
HTMLPAGES = dnssec-dsfromkey.html dnssec-keyfromlabel.html \
dnssec-keygen.html dnssec-revoke.html \
dnssec-settime.html dnssec-signzone.html \
dnssec-verify.html
dnssec-verify.html dnssec-importkey.html
MANOBJS = ${MANPAGES} ${HTMLPAGES}

81
bin/dnssec/dnssec-importkey.8
View File

@@ -16,97 +16,100 @@
.\"
.hy 0
.ad l
'\" t
.\" Title: dnssec-importkey
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: August 30, 2013
.\" Title: dnssec\-importkey
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
.\" Date: February 20, 2014
.\" Manual: BIND9
.\" Source: BIND9
.\" Language: English
.\"
.TH "DNSSEC\-IMPORTKEY" "8" "August 30, 2013" "BIND9" "BIND9"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.TH "DNSSEC\-IMPORTKEY" "8" "February 20, 2014" "BIND9" "BIND9"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
dnssec-importkey \- Import DNSKEY records from external systems so they can be managed\&.
dnssec\-importkey \- Import DNSKEY records from external systems so they can be managed.
.SH "SYNOPSIS"
.HP 17
\fBdnssec\-importkey\fR [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-K\ \fR\fB\fIdirectory\fR\fR] [\fB\-P\ \fR\fB\fIdate/offset\fR\fR] [\fB\-D\ \fR\fB\fIdate/offset\fR\fR] [\fB\-h\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fBkeyname\fR]
\fBdnssec\-importkey\fR [\fB\-K\ \fR\fB\fIdirectory\fR\fR] [\fB\-L\ \fR\fB\fIttl\fR\fR] [\fB\-P\ \fR\fB\fIdate/offset\fR\fR] [\fB\-D\ \fR\fB\fIdate/offset\fR\fR] [\fB\-h\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] {\fBkeyfile\fR}
.HP 17
\fBdnssec\-importkey\fR {\fB\-f\ \fR\fB\fIfilename\fR\fR} [\fB\-K\ \fR\fB\fIdirectory\fR\fR] [\fB\-L\ \fR\fB\fIttl\fR\fR] [\fB\-P\ \fR\fB\fIdate/offset\fR\fR] [\fB\-D\ \fR\fB\fIdate/offset\fR\fR] [\fB\-h\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fBdnsname\fR]
.SH "DESCRIPTION"
.PP
\fBdnssec\-importkey\fR
read a DNSKEY record and generated a \&.key/\&.private key pair\&. Publication (\fB\-P\fR) and deletions (\fB\-D\fR) times can be set for the key\&.
reads a public DNSKEY record and generates a pair of .key/.private files. The DNSKEY record may be read from an existing .key file, in which case a corresponding .private file will be generated, or it may be read from any other file or from the standard input, in which case both .key and .private files will be generated.
.PP
The newly\-created .private file does
\fInot\fR
contain private key data, and cannot be used for signing. However, having a .private file makes it possible to set publication (\fB\-P\fR) and deletion (\fB\-D\fR) times for the key, which means the public key can be added to and removed from the DNSKEY RRset on schedule even if the true private key is stored offline.
.SH "OPTIONS"
.PP
\-f \fIfilename\fR
.RS 4
Filename to read the key from\&.
Zone file mode: instead of a public keyfile name, the argument is the DNS domain name of a zone master file, which can be read from
\fBfile\fR. If the domain name is the same as
\fBfile\fR, then it may be omitted.
.sp
If
\fBfile\fR
is set to
"\-", then the zone data is read from the standard input.
.RE
.PP
\-K \fIdirectory\fR
.RS 4
Sets the directory in which the key files are to reside\&.
Sets the directory in which the key files are to reside.
.RE
.PP
\-L \fIttl\fR
.RS 4
Sets the default TTL to use for this key when it is converted into a DNSKEY RR\&. If the key is imported into a zone, this is the TTL that will be used for it, unless there was already a DNSKEY RRset in place, in which case the existing TTL would take precedence\&. importkey the default TTL to
Sets the default TTL to use for this key when it is converted into a DNSKEY RR. If the key is imported into a zone, this is the TTL that will be used for it, unless there was already a DNSKEY RRset in place, in which case the existing TTL would take precedence. Setting the default TTL to
0
or
none
removes it\&.
removes it.
.RE
.PP
\-h
.RS 4
Emit usage message and exit\&.
Emit usage message and exit.
.RE
.PP
\-v \fIlevel\fR
.RS 4
Sets the debugging level\&.
Sets the debugging level.
.RE
.SH "TIMING OPTIONS"
.PP
Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS\&. If the argument begins with a \*(Aq+\*(Aq or \*(Aq\-\*(Aq, it is interpreted as an offset from the present time\&. For convenience, if such an offset is followed by one of the suffixes \*(Aqy\*(Aq, \*(Aqmo\*(Aq, \*(Aqw\*(Aq, \*(Aqd\*(Aq, \*(Aqh\*(Aq, or \*(Aqmi\*(Aq, then the offset is computed in years (defined as 365 24\-hour days, ignoring leap years), months (defined as 30 24\-hour days), weeks, days, hours, or minutes, respectively\&. Without a suffix, the offset is computed in seconds\&. To unset a date, use \*(Aqnone\*(Aq\&.
Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS. If the argument begins with a '+' or '\-', it is interpreted as an offset from the present time. For convenience, if such an offset is followed by one of the suffixes 'y', 'mo', 'w', 'd', 'h', or 'mi', then the offset is computed in years (defined as 365 24\-hour days, ignoring leap years), months (defined as 30 24\-hour days), weeks, days, hours, or minutes, respectively. Without a suffix, the offset is computed in seconds. To explicitly prevent a date from being set, use 'none' or 'never'.
.PP
\-P \fIdate/offset\fR
.RS 4
Sets the date on which a key is to be published to the zone\&. After that date, the key will be included in the zone but will not be used to sign it\&.
Sets the date on which a key is to be published to the zone. After that date, the key will be included in the zone but will not be used to sign it.
.RE
.PP
\-D \fIdate/offset\fR
.RS 4
Sets the date on which the key is to be deleted\&. After that date, the key will no longer be included in the zone\&. (It may remain in the key repository, however\&.)
Sets the date on which the key is to be deleted. After that date, the key will no longer be included in the zone. (It may remain in the key repository, however.)
.RE
.SH "FILES"
.PP
A keyfile can be designed by the key identification
\fIKnnnn.+aaa+iiiii\fR
or the full file name
\fIKnnnn.+aaa+iiiii.key\fR
as generated by
dnssec\-keygen(8).
.SH "SEE ALSO"
.PP
\fBdnssec-keygen\fR(8),
\fBdnssec-signzone\fR(8),
\fBdnssec\-keygen\fR(8),
\fBdnssec\-signzone\fR(8),
BIND 9 Administrator Reference Manual,
RFC 5011\&.
RFC 5011.
.SH "AUTHOR"
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
.br
Copyright \(co 2013 Internet Systems Consortium, Inc. ("ISC")
Copyright \(co 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
.br

80
bin/dnssec/dnssec-importkey.html
View File

@@ -19,9 +19,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>dnssec-importkey</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<meta name="generator" content="DocBook XSL Stylesheets V1.71.1">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry">
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
<a name="man.dnssec-importkey"></a><div class="titlepage"></div>
<div class="refnamediv">
<h2>Name</h2>
@@ -29,23 +29,45 @@
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">dnssec-importkey</code> [<code class="option">-f <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-h</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">keyname</code>]</p></div>
<div class="cmdsynopsis"><p><code class="command">dnssec-importkey</code> [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-L <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-h</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {<code class="option">keyfile</code>}</p></div>
<div class="cmdsynopsis"><p><code class="command">dnssec-importkey</code> {<code class="option">-f <em class="replaceable"><code>filename</code></em></code>} [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-L <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-h</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">dnsname</code>]</p></div>
</div>
<div class="refsect1">
<a name="idp5321760"></a><h2>DESCRIPTION</h2>
<p><span class="command"><strong>dnssec-importkey</strong></span>
read a DNSKEY record and generated a .key/.private key pair.
Publication (<code class="option">-P</code>) and deletions (<code class="option">-D</code>)
times can be set for the key.
<div class="refsect1" lang="en">
<a name="id2543458"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-importkey</strong></span>
reads a public DNSKEY record and generates a pair of
.key/.private files. The DNSKEY record may be read from an
existing .key file, in which case a corresponding .private file
will be generated, or it may be read from any other file or
from the standard input, in which case both .key and .private
files will be generated.
</p>
<p>
The newly-created .private file does <span class="emphasis"><em>not</em></span>
contain private key data, and cannot be used for signing.
However, having a .private file makes it possible to set
publication (<code class="option">-P</code>) and deletion
(<code class="option">-D</code>) times for the key, which means the
public key can be added to and removed from the DNSKEY RRset
on schedule even if the true private key is stored offline.
</p>
</div>
<div class="refsect1">
<a name="idp5324080"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl class="variablelist">
<div class="refsect1" lang="en">
<a name="id2543483"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-f <em class="replaceable"><code>filename</code></em></span></dt>
<dd><p>
Filename to read the key from.
</p></dd>
<dd>
<p>
Zone file mode: instead of a public keyfile name, the argument
is the DNS domain name of a zone master file, which can be read
from <code class="option">file</code>. If the domain name is the same as
<code class="option">file</code>, then it may be omitted.
</p>
<p>
If <code class="option">file</code> is set to <code class="literal">"-"</code>, then
the zone data is read from the standard input.
</p>
</dd>
<dt><span class="term">-K <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
Sets the directory in which the key files are to reside.
@@ -56,7 +78,7 @@
into a DNSKEY RR. If the key is imported into a zone,
this is the TTL that will be used for it, unless there was
already a DNSKEY RRset in place, in which case the existing TTL
would take precedence. importkey the default TTL to
would take precedence. Setting the default TTL to
<code class="literal">0</code> or <code class="literal">none</code> removes it.
</p></dd>
<dt><span class="term">-h</span></dt>
@@ -69,8 +91,8 @@
</p></dd>
</dl></div>
</div>
<div class="refsect1">
<a name="idp5336224"></a><h2>TIMING OPTIONS</h2>
<div class="refsect1" lang="en">
<a name="id2543601"></a><h2>TIMING OPTIONS</h2>
<p>
Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
If the argument begins with a '+' or '-', it is interpreted as
@@ -79,9 +101,10 @@
then the offset is computed in years (defined as 365 24-hour days,
ignoring leap years), months (defined as 30 24-hour days), weeks,
days, hours, or minutes, respectively. Without a suffix, the offset
is computed in seconds. To unset a date, use 'none'.
is computed in seconds. To explicitly prevent a date from being
set, use 'none' or 'never'.
</p>
<div class="variablelist"><dl class="variablelist">
<div class="variablelist"><dl>
<dt><span class="term">-P <em class="replaceable"><code>date/offset</code></em></span></dt>
<dd><p>
Sets the date on which a key is to be published to the zone.
@@ -96,16 +119,25 @@
</p></dd>
</dl></div>
</div>
<div class="refsect1">
<a name="idp5342816"></a><h2>SEE ALSO</h2>
<div class="refsect1" lang="en">
<a name="id2543648"></a><h2>FILES</h2>
<p>
A keyfile can be designed by the key identification
<code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
<code class="filename">Knnnn.+aaa+iiiii.key</code> as generated by
<span class="refentrytitle">dnssec-keygen</span>(8).
</p>
</div>
<div class="refsect1" lang="en">
<a name="id2543669"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
<em class="citetitle">RFC 5011</em>.
</p>
</div>
<div class="refsect1">
<a name="idp5346704"></a><h2>AUTHOR</h2>
<div class="refsect1" lang="en">
<a name="id2543702"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>

2
bin/tests/system/autosign/setup.sh
View File

@@ -19,7 +19,7 @@ SYSTEMTESTTOP=..
. ./clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
echo "I:generating keys and preparing zones"
cd ns1 && sh keygen.sh

2
bin/tests/system/dlv/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
(cd ns1 && sh -e sign.sh)

2
bin/tests/system/dlvauto/setup.sh
View File

@@ -19,6 +19,6 @@ SYSTEMTESTTOP=..
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/dlzexternal/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
$DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key

2
bin/tests/system/dns64/setup.sh
View File

@@ -19,6 +19,6 @@ sh clean.sh
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/dnssec/setup.sh
View File

@@ -20,7 +20,7 @@ SYSTEMTESTTOP=..
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/dsdigest/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/ecdsa/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/filter-aaaa/setup.sh
View File

@@ -19,7 +19,7 @@ sh clean.sh
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cp ns1/named1.conf ns1/named.conf
cp ns2/named1.conf ns2/named.conf

2
bin/tests/system/gost/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh sign.sh

2
bin/tests/system/inline/setup.sh
View File

@@ -17,7 +17,7 @@ sh clean.sh
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cp ns1/root.db.in ns1/root.db
rm -f ns1/root.db.signed

2
bin/tests/system/masterformat/setup.sh
View File

@@ -15,7 +15,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
rm -f named-compilezone
ln -s $CHECKZONE named-compilezone

2
bin/tests/system/metadata/setup.sh
View File

@@ -18,7 +18,7 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh ./clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
pzone=parent.nil
czone=child.parent.nil

2
bin/tests/system/nsupdate/setup.sh
View File

@@ -18,7 +18,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
#
# jnl and database files MUST be removed before we start

2
bin/tests/system/pending/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh -e sign.sh

2
bin/tests/system/redirect/setup.sh
View File

@@ -20,7 +20,7 @@ SYSTEMTESTTOP=..
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cp ns2/redirect.db.in ns2/redirect.db
cp ns2/example.db.in ns2/example.db

2
bin/tests/system/resolver/setup.sh
View File

@@ -17,7 +17,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cp ns4/tld1.db ns4/tld.db
cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db

2
bin/tests/system/rndc/setup.sh
View File

@@ -21,7 +21,7 @@ SYSTEMTESTTOP=..
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
sh ../genzone.sh 2 >ns2/nil.db
sh ../genzone.sh 2 >ns2/other.db

2
bin/tests/system/rpz/setup.sh
View File

@@ -37,7 +37,7 @@ for NM in '' -2 -given -disabled -passthru -no-op -nodata -nxdomain -cname -wild
done
# sign the root and a zone in ns2
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
# $1=directory, $2=domain name, $3=input zone file, $4=output file
signzone () {

2
bin/tests/system/rsabigexponent/prereq.sh
View File

@@ -17,7 +17,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
if ./bigkey > /dev/null 2>&1
then

2
bin/tests/system/rsabigexponent/setup.sh
View File

@@ -19,6 +19,6 @@ sh clean.sh
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh -e sign.sh

2
bin/tests/system/smartsign/setup.sh
View File

@@ -18,4 +18,4 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

2
bin/tests/system/staticstub/setup.sh
View File

@@ -21,6 +21,6 @@ sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' ns2/named
sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' ns3/named.conf.in > ns3/named.conf
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns3 && sh -e sign.sh

2
bin/tests/system/testcrypto.sh
View File

@@ -17,7 +17,7 @@
SYSTEMTESTTOP=${SYSTEMTESTTOP:=..}
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
prog=$0

2
bin/tests/system/tkey/setup.sh
View File

@@ -20,6 +20,6 @@ SYSTEMTESTTOP=..
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
cd ns1 && sh setup.sh

2
bin/tests/system/tsiggss/setup.sh
View File

@@ -19,7 +19,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
rm -f ns1/*.jnl ns1/K*.key ns1/K*.private ns1/_default.tsigkeys

2
bin/tests/system/unknown/setup.sh
View File

@@ -16,6 +16,6 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
(cd ns3; sh -e sign.sh)

2
bin/tests/system/verify/setup.sh
View File

@@ -18,6 +18,6 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
(cd zones && sh genzones.sh)

2
bin/tests/system/wildcard/setup.sh
View File

@@ -17,6 +17,6 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
(cd ns1 && sh -e sign.sh)

2
bin/tests/system/zonechecks/setup.sh
View File

@@ -18,7 +18,7 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
sh ../genzone.sh 1 > ns1/master.db
cd ns1

4
contrib/README
View File

@@ -11,6 +11,10 @@ and other useful additions to BIND 9. It includes:
A DNS query performance testing tool
- perftcpdns/
A performance testing tool for DNS over TCP
- dane/
mkdane.sh generates TLSA records for use with DNS-based

21
contrib/perftcpdns/Makefile.in Normal file
View File

@@ -0,0 +1,21 @@
# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
CC = @CC@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
DEFS = @DEFS@
perftcpdns: perftcpdns.o $(LIBOBJS)
$(CC) $(CFLAGS) $(DEFS) $(LDFLAGS) perftcpdns.o $(LIBOBJS) $(LIBS) -o perftcpdns
perftcpdns.o: perftcpdns.c
$(CC) $(CFLAGS) $(DEFS) -c perftcpdns.c
clean:
rm -f *.o perftcpdns
distclean: clean
rm -f config.log
rm -f config.cache
rm -f config.status
rm -f Makefile

4270
contrib/perftcpdns/configure vendored Executable file
View File

File diff suppressed because it is too large Load Diff

62
contrib/perftcpdns/configure.in Normal file
View File

@@ -0,0 +1,62 @@
# Copyright (C) 2014 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 INTERNET SOFTWARE CONSORTIUM
# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
# INTERNET SOFTWARE CONSORTIUM 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.
#
AC_INIT(perftcpdns.c)
AC_PREREQ(2.13)
AC_PROG_CC
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(rt, clock_gettime)
case "$host" in
*-freebsd*)
# We don't want to set -lpthread as that break
# the ability to choose threads library at final
# link time and is not valid for all architectures.
PTHREAD=
if test "X$GCC" = "Xyes"; then
saved_cc="$CC"
CC="$CC -pthread"
AC_MSG_CHECKING(for gcc -pthread support);
AC_TRY_LINK([#include <pthread.h>],
[printf("%x\n", pthread_create);],
PTHREAD="yes"
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
CC="$saved_cc"
fi
if test "X$PTHREAD" != "Xyes"; then
AC_CHECK_LIB(pthread, pthread_create,,
AC_CHECK_LIB(thr, thread_create,,
AC_CHECK_LIB(c_r, pthread_create,,
AC_CHECK_LIB(c, pthread_create,,
AC_MSG_ERROR("could not find thread libraries")))))
fi
;;
*)
AC_CHECK_LIB(pthread, pthread_create,,
AC_CHECK_LIB(pthread, __pthread_create,,
AC_CHECK_LIB(pthread, __pthread_create_system,,
AC_CHECK_LIB(c_r, pthread_create,,
AC_CHECK_LIB(c, pthread_create,,
AC_MSG_ERROR("could not find thread libraries"))))))
;;
esac
AC_OUTPUT(Makefile)

2476
contrib/perftcpdns/perftcpdns.c Normal file
View File

File diff suppressed because it is too large Load Diff

1321
doc/arm/Bv9ARM.pdf
View File

File diff suppressed because it is too large Load Diff

4
util/copyrights
View File

@@ -2443,6 +2443,10 @@
./contrib/nslint-3.0a2/savestr.h X 2001,2014
./contrib/nslint-3.0a2/strerror.c X 2001,2014
./contrib/nslint-3.0a2/version.h X 2014
./contrib/perftcpdns/Makefile.in MAKE 2014
./contrib/perftcpdns/configure X 2014
./contrib/perftcpdns/configure.in SH 2014
./contrib/perftcpdns/perftcpdns.c C 2013,2014
./contrib/query-loc-0.4.0/ADDRESSES X 2008
./contrib/query-loc-0.4.0/ALGO X 2008
./contrib/query-loc-0.4.0/INSTALL X 2008

4
version
View File

@@ -6,6 +6,6 @@ DESCRIPTION=
MAJORVER=9
MINORVER=10
PATCHVER=0
RELEASETYPE=rc
RELEASEVER=1
RELEASETYPE=
RELEASEVER=
EXTENSIONS=