upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 10:01:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "added gitignore, removed cvsignore"

Browse source 
This reverts commit e8ae173655.
This commit is contained in:
Evan Hunt 2012-03-05 08:24:17 -08:00
parent 1b08bce8c7
commit f94af76649
355 changed files with 1405 additions and 1595 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.cvsignore Normal file
View file

@ -0,0 +1,9 @@
Makefile
config.log
config.h
config.cache
config.status
libtool
isc-config.sh
configure.lineno
autom4te.cache

15
CHANGES
View file

@ -3,6 +3,10 @@
3290. [bug] <isc/hmacsha.h> was not being installed. [RT #28169]
--- 9.9.0 released ---
--- 9.9.0rc4 released ---
3289. [bug] 'rndc retransfer' failed for inline zones. [RT #28036]
3288. [bug] dlz_destroy() function wasn't correctly registered
@ -13,6 +17,8 @@
3286. [bug] Managed key maintenance timer could fail to start
after 'rndc reconfig'. [RT #26786]
--- 9.9.0rc3 released ---
3285. [bug] val-frdataset was incorrectly disassociated in
proveunsecure after calling startfinddlvsep.
[RT #27928]
@ -51,15 +57,6 @@
option had been misspelled as '-clear'. (To avoid
future confusion, both options now work.) [RT #27173]
3274. [placeholder]
3273. [bug] AAAA responses could be returned in the additional
section even when filter-aaaa-on-v4 was in use.
[RT #27292]
3272. [func] New "rndc zonestatus" command prints information
about the specified zone. [RT #21671]
3271. [port] darwin: mksymtbl is not always stable, loop several
times before giving up. mksymtbl was using non
portable perl to covert 64 bit hex strings. [RT #27653]

1
bin/.cvsignore Normal file
View file

@ -0,0 +1 @@
Makefile

6
bin/check/.cvsignore Normal file
View file

@ -0,0 +1,6 @@
Makefile
.libs
*.la
*.lo
named-checkconf
named-checkzone

3
bin/confgen/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
Makefile
ddns-confgen
rndc-confgen

1
bin/confgen/unix/.cvsignore Normal file
View file

@ -0,0 +1 @@
Makefile

6
bin/dig/.cvsignore Normal file
View file

@ -0,0 +1,6 @@
Makefile
dig
host
nslookup
*.lo
.libs

11
bin/dnssec/.cvsignore Normal file
View file

@ -0,0 +1,11 @@
Makefile
dnssec-dsfromkey
dnssec-keyfromlabel
dnssec-keygen
dnssec-makekeyset
dnssec-revoke
dnssec-settime
dnssec-signkey
dnssec-signzone
*.lo
.libs

7
bin/named/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
Makefile
.libs
*.la
*.lo
named
named-symtbl.c
lwresd

4
bin/named/bind.keys.h
View file

@ -1,6 +1,6 @@
/*
* Generated by bindkeys.pl 1.7 2011/01/04 23:47:13 tbox Exp
* From bind.keys 1.7 2011/01/03 23:45:07 each Exp
* Generated by bindkeys.pl 1.7 2011-01-04 23:47:13 tbox Exp
* From bind.keys 1.7 2011-01-03 23:45:07 each Exp
*/
#define TRUSTED_KEYS "\
# The bind.keys file is used to override the built-in DNSSEC trust anchors\n\

30
bin/named/client.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.286 2012/01/31 23:47:30 tbox Exp $ */
/* $Id: client.c,v 1.284 2011/11/09 22:05:09 each Exp $ */
#include <config.h>
@ -929,15 +929,6 @@ ns_client_send(ns_client_t *client) {
render_opts = 0;
else
render_opts = DNS_MESSAGERENDER_OMITDNSSEC;
preferred_glue = 0;
if (client->view != NULL) {
if (client->view->preferred_glue == dns_rdatatype_a)
preferred_glue = DNS_MESSAGERENDER_PREFER_A;
else if (client->view->preferred_glue == dns_rdatatype_aaaa)
preferred_glue = DNS_MESSAGERENDER_PREFER_AAAA;
}
#ifdef ALLOW_FILTER_AAAA_ON_V4
/*
* filter-aaaa-on-v4 yes or break-dnssec option to suppress
@ -946,15 +937,17 @@ ns_client_send(ns_client_t *client) {
* that we have both AAAA and A records,
* and that we either have no signatures that the client wants
* or we are supposed to break DNSSEC.
*
* Override preferred glue if necessary.
*/
if ((client->attributes & NS_CLIENTATTR_FILTER_AAAA) != 0) {
if ((client->attributes & NS_CLIENTATTR_FILTER_AAAA) != 0)
render_opts |= DNS_MESSAGERENDER_FILTER_AAAA;
if (preferred_glue == DNS_MESSAGERENDER_PREFER_AAAA)
preferred_glue = DNS_MESSAGERENDER_PREFER_A;
}
#endif
preferred_glue = 0;
if (client->view != NULL) {
if (client->view->preferred_glue == dns_rdatatype_a)
preferred_glue = DNS_MESSAGERENDER_PREFER_A;
else if (client->view->preferred_glue == dns_rdatatype_aaaa)
preferred_glue = DNS_MESSAGERENDER_PREFER_AAAA;
}
/*
* XXXRTH The following doesn't deal with TCP buffer resizing.
@ -2117,9 +2110,6 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {
client->recursionquota = NULL;
client->interface = NULL;
client->peeraddr_valid = ISC_FALSE;
#ifdef ALLOW_FILTER_AAAA_ON_V4
client->filter_aaaa = dns_v4_aaaa_ok;
#endif
ISC_EVENT_INIT(&client->ctlevent, sizeof(client->ctlevent), 0, NULL,
NS_EVENT_CLIENTCONTROL, client_start, client, client,
NULL, NULL);

6
bin/named/control.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: control.c,v 1.49 2012/01/31 23:47:31 tbox Exp $ */
/* $Id: control.c,v 1.47 2011/11/03 23:05:30 each Exp $ */
/*! \file */
@ -207,8 +207,6 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
result = ns_server_del_zone(ns_g_server, command);
} else if (command_compare(command, NS_COMMAND_SIGNING)) {
result = ns_server_signing(ns_g_server, command, text);
} else if (command_compare(command, NS_COMMAND_ZONESTATUS)) {
result = ns_server_zonestatus(ns_g_server, command, text);
} else {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,

7
bin/named/include/named/client.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.h,v 1.96 2012/01/31 23:47:31 tbox Exp $ */
/* $Id: client.h,v 1.94 2011/10/11 23:46:44 tbox Exp $ */
#ifndef NAMED_CLIENT_H
#define NAMED_CLIENT_H 1
@ -141,9 +141,6 @@ struct ns_client {
isc_netaddr_t destaddr;
struct in6_pktinfo pktinfo;
isc_event_t ctlevent;
#ifdef ALLOW_FILTER_AAAA_ON_V4
dns_v4_aaaa_t filter_aaaa;
#endif
/*%
* Information about recent FORMERR response(s), for
* FORMERR loop avoidance. This is separate for each

5
bin/named/include/named/control.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: control.h,v 1.38 2012/01/31 23:47:31 tbox Exp $ */
/* $Id: control.h,v 1.36 2011/10/28 06:20:04 each Exp $ */
#ifndef NAMED_CONTROL_H
#define NAMED_CONTROL_H 1
@ -65,7 +65,6 @@
#define NS_COMMAND_DELZONE "delzone"
#define NS_COMMAND_SYNC "sync"
#define NS_COMMAND_SIGNING "signing"
#define NS_COMMAND_ZONESTATUS "zonestatus"
isc_result_t
ns_controls_create(ns_server_t *server, ns_controls_t **ctrlsp);

11
bin/named/include/named/server.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.h,v 1.118 2012/01/31 23:47:31 tbox Exp $ */
/* $Id: server.h,v 1.116 2011/11/03 23:05:30 each Exp $ */
#ifndef NAMED_SERVER_H
#define NAMED_SERVER_H 1
@ -348,11 +348,4 @@ ns_server_del_zone(ns_server_t *server, char *args);
*/
isc_result_t
ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text);
/*%
* Lists status information for a given zone (e.g., name, type, files,
* load time, expiry, etc).
*/
isc_result_t
ns_server_zonestatus(ns_server_t *server, char *args, isc_buffer_t *text);
#endif /* NAMED_SERVER_H */

2
bin/named/main.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.187 2012/02/06 23:46:44 tbox Exp $ */
/* $Id: main.c,v 1.185.64.2 2012/02/06 23:46:22 tbox Exp $ */
/*! \file */

66
bin/named/query.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.384 2012/02/07 01:07:47 marka Exp $ */
/* $Id: query.c,v 1.381.16.1 2012/02/07 01:09:42 marka Exp $ */
/*! \file */
@ -1352,10 +1352,6 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
}
if (qtype == dns_rdatatype_a) {
#ifdef ALLOW_FILTER_AAAA_ON_V4
isc_boolean_t have_a = ISC_FALSE;
#endif
/*
* We now go looking for A and AAAA records, along with
* their signatures.
@ -1394,9 +1390,6 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
}
if (result == ISC_R_SUCCESS) {
mname = NULL;
#ifdef ALLOW_FILTER_AAAA_ON_V4
have_a = ISC_TRUE;
#endif
if (!query_isduplicate(client, fname,
dns_rdatatype_a, &mname)) {
if (mname != NULL) {
@ -1443,17 +1436,6 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
}
if (result == ISC_R_SUCCESS) {
mname = NULL;
/*
* There's an A; check whether we're filtering AAAA
*/
#ifdef ALLOW_FILTER_AAAA_ON_V4
if (have_a &&
(client->filter_aaaa == dns_v4_aaaa_break_dnssec ||
(client->filter_aaaa == dns_v4_aaaa_filter &&
(!WANTDNSSEC(client) || sigrdataset == NULL ||
!dns_rdataset_isassociated(sigrdataset)))))
goto addname;
#endif
if (!query_isduplicate(client, fname,
dns_rdatatype_aaaa, &mname)) {
if (mname != NULL) {
@ -6656,21 +6638,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
need_wildcardproof = ISC_TRUE;
}
#ifdef ALLOW_FILTER_AAAA_ON_V4
if (client->view->v4_aaaa != dns_v4_aaaa_ok &&
is_v4_client(client) &&
ns_client_checkaclsilent(client, NULL,
client->view->v4_aaaa_acl,
ISC_TRUE) == ISC_R_SUCCESS)
client->filter_aaaa = client->view->v4_aaaa;
else
client->filter_aaaa = dns_v4_aaaa_ok;
#endif
if (type == dns_rdatatype_any) {
#ifdef ALLOW_FILTER_AAAA_ON_V4
isc_boolean_t have_aaaa, have_a, have_sig;
isc_boolean_t have_aaaa, have_a, have_sig, filter_aaaa;
/*
* The filter-aaaa-on-v4 option should
@ -6682,6 +6652,14 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
have_aaaa = ISC_FALSE;
have_a = !authoritative;
have_sig = ISC_FALSE;
if (client->view->v4_aaaa != dns_v4_aaaa_ok &&
is_v4_client(client) &&
ns_client_checkaclsilent(client, NULL,
client->view->v4_aaaa_acl,
ISC_TRUE) == ISC_R_SUCCESS)
filter_aaaa = ISC_TRUE;
else
filter_aaaa = ISC_FALSE;
#endif
/*
* XXXRTH Need to handle zonecuts with special case
@ -6716,7 +6694,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* Notice the presence of A and AAAAs so
* that AAAAs can be hidden from IPv4 clients.
*/
if (client->filter_aaaa != dns_v4_aaaa_ok) {
if (filter_aaaa) {
if (rdataset->type == dns_rdatatype_aaaa)
have_aaaa = ISC_TRUE;
else if (rdataset->type == dns_rdatatype_a)
@ -6773,12 +6751,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* Filter AAAAs if there is an A and there is no signature
* or we are supposed to break DNSSEC.
*/
if (client->filter_aaaa == dns_v4_aaaa_break_dnssec)
if (filter_aaaa && have_aaaa && have_a &&
(!have_sig || !WANTDNSSEC(client) ||
client->view->v4_aaaa == dns_v4_aaaa_break_dnssec))
client->attributes |= NS_CLIENTATTR_FILTER_AAAA;
else if (client->filter_aaaa != dns_v4_aaaa_ok &&
have_aaaa && have_a &&
(!have_sig || !WANTDNSSEC(client)))
client->attributes |= NS_CLIENTATTR_FILTER_AAAA;
#endif
if (fname != NULL)
dns_message_puttempname(client->message, &fname);
@ -6839,11 +6815,15 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* so fundamentally wrong, unavoidably inaccurate, and
* unneeded that it is best to keep it as short as possible.
*/
if (client->filter_aaaa == dns_v4_aaaa_break_dnssec ||
(client->filter_aaaa == dns_v4_aaaa_filter &&
(!WANTDNSSEC(client) || sigrdataset == NULL ||
!dns_rdataset_isassociated(sigrdataset))))
{
if (client->view->v4_aaaa != dns_v4_aaaa_ok &&
is_v4_client(client) &&
ns_client_checkaclsilent(client, NULL,
client->view->v4_aaaa_acl,
ISC_TRUE) == ISC_R_SUCCESS &&
(!WANTDNSSEC(client) ||
sigrdataset == NULL ||
!dns_rdataset_isassociated(sigrdataset) ||
client->view->v4_aaaa == dns_v4_aaaa_break_dnssec)) {
if (qtype == dns_rdatatype_aaaa) {
trdataset = query_newrdataset(client);
result = dns_db_findrdataset(db, node, version,

263
bin/named/server.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.647 2012/02/23 06:53:15 marka Exp $ */
/* $Id: server.c,v 1.638.4.5 2012/02/23 07:02:18 marka Exp $ */
/*! \file */
@ -5897,11 +5897,6 @@ next_token(char **stringp, const char *delim) {
* Find the zone specified in the control channel command 'args',
* if any. If a zone is specified, point '*zonep' at it, otherwise
* set '*zonep' to NULL.
*
* If 'zonetxt' is set, the caller has already pulled a token
* off the command line that is to be used as the zone name. (This
* is done when it's necessary to check for an optional argument
* before the zone name, as in "rndc sync [-clean] zone".)
*/
static isc_result_t
zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
@ -8044,259 +8039,3 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
return (result);
}
isc_result_t
ns_server_zonestatus(ns_server_t *server, char *args, isc_buffer_t *text) {
isc_result_t result = ISC_R_SUCCESS;
dns_zone_t *zone = NULL, *raw = NULL;
const char *type, *file, *zonename = NULL;
isc_uint32_t serial, signed_serial, nodes;
char serbuf[16], sserbuf[16], nodebuf[16], resignbuf[512];
char lbuf[80], xbuf[80], rbuf[80], kbuf[80], rtbuf[80];
isc_time_t loadtime, expiretime, refreshtime;
isc_time_t refreshkeytime, resigntime;
dns_zonetype_t zonetype;
isc_boolean_t dynamic = ISC_FALSE, frozen = ISC_FALSE;
isc_boolean_t hasraw = ISC_FALSE;
isc_boolean_t secure, maintain, allow;
dns_db_t *db = NULL, *rawdb = NULL;
char **incfiles = NULL;
int nfiles = 0;
isc_time_settoepoch(&loadtime);
isc_time_settoepoch(&refreshtime);
isc_time_settoepoch(&expiretime);
isc_time_settoepoch(&refreshkeytime);
isc_time_settoepoch(&resigntime);
CHECK(zone_from_args(server, args, NULL, &zone, &zonename, ISC_TRUE));
if (result != ISC_R_SUCCESS)
return (result);
if (zone == NULL) {
result = ISC_R_UNEXPECTEDEND;
goto cleanup;
}
zonetype = dns_zone_gettype(zone);
switch (zonetype) {
case dns_zone_master:
type = "master";
break;
case dns_zone_slave:
type = "slave";
break;
case dns_zone_stub:
type = "stub";
break;
case dns_zone_staticstub:
type = "staticstub";
break;
case dns_zone_redirect:
type = "redirect";
break;
case dns_zone_key:
type = "key";
break;
case dns_zone_dlz:
type = "dlz";
break;
default:
type = "unknown";
}
/* Inline signing? */
CHECK(dns_zone_getdb(zone, &db));
dns_zone_getraw(zone, &raw);
hasraw = ISC_TF(raw != NULL);
if (hasraw)
CHECK(dns_zone_getdb(raw, &rawdb));
/* Serial number */
serial = dns_zone_getserial(hasraw ? raw : zone);
snprintf(serbuf, sizeof(serbuf), "%d", serial);
if (hasraw) {
signed_serial = dns_zone_getserial(zone);
snprintf(sserbuf, sizeof(sserbuf), "%d", signed_serial);
}
/* Database node count */
nodes = dns_db_nodecount(hasraw ? rawdb : db);
snprintf(nodebuf, sizeof(nodebuf), "%d", nodes);
/* Security */
secure = dns_db_issecure(db);
allow = ISC_TF((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_ALLOW) != 0);
maintain = ISC_TF((dns_zone_getkeyopts(zone) &
DNS_ZONEKEY_MAINTAIN) != 0);
/* Master files */
file = dns_zone_getfile(hasraw ? raw : zone);
nfiles = dns_zone_getincludes(hasraw ? raw : zone, &incfiles);
/* Load time */
dns_zone_getloadtime(zone, &loadtime);
isc_time_formathttptimestamp(&loadtime, lbuf, sizeof(lbuf));
/* Refresh/expire times */
if (zonetype == dns_zone_slave ||
zonetype == dns_zone_stub ||
zonetype == dns_zone_redirect)
{
dns_zone_getexpiretime(zone, &expiretime);
isc_time_formathttptimestamp(&expiretime, xbuf, sizeof(xbuf));
dns_zone_getrefreshtime(zone, &refreshtime);
isc_time_formathttptimestamp(&refreshtime, rbuf, sizeof(rbuf));
}
/* Key refresh time */
if (zonetype == dns_zone_master ||
(zonetype == dns_zone_slave && hasraw))
{
dns_zone_getrefreshkeytime(zone, &refreshkeytime);
isc_time_formathttptimestamp(&refreshkeytime, kbuf,
sizeof(kbuf));
}
/* Dynamic? */
if (zonetype == dns_zone_master) {
dynamic = dns_zone_isdynamic(hasraw ? raw : zone, ISC_TRUE);
frozen = dynamic && !dns_zone_isdynamic(hasraw ? raw : zone,
ISC_FALSE);
}
/* Next resign event */
if (secure && (zonetype == dns_zone_master ||
(zonetype == dns_zone_slave && hasraw)) &&
((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_NORESIGN) == 0))
{
dns_name_t *name;
dns_fixedname_t fixed;
dns_rdataset_t next;
dns_db_t *signingdb;
dns_rdataset_init(&next);
dns_fixedname_init(&fixed);
name = dns_fixedname_name(&fixed);
signingdb = hasraw ? rawdb : db;
result = dns_db_getsigningtime(signingdb, &next, name);
if (result == ISC_R_SUCCESS) {
isc_stdtime_t timenow;
char namebuf[DNS_NAME_FORMATSIZE];
char typebuf[DNS_RDATATYPE_FORMATSIZE];
isc_stdtime_get(&timenow);
dns_name_format(name, namebuf, sizeof(namebuf));
dns_rdatatype_format(next.covers,
typebuf, sizeof(typebuf));
snprintf(resignbuf, sizeof(resignbuf),
"%s/%s", namebuf, typebuf);
isc_time_set(&resigntime, next.resign, 0);
isc_time_formathttptimestamp(&resigntime, rtbuf,
sizeof(rtbuf));
dns_rdataset_disassociate(&next);
}
}
/* Create text */
isc_buffer_putstr(text, "name: ");
isc_buffer_putstr(text, zonename);
isc_buffer_putstr(text, "\ntype: ");
isc_buffer_putstr(text, type);
if (file != NULL) {
int i;
isc_buffer_putstr(text, "\nfiles: ");
isc_buffer_putstr(text, dns_zone_getfile(zone));
for (i = 0; i < nfiles; i++) {
isc_buffer_putstr(text, ", ");
if (incfiles[i] != NULL)
isc_buffer_putstr(text, incfiles[i]);
}
}
isc_buffer_putstr(text, "\nserial: ");
isc_buffer_putstr(text, serbuf);
if (hasraw) {
isc_buffer_putstr(text, "\nsigned serial: ");
isc_buffer_putstr(text, sserbuf);
}
isc_buffer_putstr(text, "\nnodes: ");
isc_buffer_putstr(text, nodebuf);
if (! isc_time_isepoch(&loadtime)) {
isc_buffer_putstr(text, "\nlast loaded: ");
isc_buffer_putstr(text, lbuf);
}
if (! isc_time_isepoch(&refreshtime)) {
isc_buffer_putstr(text, "\nnext refresh: ");
isc_buffer_putstr(text, rbuf);
}
if (! isc_time_isepoch(&expiretime)) {
isc_buffer_putstr(text, "\nexpires: ");
isc_buffer_putstr(text, lbuf);
}
if (secure) {
isc_buffer_putstr(text, "\nsecure: yes");
if (hasraw)
isc_buffer_putstr(text, "\ninline signing: yes");
else
isc_buffer_putstr(text, "\ninline signing: no");
} else
isc_buffer_putstr(text, "\nsecure: no");
if (maintain) {
isc_buffer_putstr(text, "\nkey maintenance: automatic");
if (! isc_time_isepoch(&refreshkeytime)) {
isc_buffer_putstr(text, "\nnext key event: ");
isc_buffer_putstr(text, kbuf);
}
} else if (allow)
isc_buffer_putstr(text, "\nkey maintenance: on command");
else if (secure || hasraw)
isc_buffer_putstr(text, "\nkey maintenance: none");
if (!isc_time_isepoch(&resigntime)) {
isc_buffer_putstr(text, "\nnext resign node: ");
isc_buffer_putstr(text, resignbuf);
isc_buffer_putstr(text, "\nnext resign time: ");
isc_buffer_putstr(text, rtbuf);
}
if (dynamic) {
isc_buffer_putstr(text, "\ndynamic: yes");
if (frozen)
isc_buffer_putstr(text, "\nfrozen: yes");
else
isc_buffer_putstr(text, "\nfrozen: no");
} else
isc_buffer_putstr(text, "\ndynamic: no");
isc_buffer_putuint8(text, 0);
cleanup:
if (db != NULL)
dns_db_detach(&db);
if (rawdb != NULL)
dns_db_detach(&rawdb);
if (incfiles != NULL) {
int i;
isc_mem_t *mctx = dns_zone_getmctx(hasraw ? raw : zone);
for (i = 0; i < nfiles; i++)
if (incfiles[i] != NULL)
isc_mem_free(mctx, incfiles[i]);
isc_mem_free(mctx, incfiles);
}
if (raw != NULL)
dns_zone_detach(&raw);
if (zone != NULL)
dns_zone_detach(&zone);
return (result);
}

3
bin/named/unix/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
Makefile
*.lo
.libs

2
bin/named/unix/dlz_dlopen_driver.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dlz_dlopen_driver.c,v 1.8 2012/02/22 23:47:34 tbox Exp $ */
/* $Id: dlz_dlopen_driver.c,v 1.6.96.2 2012/02/22 23:47:07 tbox Exp $ */
#include <config.h>

2
bin/named/win32/os.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: os.c,v 1.39 2012/02/06 23:46:44 tbox Exp $ */
/* $Id: os.c,v 1.37.746.2 2012/02/06 23:46:22 tbox Exp $ */
#include <config.h>
#include <stdarg.h>

2
bin/named/zoneconf.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.189 2012/02/23 06:53:15 marka Exp $ */
/* $Id: zoneconf.c,v 1.186.22.3 2012/02/23 07:02:19 marka Exp $ */
/*% */

4
bin/nsupdate/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
nsupdate
*.lo
.libs

4
bin/pkcs11/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
pkcs11-destroy
pkcs11-keygen
pkcs11-list

6
bin/rndc/.cvsignore Normal file
View file

@ -0,0 +1,6 @@
Makefile
.libs
*.la
*.lo
rndc
rndc-confgen

4
bin/rndc/rndc.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rndc.c,v 1.142 2012/02/03 22:27:17 each Exp $ */
/* $Id: rndc.c,v 1.139.52.2 2012/02/07 23:46:56 tbox Exp $ */
/*! \file */
@ -126,8 +126,6 @@ command is one of the following:\n\
Update zone keys, and sign as needed.\n\
loadkeys zone [class [view]]\n\
Update keys without signing immediately.\n\
zonestatus zone [class [view]]\n\
Display the current status of a zone.\n\
stats Write server statistics to the statistics file.\n\
querylog newstate\n\
Enable / disable query logging.\n\

1
bin/rndc/unix/.cvsignore Normal file
View file

@ -0,0 +1 @@
Makefile

51
bin/tests/.cvsignore Normal file
View file

@ -0,0 +1,51 @@
Makefile
.libs
*.la
*.lo
adb_test
byaddr_test
byname_test
cfg_test
compress_test
db_test
entropy_test
entropy2_test
fsaccess_test
genrandom
gxba_test
gxbn_test
headerdep_test.sh
hash_test
inter_test
journalprint
keyboard_test
lex_test
lfsr_test
log_test
lwres_test
lwresconf_test
master_test
mem_test
mempool_test
name_test
nconf_test
nxtify
omapi_test
ratelimiter_test
rbt_test
rdata_test
res_test
rwlock_test
sdig
serial_test
shutdown_test
sig0_test
sock_test
sym_test
t_journal
task_test
timer_test
tkey_test
wire_test
zone2_test
zone_test

5
bin/tests/atomic/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
Makefile
.libs
*.la
*.lo
t_atomic

4
bin/tests/db/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
t_db
.libs
*.lo

7
bin/tests/dst/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
Makefile
dst_test
t_dst
gsstest
.libs
randomfile
*.lo

2
bin/tests/hashes/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
t_hashes

5
bin/tests/master/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
Makefile
.libs
*.la
*.lo
t_master

4
bin/tests/mem/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
t_mem
.libs
*.lo

5
bin/tests/names/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
Makefile
.libs
*.la
*.lo
t_names

4
bin/tests/net/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
t_net
*.lo
.libs

5
bin/tests/rbt/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
Makefile
.libs
*.la
*.lo
t_rbt

5
bin/tests/resolver/.cvsignore Normal file
View file

@ -0,0 +1,5 @@
Makefile
.libs
*.la
*.lo
t_resolver

4
bin/tests/sockaddr/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
Makefile
t_sockaddr
.libs
*.lo

3
bin/tests/system/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
Makefile
conf.sh
systests.output

1
bin/tests/system/acl/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/ans.pl
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: ans.pl,v 1.6 2012/02/22 23:47:34 tbox Exp $
# $Id: ans.pl,v 1.4.238.2 2012/02/22 23:47:08 tbox Exp $
#
# This is the name server from hell. It provides canned

2
bin/tests/system/autosign/clean.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.15 2012/02/06 23:46:45 tbox Exp $
# $Id: clean.sh,v 1.13.94.2 2012/02/06 23:46:22 tbox Exp $
rm -f */K* */dsset-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk
rm -f active.key inact.key del.key unpub.key standby.key rev.key

1
bin/tests/system/autosign/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/autosign/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/autosign/ns3/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/autosign/ns3/keygen.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: keygen.sh,v 1.15 2012/02/06 23:46:46 tbox Exp $
# $Id: keygen.sh,v 1.13.160.2 2012/02/06 23:46:23 tbox Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh

2
bin/tests/system/autosign/ns3/named.conf
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.15 2012/02/06 23:46:47 tbox Exp $ */
/* $Id: named.conf,v 1.13.160.2 2012/02/06 23:46:23 tbox Exp $ */
// NS3

1
bin/tests/system/autosign/ns4/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/autosign/ns5/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/autosign/tests.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.46 2012/02/07 00:33:19 each Exp $
# $Id: tests.sh,v 1.42.20.4 2012/02/07 00:33:40 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh

1
bin/tests/system/cacheclean/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/cacheclean/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/checknames/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/checknames/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/checknames/ns3/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dialup/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dialup/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dialup/ns3/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dlz/.cvsignore Normal file
View file

@ -0,0 +1 @@
prereq.sh

2
bin/tests/system/dlzexternal/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
dlopen

1
bin/tests/system/dlzexternal/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.conf

2
bin/tests/system/dnssec/clean.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.48 2012/02/22 23:47:34 tbox Exp $
# $Id: clean.sh,v 1.46.36.2 2012/02/22 23:47:08 tbox Exp $
rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed
rm -f */trusted.conf */managed.conf */tmp* */*.jnl */*.bk

1
bin/tests/system/dnssec/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/dnssec/ns2/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
private.secure.example.db
named.run

2
bin/tests/system/dnssec/ns3/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
named.run
example.bk

1
bin/tests/system/dnssec/ns4/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dnssec/ns5/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dnssec/ns6/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/dnssec/ns7/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/dnssec/tests.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.109 2012/02/22 23:47:34 tbox Exp $
# $Id: tests.sh,v 1.107.20.2 2012/02/22 23:47:08 tbox Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh

2
bin/tests/system/filter-aaaa/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
filter-aaaa

5
bin/tests/system/filter-aaaa/ns1/root.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,13 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: root.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: root.db,v 1.2 2010/06/22 03:58:37 marka Exp $
$TTL 120
@ SOA ns.utld hostmaster.ns.utld ( 1 3600 1200 604800 60 )
@ NS ns.utld
ns.utld A 10.53.0.1
ns.utld AAAA fd92:7065:b8e:ffff::1
;
signed NS ns.utld
unsigned NS ns.utld

7
bin/tests/system/filter-aaaa/ns1/signed.db.in
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,15 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: signed.db.in,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: signed.db.in,v 1.2 2010/06/22 03:58:37 marka Exp $
$TTL 120
@ SOA ns.utld. hostmaster.ns.utld. ( 1 3600 1200 604800 60 )
@ NS ns.utld.
@ MX 10 mx
a-only NS 1.0.0.1
aaaa-only AAAA 2001:db8::2
dual A 1.0.0.3
dual AAAA 2001:db8::3
mx A 1.0.0.3
mx AAAA 2001:db8::3

7
bin/tests/system/filter-aaaa/ns1/unsigned.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,15 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: unsigned.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: unsigned.db,v 1.2 2010/06/22 03:58:37 marka Exp $
$TTL 120
@ SOA ns.utld. hostmaster.ns.utld. ( 1 3600 1200 604800 60 )
@ NS ns.utld.
@ MX 10 mx
a-only NS 1.0.0.4
aaaa-only AAAA 2001:db8::5
dual A 1.0.0.6
dual AAAA 2001:db8::6
mx A 1.0.0.3
mx AAAA 2001:db8::3

5
bin/tests/system/filter-aaaa/ns4/root.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,13 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: root.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: root.db,v 1.2 2010/06/22 03:58:38 marka Exp $
$TTL 120
@ SOA ns.utld hostmaster.ns.utld ( 1 3600 1200 604800 60 )
@ NS ns.utld
ns.utld A 10.53.0.1
ns.utld AAAA fd92:7065:b8e:ffff::1
;
signed NS ns.utld
unsigned NS ns.utld

7
bin/tests/system/filter-aaaa/ns4/signed.db.in
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,15 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: signed.db.in,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: signed.db.in,v 1.2 2010/06/22 03:58:38 marka Exp $
$TTL 120
@ SOA ns.utld. hostmaster.ns.utld. ( 1 3600 1200 604800 60 )
@ NS ns.utld.
@ MX 10 mx
a-only NS 1.0.0.1
aaaa-only AAAA 2001:db8::2
dual A 1.0.0.3
dual AAAA 2001:db8::3
mx A 1.0.0.3
mx AAAA 2001:db8::3

7
bin/tests/system/filter-aaaa/ns4/unsigned.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2010 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
@ -12,15 +12,12 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: unsigned.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
; $Id: unsigned.db,v 1.2 2010/06/22 03:58:38 marka Exp $
$TTL 120
@ SOA ns.utld. hostmaster.ns.utld. ( 1 3600 1200 604800 60 )
@ NS ns.utld.
@ MX 10 mx
a-only NS 1.0.0.4
aaaa-only AAAA 2001:db8::5
dual A 1.0.0.6
dual AAAA 2001:db8::6
mx A 1.0.0.3
mx AAAA 2001:db8::3

159
bin/tests/system/filter-aaaa/tests.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2010 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
@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.4 2012/01/31 23:47:31 tbox Exp $
# $Id: tests.sh,v 1.2 2010/06/22 03:58:36 marka Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@ -174,45 +174,6 @@ else
echo "I: skipped."
fi
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=NS ($n)"
ret=0
$DIG $DIGOPTS +add ns unsigned -b 10.53.0.1 @10.53.0.1 > dig.out.ns1.test$n || ret=1
grep AAAA dig.out.ns1.test$n > /dev/null 2>&1 && ret=1
grep "ADDITIONAL: 2" dig.out.ns1.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, unsigned ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b 10.53.0.1 @10.53.0.1 > dig.out.ns1.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns1.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, signed ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx signed -b 10.53.0.1 @10.53.0.1 > dig.out.ns1.test$n || ret=1
grep "^mx.signed.*AAAA" dig.out.ns1.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, unsigned, over IPV6 ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::1
then
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b fd92:7065:b8e:ffff::1 @fd92:7065:b8e:ffff::1 > dig.out.ns1.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns1.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I: skipped."
fi
#
# Authoritative tests against:
# filter-aaaa-on-v4 break-dnssec;
@ -342,45 +303,6 @@ else
echo "I: skipped."
fi
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=NS, with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add ns unsigned -b 10.53.0.4 @10.53.0.4 > dig.out.ns4.test$n || ret=1
grep AAAA dig.out.ns4.test$n > /dev/null 2>&1 && ret=1
grep "ADDITIONAL: 2" dig.out.ns4.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, unsigned, with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b 10.53.0.4 @10.53.0.4 > dig.out.ns4.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns4.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, signed, with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx signed -b 10.53.0.4 @10.53.0.4 > dig.out.ns4.test$n || ret=1
grep "^mx.signed.*AAAA" dig.out.ns4.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, unsigned, over IPV6, with break-dnssec ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::4
then
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b fd92:7065:b8e:ffff::4 @fd92:7065:b8e:ffff::4 > dig.out.ns4.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns4.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I: skipped."
fi
#
# Recursive tests against:
# filter-aaaa-on-v4 yes;
@ -509,45 +431,6 @@ else
echo "I: skipped."
fi
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=NS ($n)"
ret=0
$DIG $DIGOPTS +add ns unsigned -b 10.53.0.2 @10.53.0.2 > dig.out.ns2.test$n || ret=1
grep AAAA dig.out.ns2.test$n > /dev/null 2>&1 && ret=1
grep "ADDITIONAL: 2" dig.out.ns2.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, unsigned ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b 10.53.0.2 @10.53.0.2 > dig.out.ns2.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns2.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, signed ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx signed -b 10.53.0.2 @10.53.0.2 > dig.out.ns2.test$n || ret=1
grep "^mx.signed.*AAAA" dig.out.ns2.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, unsigned, over IPV6 ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::2
then
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b fd92:7065:b8e:ffff::2 @fd92:7065:b8e:ffff::2 > dig.out.ns2.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns2.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I: skipped."
fi
#
# Recursive tests against:
# filter-aaaa-on-v4 break-dnssec;
@ -676,43 +559,5 @@ else
echo "I: skipped."
fi
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=NS, recursive with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add ns unsigned -b 10.53.0.3 @10.53.0.3 > dig.out.ns3.test$n || ret=1
grep AAAA dig.out.ns3.test$n > /dev/null 2>&1 && ret=1
grep "ADDITIONAL: 2" dig.out.ns3.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, unsigned, recursive with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b 10.53.0.3 @10.53.0.3 > dig.out.ns3.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns3.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is omitted from additional section, qtype=MX, signed, recursive with break-dnssec ($n)"
ret=0
$DIG $DIGOPTS +add +dnssec mx signed -b 10.53.0.3 @10.53.0.3 > dig.out.ns3.test$n || ret=1
grep "^mx.signed.*AAAA" dig.out.ns3.test$n > /dev/null 2>&1 && ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking that AAAA is included in additional section, qtype=MX, unsigned, over IPV6, recursive with break-dnssec ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::3
then
ret=0
$DIG $DIGOPTS +add +dnssec mx unsigned -b fd92:7065:b8e:ffff::3 @fd92:7065:b8e:ffff::3 > dig.out.ns3.test$n || ret=1
grep "^mx.unsigned.*AAAA" dig.out.ns3.test$n > /dev/null 2>&1 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I: skipped."
fi
echo "I:exit status: $status"
exit $status

1
bin/tests/system/forward/ns1/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/forward/ns2/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/forward/ns3/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

1
bin/tests/system/forward/ns4/.cvsignore Normal file
View file

@ -0,0 +1 @@
named.run

2
bin/tests/system/glue/ns1/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
named.run
cache

1
bin/tests/system/gost/.cvsignore Normal file
View file

@ -0,0 +1 @@
prereq.sh

2
bin/tests/system/inline/clean.sh
View file

@ -12,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.13 2012/02/23 06:53:15 marka Exp $
# $Id: clean.sh,v 1.12.12.1 2012/02/23 07:02:19 marka Exp $
rm -f */named.memstats
rm -f */named.run

2
bin/tests/system/inline/ns1/root.db.in
View file

@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: root.db.in,v 1.8 2012/02/23 06:53:15 marka Exp $
; $Id: root.db.in,v 1.7.14.1 2012/02/23 07:02:19 marka Exp $
$TTL 300
. IN SOA gson.nominum.com. a.root.servers.nil. (

2
bin/tests/system/inline/ns1/sign.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: sign.sh,v 1.5 2012/02/23 07:09:28 tbox Exp $
# $Id: sign.sh,v 1.3.20.2 2012/02/23 07:09:01 tbox Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh

2
bin/tests/system/inline/ns2/named.conf
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.4 2012/02/23 07:09:28 tbox Exp $ */
/* $Id: named.conf,v 1.2.138.2 2012/02/23 07:09:02 tbox Exp $ */
// NS2

2
bin/tests/system/inline/ns3/master3.db.in
View file

@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: master3.db.in,v 1.3 2012/01/31 23:47:32 tbox Exp $
; $Id: master3.db.in,v 1.1.4.3 2012/01/31 23:47:02 tbox Exp $
$TTL 300 ; 5 minutes
@ IN SOA ns3 . (

2
bin/tests/system/inline/ns3/named.conf
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.8 2012/02/23 06:53:15 marka Exp $ */
/* $Id: named.conf,v 1.7.14.1 2012/02/23 07:02:19 marka Exp $ */
// NS3

2
bin/tests/system/inline/ns3/sign.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: sign.sh,v 1.8 2012/02/23 06:53:15 marka Exp $
# $Id: sign.sh,v 1.7.14.1 2012/02/23 07:02:20 marka Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh

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

@ -12,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.11 2012/02/23 06:53:15 marka Exp $
# $Id: setup.sh,v 1.10.14.1 2012/02/23 07:02:19 marka Exp $
sh clean.sh

2
bin/tests/system/inline/tests.sh
View file

@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.18 2012/02/23 06:53:15 marka Exp $
# $Id: tests.sh,v 1.16.12.2 2012/02/23 07:02:19 marka Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh

1
bin/tests/system/ixfr/ans2/.cvsignore Normal file
View file

@ -0,0 +1 @@
ans.run

2
bin/tests/system/ixfr/clean.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.10 2012/02/07 23:47:24 tbox Exp $
# $Id: clean.sh,v 1.8.134.2 2012/02/07 23:46:56 tbox Exp $
rm -f ns1/named.conf ns1/myftp.db
rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db

2
bin/tests/system/ixfr/ns1/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
named.conf
named.run

3
bin/tests/system/ixfr/ns3/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
named.conf
named.run
mytest.db.jnl

3
bin/tests/system/ixfr/ns4/.cvsignore Normal file
View file

@ -0,0 +1,3 @@
named.conf
named.run
mytest.db.jnl

2
bin/tests/system/ixfr/setup.sh
View file

@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.8 2012/02/07 23:47:24 tbox Exp $
# $Id: setup.sh,v 1.6.134.2 2012/02/07 23:46:56 tbox Exp $
rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl

Some files were not shown because too many files have changed in this diff Show more