diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000000..301a63d3db --- /dev/null +++ b/.cvsignore @@ -0,0 +1,9 @@ +Makefile +config.log +config.h +config.cache +config.status +libtool +isc-config.sh +configure.lineno +autom4te.cache diff --git a/CHANGES b/CHANGES index ee88a3cd7b..5c0a6beec5 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,10 @@ 3290. [bug] 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] diff --git a/bin/.cvsignore b/bin/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/bin/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/bin/check/.cvsignore b/bin/check/.cvsignore new file mode 100644 index 0000000000..711bcb8300 --- /dev/null +++ b/bin/check/.cvsignore @@ -0,0 +1,6 @@ +Makefile +.libs +*.la +*.lo +named-checkconf +named-checkzone diff --git a/bin/confgen/.cvsignore b/bin/confgen/.cvsignore new file mode 100644 index 0000000000..30b591e702 --- /dev/null +++ b/bin/confgen/.cvsignore @@ -0,0 +1,3 @@ +Makefile +ddns-confgen +rndc-confgen diff --git a/bin/confgen/unix/.cvsignore b/bin/confgen/unix/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/bin/confgen/unix/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/bin/dig/.cvsignore b/bin/dig/.cvsignore new file mode 100644 index 0000000000..2a9cc0de28 --- /dev/null +++ b/bin/dig/.cvsignore @@ -0,0 +1,6 @@ +Makefile +dig +host +nslookup +*.lo +.libs diff --git a/bin/dnssec/.cvsignore b/bin/dnssec/.cvsignore new file mode 100644 index 0000000000..c2251128fb --- /dev/null +++ b/bin/dnssec/.cvsignore @@ -0,0 +1,11 @@ +Makefile +dnssec-dsfromkey +dnssec-keyfromlabel +dnssec-keygen +dnssec-makekeyset +dnssec-revoke +dnssec-settime +dnssec-signkey +dnssec-signzone +*.lo +.libs diff --git a/bin/named/.cvsignore b/bin/named/.cvsignore new file mode 100644 index 0000000000..419ad074bf --- /dev/null +++ b/bin/named/.cvsignore @@ -0,0 +1,7 @@ +Makefile +.libs +*.la +*.lo +named +named-symtbl.c +lwresd diff --git a/bin/named/bind.keys.h b/bin/named/bind.keys.h index 61e3f700c6..0177214159 100644 --- a/bin/named/bind.keys.h +++ b/bin/named/bind.keys.h @@ -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\ diff --git a/bin/named/client.c b/bin/named/client.c index 2f4130c5ae..1dd0fe8a22 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -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 @@ -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); diff --git a/bin/named/control.c b/bin/named/control.c index 5d351553d6..200a359a57 100644 --- a/bin/named/control.c +++ b/bin/named/control.c @@ -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, diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h index d37bf1adbf..3481256da4 100644 --- a/bin/named/include/named/client.h +++ b/bin/named/include/named/client.h @@ -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 diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h index 550099c1d9..064ec50e2a 100644 --- a/bin/named/include/named/control.h +++ b/bin/named/include/named/control.h @@ -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); diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index 45bcdc425b..17eaeefdde 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -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 */ diff --git a/bin/named/main.c b/bin/named/main.c index 3980056206..546bb70c8f 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -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 */ diff --git a/bin/named/query.c b/bin/named/query.c index 6bae511641..dd0558b96d 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -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, diff --git a/bin/named/server.c b/bin/named/server.c index 6921feb5c9..aa672f75fa 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -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); -} diff --git a/bin/named/unix/.cvsignore b/bin/named/unix/.cvsignore new file mode 100644 index 0000000000..06e18a7aaf --- /dev/null +++ b/bin/named/unix/.cvsignore @@ -0,0 +1,3 @@ +Makefile +*.lo +.libs diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 626efc1822..f01d18ebac 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -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 diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index 358658c0ef..c6077b9586 100644 --- a/bin/named/win32/os.c +++ b/bin/named/win32/os.c @@ -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 #include diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 748d114229..38b3f506b2 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -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 $ */ /*% */ diff --git a/bin/nsupdate/.cvsignore b/bin/nsupdate/.cvsignore new file mode 100644 index 0000000000..cb3694c4e2 --- /dev/null +++ b/bin/nsupdate/.cvsignore @@ -0,0 +1,4 @@ +Makefile +nsupdate +*.lo +.libs diff --git a/bin/pkcs11/.cvsignore b/bin/pkcs11/.cvsignore new file mode 100644 index 0000000000..e26a12ef93 --- /dev/null +++ b/bin/pkcs11/.cvsignore @@ -0,0 +1,4 @@ +Makefile +pkcs11-destroy +pkcs11-keygen +pkcs11-list diff --git a/bin/rndc/.cvsignore b/bin/rndc/.cvsignore new file mode 100644 index 0000000000..1033a2337c --- /dev/null +++ b/bin/rndc/.cvsignore @@ -0,0 +1,6 @@ +Makefile +.libs +*.la +*.lo +rndc +rndc-confgen diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index b2dbe8d503..749cc01a41 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -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\ diff --git a/bin/rndc/unix/.cvsignore b/bin/rndc/unix/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/bin/rndc/unix/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/bin/tests/.cvsignore b/bin/tests/.cvsignore new file mode 100644 index 0000000000..352a9f72a7 --- /dev/null +++ b/bin/tests/.cvsignore @@ -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 diff --git a/bin/tests/atomic/.cvsignore b/bin/tests/atomic/.cvsignore new file mode 100644 index 0000000000..fb9be717b6 --- /dev/null +++ b/bin/tests/atomic/.cvsignore @@ -0,0 +1,5 @@ +Makefile +.libs +*.la +*.lo +t_atomic diff --git a/bin/tests/db/.cvsignore b/bin/tests/db/.cvsignore new file mode 100644 index 0000000000..d8bbcd77fa --- /dev/null +++ b/bin/tests/db/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_db +.libs +*.lo diff --git a/bin/tests/dst/.cvsignore b/bin/tests/dst/.cvsignore new file mode 100644 index 0000000000..e9aee8fc08 --- /dev/null +++ b/bin/tests/dst/.cvsignore @@ -0,0 +1,7 @@ +Makefile +dst_test +t_dst +gsstest +.libs +randomfile +*.lo diff --git a/bin/tests/hashes/.cvsignore b/bin/tests/hashes/.cvsignore new file mode 100644 index 0000000000..f95f8afd18 --- /dev/null +++ b/bin/tests/hashes/.cvsignore @@ -0,0 +1,2 @@ +Makefile +t_hashes diff --git a/bin/tests/master/.cvsignore b/bin/tests/master/.cvsignore new file mode 100644 index 0000000000..83a5bf043f --- /dev/null +++ b/bin/tests/master/.cvsignore @@ -0,0 +1,5 @@ +Makefile +.libs +*.la +*.lo +t_master diff --git a/bin/tests/mem/.cvsignore b/bin/tests/mem/.cvsignore new file mode 100644 index 0000000000..516ba8c31b --- /dev/null +++ b/bin/tests/mem/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_mem +.libs +*.lo diff --git a/bin/tests/names/.cvsignore b/bin/tests/names/.cvsignore new file mode 100644 index 0000000000..156c246588 --- /dev/null +++ b/bin/tests/names/.cvsignore @@ -0,0 +1,5 @@ +Makefile +.libs +*.la +*.lo +t_names diff --git a/bin/tests/net/.cvsignore b/bin/tests/net/.cvsignore new file mode 100644 index 0000000000..e4db8d3615 --- /dev/null +++ b/bin/tests/net/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_net +*.lo +.libs diff --git a/bin/tests/rbt/.cvsignore b/bin/tests/rbt/.cvsignore new file mode 100644 index 0000000000..2863b94040 --- /dev/null +++ b/bin/tests/rbt/.cvsignore @@ -0,0 +1,5 @@ +Makefile +.libs +*.la +*.lo +t_rbt diff --git a/bin/tests/resolver/.cvsignore b/bin/tests/resolver/.cvsignore new file mode 100644 index 0000000000..d2d2629c99 --- /dev/null +++ b/bin/tests/resolver/.cvsignore @@ -0,0 +1,5 @@ +Makefile +.libs +*.la +*.lo +t_resolver diff --git a/bin/tests/sockaddr/.cvsignore b/bin/tests/sockaddr/.cvsignore new file mode 100644 index 0000000000..01eb10f74d --- /dev/null +++ b/bin/tests/sockaddr/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_sockaddr +.libs +*.lo diff --git a/bin/tests/system/.cvsignore b/bin/tests/system/.cvsignore new file mode 100644 index 0000000000..ea15748232 --- /dev/null +++ b/bin/tests/system/.cvsignore @@ -0,0 +1,3 @@ +Makefile +conf.sh +systests.output diff --git a/bin/tests/system/acl/ns2/.cvsignore b/bin/tests/system/acl/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/acl/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl index 650743d77d..f12b6a5b12 100644 --- a/bin/tests/system/ans.pl +++ b/bin/tests/system/ans.pl @@ -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 diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh index e3a64c6548..e8abe4c7dd 100644 --- a/bin/tests/system/autosign/clean.sh +++ b/bin/tests/system/autosign/clean.sh @@ -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 diff --git a/bin/tests/system/autosign/ns1/.cvsignore b/bin/tests/system/autosign/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/autosign/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/autosign/ns2/.cvsignore b/bin/tests/system/autosign/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/autosign/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/autosign/ns3/.cvsignore b/bin/tests/system/autosign/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/autosign/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh index 20e19f25aa..4864d934a6 100644 --- a/bin/tests/system/autosign/ns3/keygen.sh +++ b/bin/tests/system/autosign/ns3/keygen.sh @@ -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 diff --git a/bin/tests/system/autosign/ns3/named.conf b/bin/tests/system/autosign/ns3/named.conf index 91c3138ce4..9b0e7b7831 100644 --- a/bin/tests/system/autosign/ns3/named.conf +++ b/bin/tests/system/autosign/ns3/named.conf @@ -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 diff --git a/bin/tests/system/autosign/ns4/.cvsignore b/bin/tests/system/autosign/ns4/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/autosign/ns4/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/autosign/ns5/.cvsignore b/bin/tests/system/autosign/ns5/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/autosign/ns5/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index adb97b4b8f..47495874b1 100644 --- a/bin/tests/system/autosign/tests.sh +++ b/bin/tests/system/autosign/tests.sh @@ -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 diff --git a/bin/tests/system/cacheclean/ns1/.cvsignore b/bin/tests/system/cacheclean/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/cacheclean/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/cacheclean/ns2/.cvsignore b/bin/tests/system/cacheclean/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/cacheclean/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/checknames/ns1/.cvsignore b/bin/tests/system/checknames/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/checknames/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/checknames/ns2/.cvsignore b/bin/tests/system/checknames/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/checknames/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/checknames/ns3/.cvsignore b/bin/tests/system/checknames/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/checknames/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dialup/ns1/.cvsignore b/bin/tests/system/dialup/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dialup/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dialup/ns2/.cvsignore b/bin/tests/system/dialup/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dialup/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dialup/ns3/.cvsignore b/bin/tests/system/dialup/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dialup/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dlz/.cvsignore b/bin/tests/system/dlz/.cvsignore new file mode 100644 index 0000000000..eee491d3c6 --- /dev/null +++ b/bin/tests/system/dlz/.cvsignore @@ -0,0 +1 @@ +prereq.sh diff --git a/bin/tests/system/dlzexternal/.cvsignore b/bin/tests/system/dlzexternal/.cvsignore new file mode 100644 index 0000000000..2228352184 --- /dev/null +++ b/bin/tests/system/dlzexternal/.cvsignore @@ -0,0 +1,2 @@ +Makefile +dlopen diff --git a/bin/tests/system/dlzexternal/ns1/.cvsignore b/bin/tests/system/dlzexternal/ns1/.cvsignore new file mode 100644 index 0000000000..58e5c9282d --- /dev/null +++ b/bin/tests/system/dlzexternal/ns1/.cvsignore @@ -0,0 +1 @@ +named.conf diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index 7404e7e841..84e5544eff 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -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 diff --git a/bin/tests/system/dnssec/ns1/.cvsignore b/bin/tests/system/dnssec/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dnssec/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dnssec/ns2/.cvsignore b/bin/tests/system/dnssec/ns2/.cvsignore new file mode 100644 index 0000000000..7af15328bb --- /dev/null +++ b/bin/tests/system/dnssec/ns2/.cvsignore @@ -0,0 +1,2 @@ +private.secure.example.db +named.run diff --git a/bin/tests/system/dnssec/ns3/.cvsignore b/bin/tests/system/dnssec/ns3/.cvsignore new file mode 100644 index 0000000000..0465cd0f59 --- /dev/null +++ b/bin/tests/system/dnssec/ns3/.cvsignore @@ -0,0 +1,2 @@ +named.run +example.bk diff --git a/bin/tests/system/dnssec/ns4/.cvsignore b/bin/tests/system/dnssec/ns4/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dnssec/ns4/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dnssec/ns5/.cvsignore b/bin/tests/system/dnssec/ns5/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dnssec/ns5/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dnssec/ns6/.cvsignore b/bin/tests/system/dnssec/ns6/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dnssec/ns6/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dnssec/ns7/.cvsignore b/bin/tests/system/dnssec/ns7/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/dnssec/ns7/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index faf30c89b2..5b856302b3 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -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 diff --git a/bin/tests/system/filter-aaaa/.cvsignore b/bin/tests/system/filter-aaaa/.cvsignore new file mode 100644 index 0000000000..3a8c0ad9ae --- /dev/null +++ b/bin/tests/system/filter-aaaa/.cvsignore @@ -0,0 +1,2 @@ +Makefile +filter-aaaa diff --git a/bin/tests/system/filter-aaaa/ns1/root.db b/bin/tests/system/filter-aaaa/ns1/root.db index d485e733dd..400f011ff7 100644 --- a/bin/tests/system/filter-aaaa/ns1/root.db +++ b/bin/tests/system/filter-aaaa/ns1/root.db @@ -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 diff --git a/bin/tests/system/filter-aaaa/ns1/signed.db.in b/bin/tests/system/filter-aaaa/ns1/signed.db.in index 7b8ec518ba..e5042b8787 100644 --- a/bin/tests/system/filter-aaaa/ns1/signed.db.in +++ b/bin/tests/system/filter-aaaa/ns1/signed.db.in @@ -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 diff --git a/bin/tests/system/filter-aaaa/ns1/unsigned.db b/bin/tests/system/filter-aaaa/ns1/unsigned.db index 7f7e8e54c8..350cceec23 100644 --- a/bin/tests/system/filter-aaaa/ns1/unsigned.db +++ b/bin/tests/system/filter-aaaa/ns1/unsigned.db @@ -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 diff --git a/bin/tests/system/filter-aaaa/ns4/root.db b/bin/tests/system/filter-aaaa/ns4/root.db index d485e733dd..f99dfeabe3 100644 --- a/bin/tests/system/filter-aaaa/ns4/root.db +++ b/bin/tests/system/filter-aaaa/ns4/root.db @@ -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 diff --git a/bin/tests/system/filter-aaaa/ns4/signed.db.in b/bin/tests/system/filter-aaaa/ns4/signed.db.in index 7b8ec518ba..d4889c7f12 100644 --- a/bin/tests/system/filter-aaaa/ns4/signed.db.in +++ b/bin/tests/system/filter-aaaa/ns4/signed.db.in @@ -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 diff --git a/bin/tests/system/filter-aaaa/ns4/unsigned.db b/bin/tests/system/filter-aaaa/ns4/unsigned.db index 7f7e8e54c8..a1d3b77ca1 100644 --- a/bin/tests/system/filter-aaaa/ns4/unsigned.db +++ b/bin/tests/system/filter-aaaa/ns4/unsigned.db @@ -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 diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh index 7592de547a..e0d710b6c2 100644 --- a/bin/tests/system/filter-aaaa/tests.sh +++ b/bin/tests/system/filter-aaaa/tests.sh @@ -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 diff --git a/bin/tests/system/forward/ns1/.cvsignore b/bin/tests/system/forward/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/forward/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/forward/ns2/.cvsignore b/bin/tests/system/forward/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/forward/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/forward/ns3/.cvsignore b/bin/tests/system/forward/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/forward/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/forward/ns4/.cvsignore b/bin/tests/system/forward/ns4/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/forward/ns4/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/glue/ns1/.cvsignore b/bin/tests/system/glue/ns1/.cvsignore new file mode 100644 index 0000000000..9e0814c5fd --- /dev/null +++ b/bin/tests/system/glue/ns1/.cvsignore @@ -0,0 +1,2 @@ +named.run +cache diff --git a/bin/tests/system/gost/.cvsignore b/bin/tests/system/gost/.cvsignore new file mode 100644 index 0000000000..eee491d3c6 --- /dev/null +++ b/bin/tests/system/gost/.cvsignore @@ -0,0 +1 @@ +prereq.sh diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh index 707ab31e7c..160e54b2c0 100644 --- a/bin/tests/system/inline/clean.sh +++ b/bin/tests/system/inline/clean.sh @@ -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 diff --git a/bin/tests/system/inline/ns1/root.db.in b/bin/tests/system/inline/ns1/root.db.in index 6a65dcf36f..906806983a 100644 --- a/bin/tests/system/inline/ns1/root.db.in +++ b/bin/tests/system/inline/ns1/root.db.in @@ -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. ( diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh index cf08f59ee7..b6396262a6 100644 --- a/bin/tests/system/inline/ns1/sign.sh +++ b/bin/tests/system/inline/ns1/sign.sh @@ -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 diff --git a/bin/tests/system/inline/ns2/named.conf b/bin/tests/system/inline/ns2/named.conf index 9bd4dc1585..9ce6e6fcd9 100644 --- a/bin/tests/system/inline/ns2/named.conf +++ b/bin/tests/system/inline/ns2/named.conf @@ -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 diff --git a/bin/tests/system/inline/ns3/master3.db.in b/bin/tests/system/inline/ns3/master3.db.in index 061fd3886a..7869b309e0 100644 --- a/bin/tests/system/inline/ns3/master3.db.in +++ b/bin/tests/system/inline/ns3/master3.db.in @@ -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 . ( diff --git a/bin/tests/system/inline/ns3/named.conf b/bin/tests/system/inline/ns3/named.conf index ebfb8d9b9a..a1d092b25e 100644 --- a/bin/tests/system/inline/ns3/named.conf +++ b/bin/tests/system/inline/ns3/named.conf @@ -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 diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh index ed9123fd76..4fe0e10c08 100644 --- a/bin/tests/system/inline/ns3/sign.sh +++ b/bin/tests/system/inline/ns3/sign.sh @@ -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 diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh index d18ad651b2..cad840e9d4 100644 --- a/bin/tests/system/inline/setup.sh +++ b/bin/tests/system/inline/setup.sh @@ -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 diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 4870097577..0ec1c7c87c 100644 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -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 diff --git a/bin/tests/system/ixfr/ans2/.cvsignore b/bin/tests/system/ixfr/ans2/.cvsignore new file mode 100644 index 0000000000..a93faf57f8 --- /dev/null +++ b/bin/tests/system/ixfr/ans2/.cvsignore @@ -0,0 +1 @@ +ans.run diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh index a714584546..317407608c 100644 --- a/bin/tests/system/ixfr/clean.sh +++ b/bin/tests/system/ixfr/clean.sh @@ -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 diff --git a/bin/tests/system/ixfr/ns1/.cvsignore b/bin/tests/system/ixfr/ns1/.cvsignore new file mode 100644 index 0000000000..d2e377c25d --- /dev/null +++ b/bin/tests/system/ixfr/ns1/.cvsignore @@ -0,0 +1,2 @@ +named.conf +named.run diff --git a/bin/tests/system/ixfr/ns3/.cvsignore b/bin/tests/system/ixfr/ns3/.cvsignore new file mode 100644 index 0000000000..5c2431b869 --- /dev/null +++ b/bin/tests/system/ixfr/ns3/.cvsignore @@ -0,0 +1,3 @@ +named.conf +named.run +mytest.db.jnl diff --git a/bin/tests/system/ixfr/ns4/.cvsignore b/bin/tests/system/ixfr/ns4/.cvsignore new file mode 100644 index 0000000000..5c2431b869 --- /dev/null +++ b/bin/tests/system/ixfr/ns4/.cvsignore @@ -0,0 +1,3 @@ +named.conf +named.run +mytest.db.jnl diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index fbe0ff2a53..2a8552bae8 100644 --- a/bin/tests/system/ixfr/setup.sh +++ b/bin/tests/system/ixfr/setup.sh @@ -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 diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh index 717b9ff212..4158e5d44d 100644 --- a/bin/tests/system/ixfr/tests.sh +++ b/bin/tests/system/ixfr/tests.sh @@ -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.11 2012/02/22 14:22:54 marka Exp $ +# $Id: tests.sh,v 1.8.134.3 2012/02/22 14:29:38 marka Exp $ # WARNING: The test labelled "testing request-ixfr option in view vs zone" diff --git a/bin/tests/system/limits/ns1/.cvsignore b/bin/tests/system/limits/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/limits/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/lwresd/.cvsignore b/bin/tests/system/lwresd/.cvsignore new file mode 100644 index 0000000000..38e7054467 --- /dev/null +++ b/bin/tests/system/lwresd/.cvsignore @@ -0,0 +1,4 @@ +Makefile +lwtest +*.lo +.libs diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh index 8eeb1583f1..9189630383 100644 --- a/bin/tests/system/lwresd/clean.sh +++ b/bin/tests/system/lwresd/clean.sh @@ -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.3 2012/02/03 23:46:58 tbox Exp $ +# $Id: clean.sh,v 1.1.962.2 2012/02/03 23:46:31 tbox Exp $ # # Clean up after lwresd tests. diff --git a/bin/tests/system/lwresd/lwresd1/.cvsignore b/bin/tests/system/lwresd/lwresd1/.cvsignore new file mode 100644 index 0000000000..6f024895a5 --- /dev/null +++ b/bin/tests/system/lwresd/lwresd1/.cvsignore @@ -0,0 +1 @@ +lwresd.run diff --git a/bin/tests/system/lwresd/ns1/.cvsignore b/bin/tests/system/lwresd/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/lwresd/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh index 6c05333309..2371dce60c 100644 --- a/bin/tests/system/lwresd/tests.sh +++ b/bin/tests/system/lwresd/tests.sh @@ -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.22 2012/02/03 23:46:58 tbox Exp $ +# $Id: tests.sh,v 1.20.110.2 2012/02/03 23:46:31 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/masterfile/.cvsignore b/bin/tests/system/masterfile/.cvsignore new file mode 100644 index 0000000000..58a87b097c --- /dev/null +++ b/bin/tests/system/masterfile/.cvsignore @@ -0,0 +1 @@ +dig.out diff --git a/bin/tests/system/masterfile/ns1/.cvsignore b/bin/tests/system/masterfile/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/masterfile/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh index d8eca35b92..3796daed84 100755 --- a/bin/tests/system/masterformat/clean.sh +++ b/bin/tests/system/masterformat/clean.sh @@ -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.12 2012/02/14 23:47:15 tbox Exp $ +# $Id: clean.sh,v 1.10.20.2 2012/02/14 23:46:48 tbox Exp $ rm -f named-compilezone rm -f ns1/example.db.raw* diff --git a/bin/tests/system/masterformat/ns1/.cvsignore b/bin/tests/system/masterformat/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/masterformat/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh index 02ae0b06b2..a611fef13e 100755 --- a/bin/tests/system/masterformat/ns1/compile.sh +++ b/bin/tests/system/masterformat/ns1/compile.sh @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: compile.sh,v 1.11 2012/02/14 23:47:15 tbox Exp $ +# $Id: compile.sh,v 1.9.20.2 2012/02/14 23:46:48 tbox Exp $ ../named-compilezone -D -F raw -o example.db.raw example \ example.db > /dev/null 2>&1 diff --git a/bin/tests/system/masterformat/ns1/large.db.in b/bin/tests/system/masterformat/ns1/large.db.in index b97f12ab89..b87b0b0386 100644 --- a/bin/tests/system/masterformat/ns1/large.db.in +++ b/bin/tests/system/masterformat/ns1/large.db.in @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: large.db.in,v 1.3 2012/02/14 23:47:15 tbox Exp $ +; $Id: large.db.in,v 1.2.2.3 2012/02/14 23:46:49 tbox Exp $ $TTL 1D diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf index 6232b6aac9..4dadfc82b1 100644 --- a/bin/tests/system/masterformat/ns1/named.conf +++ b/bin/tests/system/masterformat/ns1/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.9 2012/02/14 23:47:15 tbox Exp $ */ +/* $Id: named.conf,v 1.7.36.2 2012/02/14 23:46:49 tbox Exp $ */ // NS1 diff --git a/bin/tests/system/masterformat/ns2/.cvsignore b/bin/tests/system/masterformat/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/masterformat/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf index 07c2c828b2..71d16c07a8 100644 --- a/bin/tests/system/masterformat/ns2/named.conf +++ b/bin/tests/system/masterformat/ns2/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8 2012/02/14 23:47:15 tbox Exp $ */ +/* $Id: named.conf,v 1.6.98.2 2012/02/14 23:46:49 tbox Exp $ */ // NS2 diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index beac865a2f..b39927f0d7 100755 --- a/bin/tests/system/masterformat/setup.sh +++ b/bin/tests/system/masterformat/setup.sh @@ -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/14 23:47:15 tbox Exp $ +# $Id: setup.sh,v 1.9.36.2 2012/02/14 23:46:48 tbox Exp $ rm -f named-compilezone ln -s $CHECKZONE named-compilezone diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh index c53fc46d6e..5cc80cb3af 100755 --- a/bin/tests/system/masterformat/tests.sh +++ b/bin/tests/system/masterformat/tests.sh @@ -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.14 2012/02/15 00:50:59 marka Exp $ +# $Id: tests.sh,v 1.10.20.4 2012/02/15 01:22:47 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/notify/ns1/.cvsignore b/bin/tests/system/notify/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/notify/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/notify/ns2/.cvsignore b/bin/tests/system/notify/ns2/.cvsignore new file mode 100644 index 0000000000..cbb42ee873 --- /dev/null +++ b/bin/tests/system/notify/ns2/.cvsignore @@ -0,0 +1,2 @@ +example.db +named.run diff --git a/bin/tests/system/notify/ns3/.cvsignore b/bin/tests/system/notify/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/notify/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/nsupdate/.cvsignore b/bin/tests/system/nsupdate/.cvsignore new file mode 100644 index 0000000000..11f3fa976e --- /dev/null +++ b/bin/tests/system/nsupdate/.cvsignore @@ -0,0 +1,3 @@ +dig.out.ns1 +dig.out.ns2 +dig.out.ns1.after diff --git a/bin/tests/system/nsupdate/ns1/.cvsignore b/bin/tests/system/nsupdate/ns1/.cvsignore new file mode 100644 index 0000000000..105706c29d --- /dev/null +++ b/bin/tests/system/nsupdate/ns1/.cvsignore @@ -0,0 +1,3 @@ +example.db +named.run +update.db diff --git a/bin/tests/system/nsupdate/ns2/.cvsignore b/bin/tests/system/nsupdate/ns2/.cvsignore new file mode 100644 index 0000000000..70d94600a8 --- /dev/null +++ b/bin/tests/system/nsupdate/ns2/.cvsignore @@ -0,0 +1,3 @@ +example.bk +named.run +update.bk diff --git a/bin/tests/system/relay/ns1/.cvsignore b/bin/tests/system/relay/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/relay/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/relay/ns2/.cvsignore b/bin/tests/system/relay/ns2/.cvsignore new file mode 100644 index 0000000000..cbb42ee873 --- /dev/null +++ b/bin/tests/system/relay/ns2/.cvsignore @@ -0,0 +1,2 @@ +example.db +named.run diff --git a/bin/tests/system/relay/ns3/.cvsignore b/bin/tests/system/relay/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/relay/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/relay/ns4/.cvsignore b/bin/tests/system/relay/ns4/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/relay/ns4/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/resolver/ans2/.cvsignore b/bin/tests/system/resolver/ans2/.cvsignore new file mode 100644 index 0000000000..a93faf57f8 --- /dev/null +++ b/bin/tests/system/resolver/ans2/.cvsignore @@ -0,0 +1 @@ +ans.run diff --git a/bin/tests/system/resolver/ans3/.cvsignore b/bin/tests/system/resolver/ans3/.cvsignore new file mode 100644 index 0000000000..a93faf57f8 --- /dev/null +++ b/bin/tests/system/resolver/ans3/.cvsignore @@ -0,0 +1 @@ +ans.run diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh index a3a28aff06..5438105031 100644 --- a/bin/tests/system/resolver/clean.sh +++ b/bin/tests/system/resolver/clean.sh @@ -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.11 2012/02/22 00:37:54 each Exp $ +# $Id: clean.sh,v 1.8.248.3 2012/02/22 00:35:53 each Exp $ # # Clean up after resolver tests. diff --git a/bin/tests/system/resolver/ns1/.cvsignore b/bin/tests/system/resolver/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/resolver/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/resolver/ns4/named.conf b/bin/tests/system/resolver/ns4/named.conf index c7a7d6107f..7995ba8429 100644 --- a/bin/tests/system/resolver/ns4/named.conf +++ b/bin/tests/system/resolver/ns4/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.6 2012/02/09 23:47:18 tbox Exp $ */ +/* $Id: named.conf,v 1.4.248.2 2012/02/09 23:46:50 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db index a2f55984d9..9ea00e4dc8 100644 --- a/bin/tests/system/resolver/ns4/tld1.db +++ b/bin/tests/system/resolver/ns4/tld1.db @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ +; $Id: tld1.db,v 1.2.2.3 2012/02/09 23:46:50 tbox Exp $ $TTL 300 @ IN SOA marka.isc.org. ns.server. ( diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db index 6bd751438f..460e25f1d3 100644 --- a/bin/tests/system/resolver/ns4/tld2.db +++ b/bin/tests/system/resolver/ns4/tld2.db @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: tld2.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ +; $Id: tld2.db,v 1.2.2.3 2012/02/09 23:46:50 tbox Exp $ $TTL 300 @ IN SOA marka.isc.org. ns.server. ( diff --git a/bin/tests/system/resolver/ns6/named.conf b/bin/tests/system/resolver/ns6/named.conf index c721d4673a..f0298ff84e 100644 --- a/bin/tests/system/resolver/ns6/named.conf +++ b/bin/tests/system/resolver/ns6/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2012/02/09 23:47:18 tbox Exp $ */ +/* $Id: named.conf,v 1.2.406.2 2012/02/09 23:46:50 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in index e7f994a5eb..bdfc4a16fc 100644 --- a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in +++ b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $ +; $Id: to-be-removed.tld.db.in,v 1.2.2.3 2012/02/09 23:46:51 tbox Exp $ $TTL 600 @ IN SOA ns hostmaster 1 1800 900 604800 600 diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index b1493a0019..389af81ff6 100644 --- a/bin/tests/system/resolver/setup.sh +++ b/bin/tests/system/resolver/setup.sh @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.7 2012/02/09 23:47:17 tbox Exp $ +# $Id: setup.sh,v 1.5.248.2 2012/02/09 23:46:50 tbox Exp $ ../../../tools/genrandom 400 random.data diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index 92834fdce2..38eae3e332 100644 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -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.22 2012/02/09 23:47:18 tbox Exp $ +# $Id: tests.sh,v 1.20.154.2 2012/02/09 23:46:50 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/rpz/.cvsignore b/bin/tests/system/rpz/.cvsignore new file mode 100644 index 0000000000..05e018e460 --- /dev/null +++ b/bin/tests/system/rpz/.cvsignore @@ -0,0 +1,2 @@ +Makefile +rpz diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh index e0e2244d4a..01eb07dff9 100644 --- a/bin/tests/system/smartsign/tests.sh +++ b/bin/tests/system/smartsign/tests.sh @@ -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.21 2012/02/09 23:47:18 tbox Exp $ +# $Id: tests.sh,v 1.19.82.2 2012/02/09 23:46:51 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/sortlist/ns1/.cvsignore b/bin/tests/system/sortlist/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/sortlist/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl index fb243c27d4..1760001d95 100644 --- a/bin/tests/system/start.pl +++ b/bin/tests/system/start.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: start.pl,v 1.30 2012/02/06 23:46:44 tbox Exp $ +# $Id: start.pl,v 1.28.118.2 2012/02/06 23:46:22 tbox Exp $ # Framework for starting test servers. # Based on the type of server specified, check for port availability, remove diff --git a/bin/tests/system/stress/ns1/.cvsignore b/bin/tests/system/stress/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/stress/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/stress/ns2/.cvsignore b/bin/tests/system/stress/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/stress/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/stress/ns3/.cvsignore b/bin/tests/system/stress/ns3/.cvsignore new file mode 100644 index 0000000000..1410f2d08f --- /dev/null +++ b/bin/tests/system/stress/ns3/.cvsignore @@ -0,0 +1,2 @@ +named.run +zones.conf diff --git a/bin/tests/system/stress/ns4/.cvsignore b/bin/tests/system/stress/ns4/.cvsignore new file mode 100644 index 0000000000..1410f2d08f --- /dev/null +++ b/bin/tests/system/stress/ns4/.cvsignore @@ -0,0 +1,2 @@ +named.run +zones.conf diff --git a/bin/tests/system/stub/ns1/.cvsignore b/bin/tests/system/stub/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/stub/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/stub/ns2/.cvsignore b/bin/tests/system/stub/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/stub/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/stub/ns3/.cvsignore b/bin/tests/system/stub/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/stub/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/tkey/.cvsignore b/bin/tests/system/tkey/.cvsignore new file mode 100644 index 0000000000..7e5bacb359 --- /dev/null +++ b/bin/tests/system/tkey/.cvsignore @@ -0,0 +1,5 @@ +Makefile +keycreate +keydelete +*.lo +.libs diff --git a/bin/tests/system/tkey/ns1/.cvsignore b/bin/tests/system/tkey/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/tkey/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/tsiggss/.cvsignore b/bin/tests/system/tsiggss/.cvsignore new file mode 100644 index 0000000000..8bebbb2490 --- /dev/null +++ b/bin/tests/system/tsiggss/.cvsignore @@ -0,0 +1,2 @@ +Makefile +gssapi_krb diff --git a/bin/tests/system/unknown/ns1/.cvsignore b/bin/tests/system/unknown/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/unknown/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/upforwd/ns1/.cvsignore b/bin/tests/system/upforwd/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/upforwd/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/upforwd/ns2/.cvsignore b/bin/tests/system/upforwd/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/upforwd/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/upforwd/ns3/.cvsignore b/bin/tests/system/upforwd/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/upforwd/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/v6synth/ns1/.cvsignore b/bin/tests/system/v6synth/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/v6synth/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/v6synth/ns2/.cvsignore b/bin/tests/system/v6synth/ns2/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/v6synth/ns2/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/v6synth/ns3/.cvsignore b/bin/tests/system/v6synth/ns3/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/v6synth/ns3/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/views/.cvsignore b/bin/tests/system/views/.cvsignore new file mode 100644 index 0000000000..0d3379fb38 --- /dev/null +++ b/bin/tests/system/views/.cvsignore @@ -0,0 +1,5 @@ +dig.out.ns2.1 +dig.out.ns3.1 +dig.out.ns4.2 +dig.out.ns2.2 +dig.out.ns3.2 diff --git a/bin/tests/system/views/ns1/.cvsignore b/bin/tests/system/views/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/views/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/views/ns2/.cvsignore b/bin/tests/system/views/ns2/.cvsignore new file mode 100644 index 0000000000..bc9653ed65 --- /dev/null +++ b/bin/tests/system/views/ns2/.cvsignore @@ -0,0 +1,3 @@ +named.conf +example.db +named.run diff --git a/bin/tests/system/views/ns3/.cvsignore b/bin/tests/system/views/ns3/.cvsignore new file mode 100644 index 0000000000..022ff7b974 --- /dev/null +++ b/bin/tests/system/views/ns3/.cvsignore @@ -0,0 +1,3 @@ +named.conf +named.run +internal.bk diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh index 747490f581..412d371e16 100644 --- a/bin/tests/system/xfer/clean.sh +++ b/bin/tests/system/xfer/clean.sh @@ -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.19 2012/02/22 23:47:35 tbox Exp $ +# $Id: clean.sh,v 1.17.44.2 2012/02/22 23:47:08 tbox Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/xfer/ns1/.cvsignore b/bin/tests/system/xfer/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/system/xfer/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/system/xfer/ns2/.cvsignore b/bin/tests/system/xfer/ns2/.cvsignore new file mode 100644 index 0000000000..188dad9ed8 --- /dev/null +++ b/bin/tests/system/xfer/ns2/.cvsignore @@ -0,0 +1,4 @@ +named.run +example.db +tsigzone.db +example.db.jnl diff --git a/bin/tests/system/xfer/ns3/.cvsignore b/bin/tests/system/xfer/ns3/.cvsignore new file mode 100644 index 0000000000..73995e8d0e --- /dev/null +++ b/bin/tests/system/xfer/ns3/.cvsignore @@ -0,0 +1,3 @@ +named.run +tsigzone.bk +example.bk.jnl diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh index 621f01f6dd..21a4853b32 100644 --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/tests.sh @@ -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.37 2012/02/22 23:47:35 tbox Exp $ +# $Id: tests.sh,v 1.35.44.2 2012/02/22 23:47:08 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/xferquota/ns1/.cvsignore b/bin/tests/system/xferquota/ns1/.cvsignore new file mode 100644 index 0000000000..fffbde54e5 --- /dev/null +++ b/bin/tests/system/xferquota/ns1/.cvsignore @@ -0,0 +1,2 @@ +changing.db +named.run diff --git a/bin/tests/system/xferquota/ns2/.cvsignore b/bin/tests/system/xferquota/ns2/.cvsignore new file mode 100644 index 0000000000..8b6af28859 --- /dev/null +++ b/bin/tests/system/xferquota/ns2/.cvsignore @@ -0,0 +1,2 @@ +named.run +changing.bk diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh index 3ea48c648a..c103c59b92 100644 --- a/bin/tests/system/zonechecks/clean.sh +++ b/bin/tests/system/zonechecks/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007 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,10 +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.8 2012/01/31 23:47:32 tbox Exp $ +# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $ rm -f *.out rm -f */named.memstats -rm -f */*.db */*.db.signed */K*.key */K*.private */*.jnl */dsset-* -rm -f rndc.out.* -rm -f random.data diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh index 32bd4b3fe0..8c09abb91a 100644 --- a/bin/tests/system/zonechecks/tests.sh +++ b/bin/tests/system/zonechecks/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 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.10 2012/02/02 03:26:55 marka Exp $ +# $Id: tests.sh,v 1.6 2009/12/04 22:06:37 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -25,13 +25,13 @@ status=0 echo "I: checking that we detect a NS which refers to a CNAME" if $CHECKZONE . cname.db > cname.out 2>&1 then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "is a CNAME" cname.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -39,13 +39,13 @@ fi echo "I: checking that we detect a NS which is below a DNAME" if $CHECKZONE . dname.db > dname.out 2>&1 then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "is below a DNAME" dname.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -53,13 +53,13 @@ fi echo "I: checking that we detect a NS which has no address records (A/AAAA)" if $CHECKZONE . noaddress.db > noaddress.out then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "has no address records" noaddress.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -67,13 +67,13 @@ fi echo "I: checking that we detect a NS which has no records" if $CHECKZONE . nxdomain.db > nxdomain.out then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "has no address records" noaddress.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -81,13 +81,13 @@ fi echo "I: checking that we detect a NS which looks like a A record (fail)" if $CHECKZONE -n fail . a.db > a.out 2>&1 then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "appears to be an address" a.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -99,10 +99,10 @@ then then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi else - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 fi # @@ -111,25 +111,25 @@ if $CHECKZONE -n ignore . a.db > a.out 2>&1 then if grep "appears to be an address" a.out > /dev/null then - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 else : fi else - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 fi # echo "I: checking that we detect a NS which looks like a AAAA record (fail)" if $CHECKZONE -n fail . aaaa.db > aaaa.out 2>&1 then - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 else if grep "appears to be an address" aaaa.out > /dev/null then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi fi @@ -141,10 +141,10 @@ then then : else - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 fi else - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 fi # @@ -153,60 +153,12 @@ if $CHECKZONE -n ignore . aaaa.db > aaaa.out 2>&1 then if grep "appears to be an address" aaaa.out > /dev/null then - echo "I:failed (message)"; status=`expr $status + 1` + echo "I:failed (message)"; status=1 else : fi else - echo "I:failed (status)"; status=`expr $status + 1` + echo "I:failed (status)"; status=1 fi - -# -echo "I: checking 'rdnc zonestatus' output" -ret=0 -for i in 0 1 2 3 4 5 6 7 8 9 -do - $RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus master.example > rndc.out.master 2>&1 - grep "zone not loaded" rndc.out.master > /dev/null || break - sleep 1 -done -checkfor() { - grep "$1" $2 > /dev/null || { - ret=1; - echo "I: missing '$1' from '$2'" - } -} -checkfor "name: master.example" rndc.out.master -checkfor "type: master" rndc.out.master -checkfor "files: master.db, master.db.signed" rndc.out.master -checkfor "serial: " rndc.out.master -checkfor "nodes: " rndc.out.master -checkfor "last loaded: " rndc.out.master -checkfor "secure: yes" rndc.out.master -checkfor "inline signing: no" rndc.out.master -checkfor "key maintenance: automatic" rndc.out.master -checkfor "next key event: " rndc.out.master -checkfor "next resign node: " rndc.out.master -checkfor "next resign time: " rndc.out.master -checkfor "dynamic: yes" rndc.out.master -checkfor "frozen: no" rndc.out.master -for i in 0 1 2 3 4 5 6 7 8 9 -do - $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 zonestatus master.example > rndc.out.slave 2>&1 - grep "zone not loaded" rndc.out.slave > /dev/null || break - sleep 1 -done -checkfor "name: master.example" rndc.out.slave -checkfor "type: slave" rndc.out.slave -checkfor "files: slave.db" rndc.out.slave -checkfor "serial: " rndc.out.slave -checkfor "nodes: " rndc.out.slave -checkfor "next refresh: " rndc.out.slave -checkfor "expires: " rndc.out.slave -checkfor "secure: yes" rndc.out.slave - -if [ $ret != 0 ]; then echo "I:failed"; fi -status=`expr $status + $ret` - echo "I:exit status: $status" exit $status diff --git a/bin/tests/tasks/.cvsignore b/bin/tests/tasks/.cvsignore new file mode 100644 index 0000000000..8234f05c25 --- /dev/null +++ b/bin/tests/tasks/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_tasks +.libs +*.lo diff --git a/bin/tests/timers/.cvsignore b/bin/tests/timers/.cvsignore new file mode 100644 index 0000000000..31f5d19ac0 --- /dev/null +++ b/bin/tests/timers/.cvsignore @@ -0,0 +1,4 @@ +Makefile +t_timers +.libs +*.lo diff --git a/bin/tests/virtual-time/.cvsignore b/bin/tests/virtual-time/.cvsignore new file mode 100644 index 0000000000..dc8ce267a9 --- /dev/null +++ b/bin/tests/virtual-time/.cvsignore @@ -0,0 +1,5 @@ +Makefile +conf.sh +vtwrapper.bin +libvtwrapper.so +setepoch diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore b/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore b/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tests/virtual-time/slave/ns1/.cvsignore b/bin/tests/virtual-time/slave/ns1/.cvsignore new file mode 100644 index 0000000000..6af68aad15 --- /dev/null +++ b/bin/tests/virtual-time/slave/ns1/.cvsignore @@ -0,0 +1 @@ +named.run diff --git a/bin/tools/.cvsignore b/bin/tools/.cvsignore new file mode 100644 index 0000000000..5bdc2913b5 --- /dev/null +++ b/bin/tools/.cvsignore @@ -0,0 +1,6 @@ +Makefile +arpaname +genrandom +isc-hmac-fixup +named-journalprint +nsec3hash diff --git a/config.h.in b/config.h.in index 9728eaa724..a2eec9c2ed 100644 --- a/config.h.in +++ b/config.h.in @@ -16,7 +16,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.h.in,v 1.153 2012/01/30 07:11:47 marka Exp $ */ +/* $Id: config.h.in,v 1.152.22.1 2012/01/30 10:09:37 marka Exp $ */ /*! \file */ diff --git a/configure b/configure index 33389915ed..7e0ed99237 100755 --- a/configure +++ b/configure @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# $Id: configure,v 1.518 2012/01/30 07:11:47 marka Exp $ +# $Id: configure,v 1.517.22.1 2012/01/30 10:09:37 marka Exp $ # # Portions of this code release fall under one or more of the # following Copyright notices. Please see individual source diff --git a/contrib/.cvsignore b/contrib/.cvsignore new file mode 100644 index 0000000000..990d9f7c77 --- /dev/null +++ b/contrib/.cvsignore @@ -0,0 +1,2 @@ +check-secure-delegation.pl +zone-edit.sh diff --git a/contrib/dlz/bin/dlzbdb/.cvsignore b/contrib/dlz/bin/dlzbdb/.cvsignore new file mode 100644 index 0000000000..5e57bac628 --- /dev/null +++ b/contrib/dlz/bin/dlzbdb/.cvsignore @@ -0,0 +1,3 @@ +Makefile +dlzbdb +*.o diff --git a/contrib/dlz/drivers/.cvsignore b/contrib/dlz/drivers/.cvsignore new file mode 100644 index 0000000000..de7475d888 --- /dev/null +++ b/contrib/dlz/drivers/.cvsignore @@ -0,0 +1 @@ +rules diff --git a/contrib/queryperf/.cvsignore b/contrib/queryperf/.cvsignore new file mode 100644 index 0000000000..8ff7a352f0 --- /dev/null +++ b/contrib/queryperf/.cvsignore @@ -0,0 +1,6 @@ +queryperf +config.h +config.log +config.cache +config.status +Makefile diff --git a/doc/.cvsignore b/doc/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/doc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/doc/arm/.cvsignore b/doc/arm/.cvsignore new file mode 100644 index 0000000000..f00b67e062 --- /dev/null +++ b/doc/arm/.cvsignore @@ -0,0 +1,12 @@ +Makefile +catalog +Bv9ARM.aux +Bv9ARM.brf +Bv9ARM.glo +Bv9ARM.idx +Bv9ARM.log +Bv9ARM.out +Bv9ARM.tex +Bv9ARM.tex.tmp +Bv9ARM.toc +releaseinfo.xml diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 4f2e97fc35..de50e49ad6 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + BIND 9 Administrator Reference Manual @@ -1311,26 +1311,6 @@ zone "eng.example.com" { - - zonestatus - zone - class - view - - - Displays the current status of the given zone, - including the master file name and any include - files from which it was loaded, when it was most - recently loaded, the current serial number, the - number of nodes, whether the zone supports - dynamic updates, whether the zone is DNSSEC - signed, whether it uses automatic DNSSEC key - management or inline signing, and the scheduled - refresh or expiry times for the zone. - - - - stats diff --git a/doc/arm/Bv9ARM.ch03.html b/doc/arm/Bv9ARM.ch03.html index 4dce6b6e89..5abf801013 100644 --- a/doc/arm/Bv9ARM.ch03.html +++ b/doc/arm/Bv9ARM.ch03.html @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -54,7 +54,7 @@
Name Server Operations
Tools for Use With the Name Server Daemon
-
Signals
+
Signals
@@ -584,21 +584,6 @@ zone "eng.example.com" { to examine the modification times of the zones files.

-
zonestatus - [zone - [class - [view]]]
-

- Displays the current status of the given zone, - including the master file name and any include - files from which it was loaded, when it was most - recently loaded, the current serial number, the - number of nodes, whether the zone supports - dynamic updates, whether the zone is DNSSEC - signed, whether it uses automatic DNSSEC key - management or inline signing, and the scheduled - refresh or expiry times for the zone. -

stats

Write server statistics to the statistics file. @@ -983,7 +968,7 @@ controls {

-Signals

+Signals

Certain UNIX signals cause the name server to take specific actions, as described in the following table. These signals can diff --git a/doc/arm/Bv9ARM.ch04.html b/doc/arm/Bv9ARM.ch04.html index 9f09f8463e..2c6f75c1d1 100644 --- a/doc/arm/Bv9ARM.ch04.html +++ b/doc/arm/Bv9ARM.ch04.html @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + @@ -49,59 +49,59 @@

Dynamic Update
The journal file
Incremental Zone Transfers (IXFR)
-
Split DNS
-
Example split DNS setup
+
Split DNS
+
Example split DNS setup
TSIG
-
Generate Shared Keys for Each Pair of Hosts
-
Copying the Shared Secret to Both Machines
-
Informing the Servers of the Key's Existence
-
Instructing the Server to Use the Key
-
TSIG Key Based Access Control
-
Errors
+
Generate Shared Keys for Each Pair of Hosts
+
Copying the Shared Secret to Both Machines
+
Informing the Servers of the Key's Existence
+
Instructing the Server to Use the Key
+
TSIG Key Based Access Control
+
Errors
-
TKEY
-
SIG(0)
+
TKEY
+
SIG(0)
DNSSEC
-
Generating Keys
-
Signing the Zone
-
Configuring Servers
+
Generating Keys
+
Signing the Zone
+
Configuring Servers
DNSSEC, Dynamic Zones, and Automatic Signing
-
Converting from insecure to secure
-
Dynamic DNS update method
-
Fully automatic zone signing
-
Private-type records
-
DNSKEY rollovers
-
Dynamic DNS update method
-
Automatic key rollovers
-
NSEC3PARAM rollovers via UPDATE
-
Converting from NSEC to NSEC3
-
Converting from NSEC3 to NSEC
-
Converting from secure to insecure
-
Periodic re-signing
-
NSEC3 and OPTOUT
+
Converting from insecure to secure
+
Dynamic DNS update method
+
Fully automatic zone signing
+
Private-type records
+
DNSKEY rollovers
+
Dynamic DNS update method
+
Automatic key rollovers
+
NSEC3PARAM rollovers via UPDATE
+
Converting from NSEC to NSEC3
+
Converting from NSEC3 to NSEC
+
Converting from secure to insecure
+
Periodic re-signing
+
NSEC3 and OPTOUT
Dynamic Trust Anchor Management
-
Validating Resolver
-
Authoritative Server
+
Validating Resolver
+
Authoritative Server
PKCS #11 (Cryptoki) support
-
Prerequisites
-
Building BIND 9 with PKCS#11
-
PKCS #11 Tools
-
Using the HSM
-
Specifying the engine on the command line
-
Running named with automatic zone re-signing
+
Prerequisites
+
Building BIND 9 with PKCS#11
+
PKCS #11 Tools
+
Using the HSM
+
Specifying the engine on the command line
+
Running named with automatic zone re-signing
-
IPv6 Support in BIND 9
+
IPv6 Support in BIND 9
-
Address Lookups Using AAAA Records
-
Address to Name Lookups Using Nibble Format
+
Address Lookups Using AAAA Records
+
Address to Name Lookups Using Nibble Format
@@ -256,7 +256,7 @@

-Split DNS

+Split DNS

Setting up different views, or visibility, of the DNS space to internal and external resolvers is usually referred to as a @@ -286,7 +286,7 @@

-Example split DNS setup

+Example split DNS setup

Let's say a company named Example, Inc. (example.com) @@ -543,7 +543,7 @@ nameserver 172.16.72.4

-Generate Shared Keys for Each Pair of Hosts

+Generate Shared Keys for Each Pair of Hosts

A shared secret is generated to be shared between host1 and host2. An arbitrary key name is chosen: "host1-host2.". The key name must @@ -551,7 +551,7 @@ nameserver 172.16.72.4

-Automatic Generation

+Automatic Generation

The following command will generate a 128-bit (16 byte) HMAC-SHA256 key as described above. Longer keys are better, but shorter keys @@ -575,7 +575,7 @@ nameserver 172.16.72.4

-Manual Generation

+Manual Generation

The shared secret is simply a random sequence of bits, encoded in base-64. Most ASCII strings are valid base-64 strings (assuming @@ -590,7 +590,7 @@ nameserver 172.16.72.4

-Copying the Shared Secret to Both Machines

+Copying the Shared Secret to Both Machines

This is beyond the scope of DNS. A secure transport mechanism should be used. This could be secure FTP, ssh, telephone, etc. @@ -598,7 +598,7 @@ nameserver 172.16.72.4

-Informing the Servers of the Key's Existence

+Informing the Servers of the Key's Existence

Imagine host1 and host 2 are @@ -625,7 +625,7 @@ key host1-host2. {

-Instructing the Server to Use the Key

+Instructing the Server to Use the Key

Since keys are shared between two hosts only, the server must be told when keys are to be used. The following is added to the named.conf file @@ -657,7 +657,7 @@ server 10.1.2.3 {

-TSIG Key Based Access Control

+TSIG Key Based Access Control

BIND allows IP addresses and ranges to be specified in ACL @@ -684,7 +684,7 @@ allow-update { key host1-host2. ;};

-Errors

+Errors

The processing of TSIG signed messages can result in several errors. If a signed message is sent to a non-TSIG aware @@ -710,7 +710,7 @@ allow-update { key host1-host2. ;};

-TKEY

+TKEY

TKEY is a mechanism for automatically generating a shared secret between two hosts. There are several "modes" of @@ -746,7 +746,7 @@ allow-update { key host1-host2. ;};

-SIG(0)

+SIG(0)

BIND 9 partially supports DNSSEC SIG(0) transaction signatures as specified in RFC 2535 and RFC 2931. @@ -807,7 +807,7 @@ allow-update { key host1-host2. ;};

-Generating Keys

+Generating Keys

The dnssec-keygen program is used to generate keys. @@ -863,7 +863,7 @@ allow-update { key host1-host2. ;};

-Signing the Zone

+Signing the Zone

The dnssec-signzone program is used to sign a zone. @@ -905,7 +905,7 @@ allow-update { key host1-host2. ;};

-Configuring Servers

+Configuring Servers

To enable named to respond appropriately to DNS requests from DNSSEC aware clients, @@ -1065,7 +1065,7 @@ options { from insecure to signed and back again. A secure zone can use either NSEC or NSEC3 chains.

-Converting from insecure to secure

+Converting from insecure to secure

Changing a zone from insecure to secure can be done in two ways: using a dynamic DNS update, or the auto-dnssec zone option.

@@ -1091,7 +1091,7 @@ options { well. An NSEC chain will be generated as part of the initial signing process.

-Dynamic DNS update method

+Dynamic DNS update method

To insert the keys via dynamic update:

         % nsupdate
@@ -1127,7 +1127,7 @@ options {
 
While the initial signing and NSEC/NSEC3 chain generation
   is happening, other updates are possible as well.

 

-Fully automatic zone signing

+Fully automatic zone signing
 
To enable automatic signing, add the 
   auto-dnssec option to the zone statement in 
   named.conf. 
@@ -1183,7 +1183,7 @@ options {
   configuration. If this has not been done, the configuration will
   fail.

 

-Private-type records

+Private-type records
 
The state of the signing process is signaled by
   private-type records (with a default type value of 65534). When
   signing is complete, these records will have a nonzero value for
@@ -1224,12 +1224,12 @@ options {
 

   

 

-DNSKEY rollovers

+DNSKEY rollovers
 
As with insecure-to-secure conversions, rolling DNSSEC
   keys can be done in two ways: using a dynamic DNS update, or the 
   auto-dnssec zone option.

 

-Dynamic DNS update method

+Dynamic DNS update method
 
 To perform key rollovers via dynamic update, you need to add
   the K* files for the new keys so that 
   named can find them. You can then add the new
@@ -1251,7 +1251,7 @@ options {
   named will clean out any signatures generated
   by the old key after the update completes.

 

-Automatic key rollovers

+Automatic key rollovers
 
When a new key reaches its activation date (as set by
   dnssec-keygen or dnssec-settime),
   if the auto-dnssec zone option is set to 
@@ -1266,27 +1266,27 @@ options {
   completes in 30 days, after which it will be safe to remove the
   old key from the DNSKEY RRset.

 

-NSEC3PARAM rollovers via UPDATE

+NSEC3PARAM rollovers via UPDATE
 
Add the new NSEC3PARAM record via dynamic update. When the
   new NSEC3 chain has been generated, the NSEC3PARAM flag field
   will be zero. At this point you can remove the old NSEC3PARAM
   record. The old chain will be removed after the update request
   completes.

 

-Converting from NSEC to NSEC3

+Converting from NSEC to NSEC3
 
To do this, you just need to add an NSEC3PARAM record. When
   the conversion is complete, the NSEC chain will have been removed
   and the NSEC3PARAM record will have a zero flag field. The NSEC3
   chain will be generated before the NSEC chain is
   destroyed.

 

-Converting from NSEC3 to NSEC

+Converting from NSEC3 to NSEC
 
To do this, use nsupdate to
   remove all NSEC3PARAM records with a zero flag
   field. The NSEC chain will be generated before the NSEC3 chain is
   removed.

 

-Converting from secure to insecure

+Converting from secure to insecure
 
To convert a signed zone to unsigned using dynamic DNS,
   delete all the DNSKEY records from the zone apex using
   nsupdate. All signatures, NSEC or NSEC3 chains,
@@ -1301,14 +1301,14 @@ options {
   allow instead (or it will re-sign).
   

 

-Periodic re-signing

+Periodic re-signing
 
In any secure zone which supports dynamic updates, named
   will periodically re-sign RRsets which have not been re-signed as
   a result of some update action. The signature lifetimes will be
   adjusted so as to spread the re-sign load over time rather than
   all at once.

 

-NSEC3 and OPTOUT

+NSEC3 and OPTOUT
 

   named only supports creating new NSEC3 chains
   where all the NSEC3 records in the zone have the same OPTOUT
@@ -1330,7 +1330,7 @@ options {
   configuration files.

 

 

-Validating Resolver

+Validating Resolver

 
To configure a validating resolver to use RFC 5011 to
     maintain a trust anchor, configure the trust anchor using a 
     managed-keys statement. Information about
@@ -1341,7 +1341,7 @@ options {
 
 

 

-Authoritative Server

+Authoritative Server

 
To set up an authoritative zone for RFC 5011 trust anchor
     maintenance, generate two (or more) key signing keys (KSKs) for
     the zone. Sign the zone with one of them; this is the "active"
@@ -1415,7 +1415,7 @@ $ dnssec-signzone -S -K keys example.net<
   Debian Linux, Solaris x86 and Windows Server 2003.

 

 

-Prerequisites

+Prerequisites

 
See the HSM vendor documentation for information about
     installing, initializing, testing and troubleshooting the
     HSM.

@@ -1492,7 +1492,7 @@ $ patch -p1 -d openssl-0.9.8s \
     when we configure BIND 9.

 

 

-Building OpenSSL for the AEP Keyper on Linux

+Building OpenSSL for the AEP Keyper on Linux

 
The AEP Keyper is a highly secure key storage device,
       but does not provide hardware cryptographic acceleration. It
       can carry out cryptographic operations, but it is probably
@@ -1524,7 +1524,7 @@ $ ./Configure linux-generic32 -m32 -pthread \
 
 

 

-Building OpenSSL for the SCA 6000 on Solaris

+Building OpenSSL for the SCA 6000 on Solaris

 
The SCA-6000 PKCS #11 provider is installed as a system
       library, libpkcs11. It is a true crypto accelerator, up to 4
       times faster than any CPU, so the flavor shall be
@@ -1546,7 +1546,7 @@ $ ./Configure solaris64-x86_64-cc \
 
 

 

-Building OpenSSL for SoftHSM

+Building OpenSSL for SoftHSM

 
SoftHSM is a software library provided by the OpenDNSSEC
       project (http://www.opendnssec.org) which provides a PKCS#11
       interface to a virtual HSM, implemented in the form of encrypted
@@ -1606,12 +1606,12 @@ $ ./Configure linux-x86_64 -pthread \
 
 

 

-Building BIND 9 with PKCS#11

+Building BIND 9 with PKCS#11

 
When building BIND 9, the location of the custom-built
     OpenSSL library must be specified via configure.

 

 

-Configuring BIND 9 for Linux with the AEP Keyper

+Configuring BIND 9 for Linux with the AEP Keyper

 
To link with the PKCS #11 provider, threads must be
       enabled in the BIND 9 build.

 
The PKCS #11 library for the AEP Keyper is currently
@@ -1627,7 +1627,7 @@ $ ./configure CC="gcc -m32" --enable-threads \
 
 

 

-Configuring BIND 9 for Solaris with the SCA 6000

+Configuring BIND 9 for Solaris with the SCA 6000

 
To link with the PKCS #11 provider, threads must be
       enabled in the BIND 9 build.

 
@@ -1645,7 +1645,7 @@ $ ./configure CC="cc -xarch=amd64" --enable-thre
 
 

 

-Configuring BIND 9 for SoftHSM

+Configuring BIND 9 for SoftHSM

 
 $ cd ../bind9
 $ ./configure --enable-threads \
@@ -1662,7 +1662,7 @@ $ ./configure --enable-threads \
 
 

 

-PKCS #11 Tools

+PKCS #11 Tools

 
BIND 9 includes a minimal set of tools to operate the
     HSM, including 
     pkcs11-keygen to generate a new key pair
@@ -1680,7 +1680,7 @@ $ ./configure --enable-threads \
 
 

 

-Using the HSM

+Using the HSM

 
First, we must set up the runtime environment so the
     OpenSSL and PKCS #11 libraries can be loaded:

 
@@ -1768,7 +1768,7 @@ example.net.signed
 
 

 

-Specifying the engine on the command line

+Specifying the engine on the command line

 
The OpenSSL engine can be specified in 
     named and all of the BIND 
     dnssec-* tools by using the "-E
@@ -1789,7 +1789,7 @@ $ dnssec-signzone -E '' -S example.net
 

 

-Running named with automatic zone re-signing

+Running named with automatic zone re-signing

 
If you want 
     named to dynamically re-sign zones using HSM
     keys, and/or to to sign new records inserted via nsupdate, then
@@ -1825,7 +1825,7 @@ $ dnssec-signzone -E '' -S example.net
 

 

-IPv6 Support in BIND 9

+IPv6 Support in BIND 9

 

         BIND 9 fully supports all currently
         defined forms of IPv6 name to address and address to name
@@ -1863,7 +1863,7 @@ $ dnssec-signzone -E '' -S example.net
 

 

-Address Lookups Using AAAA Records

+Address Lookups Using AAAA Records

 

           The IPv6 AAAA record is a parallel to the IPv4 A record,
           and, unlike the deprecated A6 record, specifies the entire
@@ -1882,7 +1882,7 @@ host            3600    IN      AAAA    2001:db8::1
 
 

 

-Address to Name Lookups Using Nibble Format

+Address to Name Lookups Using Nibble Format

 

           When looking up an address in nibble format, the address
           components are simply reversed, just as in IPv4, and
diff --git a/doc/arm/Bv9ARM.ch05.html b/doc/arm/Bv9ARM.ch05.html
index a9965404f9..12ee499254 100644
--- a/doc/arm/Bv9ARM.ch05.html
+++ b/doc/arm/Bv9ARM.ch05.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -45,13 +45,13 @@
 

 
Table of Contents

 

-
The Lightweight Resolver Library

+
The Lightweight Resolver Library

 
Running a Resolver Daemon

 

 

 

 

-The Lightweight Resolver Library

+The Lightweight Resolver Library

 

         Traditionally applications have been linked with a stub resolver
         library that sends recursive DNS queries to a local caching name
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 37eab02b06..3347b384d0 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -48,58 +48,58 @@
 
Configuration File Elements

 

 
Address Match Lists

-
Comment Syntax

+
Comment Syntax

 

 
Configuration File Grammar

 

-
acl Statement Grammar

+
acl Statement Grammar

 
acl Statement Definition and
           Usage

-
controls Statement Grammar

+
controls Statement Grammar

 
controls Statement Definition and
           Usage

-
include Statement Grammar

-
include Statement Definition and
+
include Statement Grammar

+
include Statement Definition and
           Usage

-
key Statement Grammar

-
key Statement Definition and Usage

-
logging Statement Grammar

-
logging Statement Definition and
+
key Statement Grammar

+
key Statement Definition and Usage

+
logging Statement Grammar

+
logging Statement Definition and
           Usage

-
lwres Statement Grammar

-
lwres Statement Definition and Usage

-
masters Statement Grammar

-
masters Statement Definition and
+
lwres Statement Grammar

+
lwres Statement Definition and Usage

+
masters Statement Grammar

+
masters Statement Definition and
           Usage

-
options Statement Grammar

+
options Statement Grammar

 
options Statement Definition and
           Usage

 
server Statement Grammar

 
server Statement Definition and
             Usage

 
statistics-channels Statement Grammar

-
statistics-channels Statement Definition and
+
statistics-channels Statement Definition and
             Usage

 
trusted-keys Statement Grammar

-
trusted-keys Statement Definition
+
trusted-keys Statement Definition
             and Usage

-
managed-keys Statement Grammar

+
managed-keys Statement Grammar

 
managed-keys Statement Definition
             and Usage

 
view Statement Grammar

-
view Statement Definition and Usage

+
view Statement Definition and Usage

 
zone
             Statement Grammar

-
zone Statement Definition and Usage

+
zone Statement Definition and Usage

 

-
Zone File

+
Zone File

 

 
Types of Resource Records and When to Use Them

-
Discussion of MX Records

+
Discussion of MX Records

 
Setting TTLs

-
Inverse Mapping in IPv4

-
Other Zone File Directives

-
BIND Master File Extension: the  $GENERATE Directive

+
Inverse Mapping in IPv4

+
Other Zone File Directives

+
BIND Master File Extension: the  $GENERATE Directive

 
Additional File Formats

 

 
BIND9 Statistics

@@ -477,7 +477,7 @@
 Address Match Lists
 

 

-Syntax

+Syntax

 
address_match_list = address_match_list_element ;
   [ address_match_list_element; ... ]
 address_match_list_element = [ ! ] (ip_address [/length] |
@@ -486,7 +486,7 @@
 
 

 

-Definition and Usage

+Definition and Usage

 

             Address match lists are primarily used to determine access
             control for various server operations. They are also used in
@@ -570,7 +570,7 @@
 
 

 

-Comment Syntax

+Comment Syntax

 

           The BIND 9 comment syntax allows for
           comments to appear
@@ -580,7 +580,7 @@
         

 

 

-Syntax

+Syntax

 

             

 
/* This is a BIND comment as in C */

@@ -596,7 +596,7 @@
 
 

 

-Definition and Usage

+Definition and Usage

 

             Comments may appear anywhere that whitespace may appear in
             a BIND configuration file.
@@ -850,7 +850,7 @@
       

 

 

-acl Statement Grammar

+acl Statement Grammar

 
acl acl-name {
     address_match_list
 };
@@ -932,7 +932,7 @@
 
 

 

-controls Statement Grammar

+controls Statement Grammar

 
controls {
    [ inet ( ip_addr | * ) [ port ip_port ]
                 allow {  address_match_list  }
@@ -1056,12 +1056,12 @@
 
 

 

-include Statement Grammar

+include Statement Grammar

 
include filename;

 
 

 

-include Statement Definition and
+include Statement Definition and
           Usage

 

           The include statement inserts the
@@ -1076,7 +1076,7 @@
 

 

 

-key Statement Grammar

+key Statement Grammar

 
key key_id {
     algorithm string;
     secret string;
@@ -1085,7 +1085,7 @@
 
 

 

-key Statement Definition and Usage

+key Statement Definition and Usage

 

           The key statement defines a shared
           secret key for use with TSIG (see the section called “TSIG”)
@@ -1132,7 +1132,7 @@
 
 

 

-logging Statement Grammar

+logging Statement Grammar

 
logging {
    [ channel channel_name {
      ( file path_name
@@ -1156,7 +1156,7 @@
 
 

 

-logging Statement Definition and
+logging Statement Definition and
           Usage

 

           The logging statement configures a
@@ -1190,7 +1190,7 @@
         

 

 

-The channel Phrase

+The channel Phrase

 

             All log output goes to one or more channels;
             you can make as many of them as you want.
@@ -1774,7 +1774,7 @@ category notify { null; };
 
 

 

-The query-errors Category

+The query-errors Category

 

             The query-errors category is
             specifically intended for debugging purposes: To identify
@@ -2002,7 +2002,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 
 

 

-lwres Statement Grammar

+lwres Statement Grammar

 

            This is the grammar of the lwres
           statement in the named.conf file:
@@ -2018,7 +2018,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 
 

 

-lwres Statement Definition and Usage

+lwres Statement Definition and Usage

 

           The lwres statement configures the
           name
@@ -2069,7 +2069,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 
 

 

-masters Statement Grammar

+masters Statement Grammar

 
 masters name [port ip_port] { ( masters_list | 
       ip_addr [port ip_port] [key key] ) ; [...] };
@@ -2077,7 +2077,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 
 

 

-masters Statement Definition and
+masters Statement Definition and
           Usage

 
masters
           lists allow for a common set of masters to be easily used by
@@ -2087,7 +2087,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 

 

 

-options Statement Grammar

+options Statement Grammar

 

           This is the grammar of the options
           statement in the named.conf file:
@@ -3724,7 +3724,7 @@ options {
 
 

 

-Forwarding

+Forwarding

 

             The forwarding facility can be used to create a large site-wide
             cache on a few servers, reducing traffic over links to external
@@ -3768,7 +3768,7 @@ options {
 
 

 

-Dual-stack Servers

+Dual-stack Servers

 

             Dual-stack servers are used as servers of last resort to work
             around
@@ -3979,7 +3979,7 @@ options {
 
 

 

-Interfaces

+Interfaces

 

             The interfaces and ports that the server will answer queries
             from may be specified using the listen-on option. listen-on takes
@@ -4447,7 +4447,7 @@ avoid-v6-udp-ports {};
 
 

 

-UDP Port Lists

+UDP Port Lists

 

             use-v4-udp-ports,
             avoid-v4-udp-ports,
@@ -4489,7 +4489,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 
 

 

-Operating System Resource Limits

+Operating System Resource Limits

 

             The server's usage of many system resources can be limited.
             Scaled values are allowed when specifying resource limits.  For
@@ -4651,7 +4651,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 
 

 

-Periodic Task Intervals

+Periodic Task Intervals

 

 
cleaning-interval

 

@@ -5509,7 +5509,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 

 

 

-Content Filtering

+Content Filtering

 

             BIND 9 provides the ability to filter
             out DNS responses from external DNS servers containing
@@ -5632,7 +5632,7 @@ deny-answer-aliases { "example.net"; };
 
 

 

-Response Policy Zone (RPZ) Rewriting

+Response Policy Zone (RPZ) Rewriting

 

             BIND 9 includes an intentionally limited
             mechanism to modify DNS responses for recursive requests
@@ -6068,7 +6068,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
 
 

 

-statistics-channels Statement Definition and
+statistics-channels Statement Definition and
             Usage

 

           The statistics-channels statement
@@ -6128,7 +6128,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
 

 

 

-trusted-keys Statement Definition
+trusted-keys Statement Definition
             and Usage

 

             The trusted-keys statement defines
@@ -6168,7 +6168,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
 

 

 

-managed-keys Statement Grammar

+managed-keys Statement Grammar

 
managed-keys {
     string initial-key number number number string ;
     [ string initial-key number number number string ; [...]]
@@ -6303,7 +6303,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
 
 

 

-view Statement Definition and Usage

+view Statement Definition and Usage

 

             The view statement is a powerful
             feature
@@ -6604,10 +6604,10 @@ zone zone_name [
 

 

-zone Statement Definition and Usage

+zone Statement Definition and Usage

 

 

-Zone Types

+Zone Types

 
@@ -6887,7 +6887,7 @@ zone zone_name [
 

 

-Class

+Class

 

               The zone's name may optionally be followed by a class. If
               a class is not specified, class IN (for Internet),
@@ -6909,7 +6909,7 @@ zone zone_name [
 

 

-Zone Options

+Zone Options

 

 
allow-notify

 

@@ -7820,7 +7820,7 @@ example.com. NS ns2.example.net.
 

 

 

-Zone File

+Zone File

 

 

 Types of Resource Records and When to Use Them

@@ -7833,7 +7833,7 @@ example.com. NS ns2.example.net.
           

 

 

-Resource Records

+Resource Records

 

               A domain name identifies a node.  Each node has a set of
               resource information, which may be empty.  The set of resource
@@ -8570,7 +8570,7 @@ example.com. NS ns2.example.net.
 
 

 

-Textual expression of RRs

+Textual expression of RRs

 

               RRs are represented in binary form in the packets of the DNS
               protocol, and are usually represented in highly encoded form
@@ -8773,7 +8773,7 @@ example.com. NS ns2.example.net.
 
 

 

-Discussion of MX Records

+Discussion of MX Records

 

             As described above, domain servers store information as a
             series of resource records, each of which contains a particular
@@ -9029,7 +9029,7 @@ example.com. NS ns2.example.net.
 
 

 

-Inverse Mapping in IPv4

+Inverse Mapping in IPv4

 

             Reverse name resolution (that is, translation from IP address
             to name) is achieved by means of the in-addr.arpa domain
@@ -9090,7 +9090,7 @@ example.com. NS ns2.example.net.
 
 

 

-Other Zone File Directives

+Other Zone File Directives

 

             The Master File Format was initially defined in RFC 1035 and
             has subsequently been extended. While the Master File Format
@@ -9105,7 +9105,7 @@ example.com. NS ns2.example.net.
           

 

 

-The @ (at-sign)

+The @ (at-sign)

 

               When used in the label (or name) field, the asperand or
               at-sign (@) symbol represents the current origin.
@@ -9116,7 +9116,7 @@ example.com. NS ns2.example.net.
 
 

 

-The $ORIGIN Directive

+The $ORIGIN Directive

 

               Syntax: $ORIGIN
               domain-name
@@ -9145,7 +9145,7 @@ WWW.EXAMPLE.COM. CNAME MAIN-SERVER.EXAMPLE.COM.
 
 

 

-The $INCLUDE Directive

+The $INCLUDE Directive

 

               Syntax: $INCLUDE
               filename
@@ -9181,7 +9181,7 @@ WWW.EXAMPLE.COM. CNAME MAIN-SERVER.EXAMPLE.COM.
 
 

 

-The $TTL Directive

+The $TTL Directive

 

               Syntax: $TTL
               default-ttl
@@ -9200,7 +9200,7 @@ WWW.EXAMPLE.COM. CNAME MAIN-SERVER.EXAMPLE.COM.
 
 

 

-BIND Master File Extension: the  $GENERATE Directive

+BIND Master File Extension: the  $GENERATE Directive

 

             Syntax: $GENERATE
             range
@@ -9624,7 +9624,7 @@ HOST-127.EXAMPLE. MX 0 .
           

 

 

-Name Server Statistics Counters

+Name Server Statistics Counters

 

 
 

@@ -10181,7 +10181,7 @@ HOST-127.EXAMPLE. MX 0 .
 

 

-Zone Maintenance Statistics Counters

+Zone Maintenance Statistics Counters

 
 

 
 
@@ -10335,7 +10335,7 @@ HOST-127.EXAMPLE. MX 0 .
 

 

-Resolver Statistics Counters

+Resolver Statistics Counters

 
 

 
 
@@ -10718,7 +10718,7 @@ HOST-127.EXAMPLE. MX 0 .
 

 

-Socket I/O Statistics Counters

+Socket I/O Statistics Counters

               Socket I/O statistics counters are defined per socket
               types, which are
@@ -10873,7 +10873,7 @@ HOST-127.EXAMPLE. MX 0 .
 
 

 

-Compatibility with BIND 8 Counters

+Compatibility with BIND 8 Counters

               Most statistics counters that were available
               in BIND 8 are also supported in
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 6d664f879c..c719a7eb02 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -46,10 +46,10 @@
 
Table of Contents

 
Access Control Lists

-
Chroot and Setuid

+
Chroot and Setuid

 

-
The chroot Environment

-
Using the setuid Function

+
The chroot Environment

+
Using the setuid Function

 

 
Dynamic Update Security

 

@@ -121,7 +121,7 @@ zone "example.com" {
 

 

-Chroot and Setuid
+Chroot and Setuid
 

 

           On UNIX servers, it is possible to run BIND
@@ -147,7 +147,7 @@ zone "example.com" {
         

 

 

-The chroot Environment

+The chroot Environment

             In order for a chroot environment
             to
@@ -175,7 +175,7 @@ zone "example.com" {
 
 

 

-Using the setuid Function

+Using the setuid Function

             Prior to running the named daemon,
             use
diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
index ef91977b58..53aa7dd120 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -45,18 +45,18 @@
 

 
Table of Contents

 

-
Common Problems

-
It's not working; how can I figure out what's wrong?

-
Incrementing and Changing the Serial Number

-
Where Can I Get Help?

+
Common Problems

+
It's not working; how can I figure out what's wrong?

+
Incrementing and Changing the Serial Number

+
Where Can I Get Help?

 

 

 

-Common Problems

+Common Problems

 

-It's not working; how can I figure out what's wrong?

+It's not working; how can I figure out what's wrong?

             The best solution to solving installation and
             configuration issues is to take preventative measures by setting
@@ -68,7 +68,7 @@
 
 

 

-Incrementing and Changing the Serial Number

+Incrementing and Changing the Serial Number

           Zone serial numbers are just numbers — they aren't
           date related.  A lot of people set them to a number that
@@ -95,7 +95,7 @@
 
 

 

-Where Can I Get Help?

+Where Can I Get Help?

           The Internet Systems Consortium
           (ISC) offers a wide range
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 491ce9f439..c8aad6658a 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -45,31 +45,31 @@
 

 
Table of Contents

 

-
Acknowledgments

+
Acknowledgments

 
A Brief History of the DNS and BIND

-
General DNS Reference Information

+
General DNS Reference Information

 
IPv6 addresses (AAAA)

 
Bibliography (and Suggested Reading)

 

 
Request for Comments (RFCs)

 
Internet Drafts

-
Other Documents About BIND

+
Other Documents About BIND

 

 
BIND 9 DNS Library Support

 

-
Prerequisite

-
Compilation

-
Installation

-
Known Defects/Restrictions

-
The dns.conf File

-
Sample Applications

-
Library References

+
Prerequisite

+
Compilation

+
Installation

+
Known Defects/Restrictions

+
The dns.conf File

+
Sample Applications

+
Library References

 

 

 

 

-Acknowledgments

+Acknowledgments

 

 A Brief History of the DNS and BIND
@@ -172,7 +172,7 @@
 

 

 

-General DNS Reference Information

+General DNS Reference Information

 

 

 IPv6 addresses (AAAA)

@@ -260,17 +260,17 @@
           

 

 

-Bibliography

+Bibliography

 
Standards

 

-
[RFC974] C. Partridge. Mail Routing and the Domain System. January 1986. 

+
[RFC974] C. Partridge. Mail Routing and the Domain System. January 1986. 

 

 

-
[RFC1034] P.V. Mockapetris. Domain Names — Concepts and Facilities. November 1987. 

+
[RFC1034] P.V. Mockapetris. Domain Names — Concepts and Facilities. November 1987. 

 

 

-
[RFC1035] P. V. Mockapetris. Domain Names — Implementation and
+
[RFC1035] P. V. Mockapetris. Domain Names — Implementation and
                   Specification. November 1987. 

 

 

@@ -278,42 +278,42 @@
 

 Proposed Standards

 

-
[RFC2181] R., R. Bush Elz. Clarifications to the DNS
+
[RFC2181] R., R. Bush Elz. Clarifications to the DNS
                   Specification. July 1997. 

 

 

-
[RFC2308] M. Andrews. Negative Caching of DNS
+
[RFC2308] M. Andrews. Negative Caching of DNS
                   Queries. March 1998. 

 

 

-
[RFC1995] M. Ohta. Incremental Zone Transfer in DNS. August 1996. 

+
[RFC1995] M. Ohta. Incremental Zone Transfer in DNS. August 1996. 

 

 

-
[RFC1996] P. Vixie. A Mechanism for Prompt Notification of Zone Changes. August 1996. 

+
[RFC1996] P. Vixie. A Mechanism for Prompt Notification of Zone Changes. August 1996. 

 

 

-
[RFC2136] P. Vixie, S. Thomson, Y. Rekhter, and J. Bound. Dynamic Updates in the Domain Name System. April 1997. 

+
[RFC2136] P. Vixie, S. Thomson, Y. Rekhter, and J. Bound. Dynamic Updates in the Domain Name System. April 1997. 

 

 

-
[RFC2671] P. Vixie. Extension Mechanisms for DNS (EDNS0). August 1997. 

+
[RFC2671] P. Vixie. Extension Mechanisms for DNS (EDNS0). August 1997. 

 

 

-
[RFC2672] M. Crawford. Non-Terminal DNS Name Redirection. August 1999. 

+
[RFC2672] M. Crawford. Non-Terminal DNS Name Redirection. August 1999. 

 

 

-
[RFC2845] P. Vixie, O. Gudmundsson, D. Eastlake, 3rd, and B. Wellington. Secret Key Transaction Authentication for DNS (TSIG). May 2000. 

+
[RFC2845] P. Vixie, O. Gudmundsson, D. Eastlake, 3rd, and B. Wellington. Secret Key Transaction Authentication for DNS (TSIG). May 2000. 

 

 

-
[RFC2930] D. Eastlake, 3rd. Secret Key Establishment for DNS (TKEY RR). September 2000. 

+
[RFC2930] D. Eastlake, 3rd. Secret Key Establishment for DNS (TKEY RR). September 2000. 

 

 

-
[RFC2931] D. Eastlake, 3rd. DNS Request and Transaction Signatures (SIG(0)s). September 2000. 

+
[RFC2931] D. Eastlake, 3rd. DNS Request and Transaction Signatures (SIG(0)s). September 2000. 

 

 

-
[RFC3007] B. Wellington. Secure Domain Name System (DNS) Dynamic Update. November 2000. 

+
[RFC3007] B. Wellington. Secure Domain Name System (DNS) Dynamic Update. November 2000. 

 

 

-
[RFC3645] S. Kwan, P. Garg, J. Gilroy, L. Esibov, J. Westhead, and R. Hall. Generic Security Service Algorithm for Secret
+
[RFC3645] S. Kwan, P. Garg, J. Gilroy, L. Esibov, J. Westhead, and R. Hall. Generic Security Service Algorithm for Secret
                        Key Transaction Authentication for DNS
                        (GSS-TSIG). October 2003. 

 

@@ -322,19 +322,19 @@
 

 DNS Security Proposed Standards

 

-
[RFC3225] D. Conrad. Indicating Resolver Support of DNSSEC. December 2001. 

+
[RFC3225] D. Conrad. Indicating Resolver Support of DNSSEC. December 2001. 

 

 

-
[RFC3833] D. Atkins and R. Austein. Threat Analysis of the Domain Name System (DNS). August 2004. 

+
[RFC3833] D. Atkins and R. Austein. Threat Analysis of the Domain Name System (DNS). August 2004. 

 

 

-
[RFC4033] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. DNS Security Introduction and Requirements. March 2005. 

+
[RFC4033] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. DNS Security Introduction and Requirements. March 2005. 

 

 

-
[RFC4034] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. Resource Records for the DNS Security Extensions. March 2005. 

+
[RFC4034] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. Resource Records for the DNS Security Extensions. March 2005. 

 

 

-
[RFC4035] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. Protocol Modifications for the DNS
+
[RFC4035] R. Arends, R. Austein, M. Larson, D. Massey, and S. Rose. Protocol Modifications for the DNS
                        Security Extensions. March 2005. 

 

 
@@ -342,146 +342,146 @@
 
Other Important RFCs About DNS
                 Implementation

 

-
[RFC1535] E. Gavron. A Security Problem and Proposed Correction With Widely
+
[RFC1535] E. Gavron. A Security Problem and Proposed Correction With Widely
                   Deployed DNS Software.. October 1993. 

 

 

-
[RFC1536] A. Kumar, J. Postel, C. Neuman, P. Danzig, and S. Miller. Common DNS Implementation
+
[RFC1536] A. Kumar, J. Postel, C. Neuman, P. Danzig, and S. Miller. Common DNS Implementation
                   Errors and Suggested Fixes. October 1993. 

 

 

-
[RFC1982] R. Elz and R. Bush. Serial Number Arithmetic. August 1996. 

+
[RFC1982] R. Elz and R. Bush. Serial Number Arithmetic. August 1996. 

 

 

-
[RFC4074] Y. Morishita and T. Jinmei. Common Misbehaviour Against DNS
+
[RFC4074] Y. Morishita and T. Jinmei. Common Misbehaviour Against DNS
                 Queries for IPv6 Addresses. May 2005. 

 

 
 

 
Resource Record Types

 

-
[RFC1183] C.F. Everhart, L. A. Mamakos, R. Ullmann, and P. Mockapetris. New DNS RR Definitions. October 1990. 

+
[RFC1183] C.F. Everhart, L. A. Mamakos, R. Ullmann, and P. Mockapetris. New DNS RR Definitions. October 1990. 

 

 

-
[RFC1706] B. Manning and R. Colella. DNS NSAP Resource Records. October 1994. 

+
[RFC1706] B. Manning and R. Colella. DNS NSAP Resource Records. October 1994. 

 

 

-
[RFC2168] R. Daniel and M. Mealling. Resolution of Uniform Resource Identifiers using
+
[RFC2168] R. Daniel and M. Mealling. Resolution of Uniform Resource Identifiers using
                   the Domain Name System. June 1997. 

 

 

-
[RFC1876] C. Davis, P. Vixie, T., and I. Dickinson. A Means for Expressing Location Information in the
+
[RFC1876] C. Davis, P. Vixie, T., and I. Dickinson. A Means for Expressing Location Information in the
                   Domain
                   Name System. January 1996. 

 

 

-
[RFC2052] A. Gulbrandsen and P. Vixie. A DNS RR for Specifying the
+
[RFC2052] A. Gulbrandsen and P. Vixie. A DNS RR for Specifying the
                   Location of
                   Services.. October 1996. 

 

 

-
[RFC2163] A. Allocchio. Using the Internet DNS to
+
[RFC2163] A. Allocchio. Using the Internet DNS to
                   Distribute MIXER
                   Conformant Global Address Mapping. January 1998. 

 

 

-
[RFC2230] R. Atkinson. Key Exchange Delegation Record for the DNS. October 1997. 

+
[RFC2230] R. Atkinson. Key Exchange Delegation Record for the DNS. October 1997. 

 

 

-
[RFC2536] D. Eastlake, 3rd. DSA KEYs and SIGs in the Domain Name System (DNS). March 1999. 

+
[RFC2536] D. Eastlake, 3rd. DSA KEYs and SIGs in the Domain Name System (DNS). March 1999. 

 

 

-
[RFC2537] D. Eastlake, 3rd. RSA/MD5 KEYs and SIGs in the Domain Name System (DNS). March 1999. 

+
[RFC2537] D. Eastlake, 3rd. RSA/MD5 KEYs and SIGs in the Domain Name System (DNS). March 1999. 

 

 

-
[RFC2538] D. Eastlake, 3rd and O. Gudmundsson. Storing Certificates in the Domain Name System (DNS). March 1999. 

+
[RFC2538] D. Eastlake, 3rd and O. Gudmundsson. Storing Certificates in the Domain Name System (DNS). March 1999. 

 

 

-
[RFC2539] D. Eastlake, 3rd. Storage of Diffie-Hellman Keys in the Domain Name System (DNS). March 1999. 

+
[RFC2539] D. Eastlake, 3rd. Storage of Diffie-Hellman Keys in the Domain Name System (DNS). March 1999. 

 

 

-
[RFC2540] D. Eastlake, 3rd. Detached Domain Name System (DNS) Information. March 1999. 

+
[RFC2540] D. Eastlake, 3rd. Detached Domain Name System (DNS) Information. March 1999. 

 

 

-
[RFC2782] A. Gulbrandsen. P. Vixie. L. Esibov. A DNS RR for specifying the location of services (DNS SRV). February 2000. 

+
[RFC2782] A. Gulbrandsen. P. Vixie. L. Esibov. A DNS RR for specifying the location of services (DNS SRV). February 2000. 

 

 

-
[RFC2915] M. Mealling. R. Daniel. The Naming Authority Pointer (NAPTR) DNS Resource Record. September 2000. 

+
[RFC2915] M. Mealling. R. Daniel. The Naming Authority Pointer (NAPTR) DNS Resource Record. September 2000. 

 

 

-
[RFC3110] D. Eastlake, 3rd. RSA/SHA-1 SIGs and RSA KEYs in the Domain Name System (DNS). May 2001. 

+
[RFC3110] D. Eastlake, 3rd. RSA/SHA-1 SIGs and RSA KEYs in the Domain Name System (DNS). May 2001. 

 

 

-
[RFC3123] P. Koch. A DNS RR Type for Lists of Address Prefixes (APL RR). June 2001. 

+
[RFC3123] P. Koch. A DNS RR Type for Lists of Address Prefixes (APL RR). June 2001. 

 

 

-
[RFC3596] S. Thomson, C. Huitema, V. Ksinant, and M. Souissi. DNS Extensions to support IP
+
[RFC3596] S. Thomson, C. Huitema, V. Ksinant, and M. Souissi. DNS Extensions to support IP
                   version 6. October 2003. 

 

 

-
[RFC3597] A. Gustafsson. Handling of Unknown DNS Resource Record (RR) Types. September 2003. 

+
[RFC3597] A. Gustafsson. Handling of Unknown DNS Resource Record (RR) Types. September 2003. 

 

 

 

 

 DNS and the Internet

 

-
[RFC1101] P. V. Mockapetris. DNS Encoding of Network Names
+
[RFC1101] P. V. Mockapetris. DNS Encoding of Network Names
                   and Other Types. April 1989. 

 

 

-
[RFC1123] Braden. Requirements for Internet Hosts - Application and
+
[RFC1123] Braden. Requirements for Internet Hosts - Application and
                   Support. October 1989. 

 

 

-
[RFC1591] J. Postel. Domain Name System Structure and Delegation. March 1994. 

+
[RFC1591] J. Postel. Domain Name System Structure and Delegation. March 1994. 

 

 

-
[RFC2317] H. Eidnes, G. de Groot, and P. Vixie. Classless IN-ADDR.ARPA Delegation. March 1998. 

+
[RFC2317] H. Eidnes, G. de Groot, and P. Vixie. Classless IN-ADDR.ARPA Delegation. March 1998. 

 

 

-
[RFC2826] Internet Architecture Board. IAB Technical Comment on the Unique DNS Root. May 2000. 

+
[RFC2826] Internet Architecture Board. IAB Technical Comment on the Unique DNS Root. May 2000. 

 

 

-
[RFC2929] D. Eastlake, 3rd, E. Brunner-Williams, and B. Manning. Domain Name System (DNS) IANA Considerations. September 2000. 

+
[RFC2929] D. Eastlake, 3rd, E. Brunner-Williams, and B. Manning. Domain Name System (DNS) IANA Considerations. September 2000. 

 

 

 

 

 DNS Operations

 

-
[RFC1033] M. Lottor. Domain administrators operations guide.. November 1987. 

+
[RFC1033] M. Lottor. Domain administrators operations guide.. November 1987. 

 

 

-
[RFC1537] P. Beertema. Common DNS Data File
+
[RFC1537] P. Beertema. Common DNS Data File
                   Configuration Errors. October 1993. 

 

 

-
[RFC1912] D. Barr. Common DNS Operational and
+
[RFC1912] D. Barr. Common DNS Operational and
                   Configuration Errors. February 1996. 

 

 

-
[RFC2010] B. Manning and P. Vixie. Operational Criteria for Root Name Servers.. October 1996. 

+
[RFC2010] B. Manning and P. Vixie. Operational Criteria for Root Name Servers.. October 1996. 

 

 

-
[RFC2219] M. Hamilton and R. Wright. Use of DNS Aliases for
+
[RFC2219] M. Hamilton and R. Wright. Use of DNS Aliases for
                   Network Services.. October 1997. 

 

 

 

 
Internationalized Domain Names

 

-
[RFC2825] IAB and R. Daigle. A Tangled Web: Issues of I18N, Domain Names,
+
[RFC2825] IAB and R. Daigle. A Tangled Web: Issues of I18N, Domain Names,
                        and the Other Internet protocols. May 2000. 

 

 

-
[RFC3490] P. Faltstrom, P. Hoffman, and A. Costello. Internationalizing Domain Names in Applications (IDNA). March 2003. 

+
[RFC3490] P. Faltstrom, P. Hoffman, and A. Costello. Internationalizing Domain Names in Applications (IDNA). March 2003. 

 

 

-
[RFC3491] P. Hoffman and M. Blanchet. Nameprep: A Stringprep Profile for Internationalized Domain Names. March 2003. 

+
[RFC3491] P. Hoffman and M. Blanchet. Nameprep: A Stringprep Profile for Internationalized Domain Names. March 2003. 

 

 

-
[RFC3492] A. Costello. Punycode: A Bootstring encoding of Unicode
+
[RFC3492] A. Costello. Punycode: A Bootstring encoding of Unicode
                        for Internationalized Domain Names in
                        Applications (IDNA). March 2003. 

 

@@ -497,47 +497,47 @@
                 

 

 

-
[RFC1464] R. Rosenbaum. Using the Domain Name System To Store Arbitrary String
+
[RFC1464] R. Rosenbaum. Using the Domain Name System To Store Arbitrary String
                   Attributes. May 1993. 

 

 

-
[RFC1713] A. Romao. Tools for DNS Debugging. November 1994. 

+
[RFC1713] A. Romao. Tools for DNS Debugging. November 1994. 

 

 

-
[RFC1794] T. Brisco. DNS Support for Load
+
[RFC1794] T. Brisco. DNS Support for Load
                   Balancing. April 1995. 

 

 

-
[RFC2240] O. Vaughan. A Legal Basis for Domain Name Allocation. November 1997. 

+
[RFC2240] O. Vaughan. A Legal Basis for Domain Name Allocation. November 1997. 

 

 

-
[RFC2345] J. Klensin, T. Wolf, and G. Oglesby. Domain Names and Company Name Retrieval. May 1998. 

+
[RFC2345] J. Klensin, T. Wolf, and G. Oglesby. Domain Names and Company Name Retrieval. May 1998. 

 

 

-
[RFC2352] O. Vaughan. A Convention For Using Legal Names as Domain Names. May 1998. 

+
[RFC2352] O. Vaughan. A Convention For Using Legal Names as Domain Names. May 1998. 

 

 

-
[RFC3071] J. Klensin. Reflections on the DNS, RFC 1591, and Categories of Domains. February 2001. 

+
[RFC3071] J. Klensin. Reflections on the DNS, RFC 1591, and Categories of Domains. February 2001. 

 

 

-
[RFC3258] T. Hardie. Distributing Authoritative Name Servers via
+
[RFC3258] T. Hardie. Distributing Authoritative Name Servers via
                        Shared Unicast Addresses. April 2002. 

 

 

-
[RFC3901] A. Durand and J. Ihren. DNS IPv6 Transport Operational Guidelines. September 2004. 

+
[RFC3901] A. Durand and J. Ihren. DNS IPv6 Transport Operational Guidelines. September 2004. 

 

 
 

 
Obsolete and Unimplemented Experimental RFC

 

-
[RFC1712] C. Farrell, M. Schulze, S. Pleitner, and D. Baldoni. DNS Encoding of Geographical
+
[RFC1712] C. Farrell, M. Schulze, S. Pleitner, and D. Baldoni. DNS Encoding of Geographical
                   Location. November 1994. 

 

 

-
[RFC2673] M. Crawford. Binary Labels in the Domain Name System. August 1999. 

+
[RFC2673] M. Crawford. Binary Labels in the Domain Name System. August 1999. 

 

 

-
[RFC2874] M. Crawford and C. Huitema. DNS Extensions to Support IPv6 Address Aggregation
+
[RFC2874] M. Crawford and C. Huitema. DNS Extensions to Support IPv6 Address Aggregation
                        and Renumbering. July 2000. 

 

 

@@ -551,39 +551,39 @@
                 

 
 

-
[RFC2065] D. Eastlake, 3rd and C. Kaufman. Domain Name System Security Extensions. January 1997. 

+
[RFC2065] D. Eastlake, 3rd and C. Kaufman. Domain Name System Security Extensions. January 1997. 

 

 

-
[RFC2137] D. Eastlake, 3rd. Secure Domain Name System Dynamic Update. April 1997. 

+
[RFC2137] D. Eastlake, 3rd. Secure Domain Name System Dynamic Update. April 1997. 

 

 

-
[RFC2535] D. Eastlake, 3rd. Domain Name System Security Extensions. March 1999. 

+
[RFC2535] D. Eastlake, 3rd. Domain Name System Security Extensions. March 1999. 

 

 

-
[RFC3008] B. Wellington. Domain Name System Security (DNSSEC)
+
[RFC3008] B. Wellington. Domain Name System Security (DNSSEC)
                        Signing Authority. November 2000. 

 

 

-
[RFC3090] E. Lewis. DNS Security Extension Clarification on Zone Status. March 2001. 

+
[RFC3090] E. Lewis. DNS Security Extension Clarification on Zone Status. March 2001. 

 

 

-
[RFC3445] D. Massey and S. Rose. Limiting the Scope of the KEY Resource Record (RR). December 2002. 

+
[RFC3445] D. Massey and S. Rose. Limiting the Scope of the KEY Resource Record (RR). December 2002. 

 

 

-
[RFC3655] B. Wellington and O. Gudmundsson. Redefinition of DNS Authenticated Data (AD) bit. November 2003. 

+
[RFC3655] B. Wellington and O. Gudmundsson. Redefinition of DNS Authenticated Data (AD) bit. November 2003. 

 

 

-
[RFC3658] O. Gudmundsson. Delegation Signer (DS) Resource Record (RR). December 2003. 

+
[RFC3658] O. Gudmundsson. Delegation Signer (DS) Resource Record (RR). December 2003. 

 

 

-
[RFC3755] S. Weiler. Legacy Resolver Compatibility for Delegation Signer (DS). May 2004. 

+
[RFC3755] S. Weiler. Legacy Resolver Compatibility for Delegation Signer (DS). May 2004. 

 

 

-
[RFC3757] O. Kolkman, J. Schlyter, and E. Lewis. Domain Name System KEY (DNSKEY) Resource Record
+
[RFC3757] O. Kolkman, J. Schlyter, and E. Lewis. Domain Name System KEY (DNSKEY) Resource Record
                       (RR) Secure Entry Point (SEP) Flag. April 2004. 

 

 

-
[RFC3845] J. Schlyter. DNS Security (DNSSEC) NextSECure (NSEC) RDATA Format. August 2004. 

+
[RFC3845] J. Schlyter. DNS Security (DNSSEC) NextSECure (NSEC) RDATA Format. August 2004. 

 

 
 
@@ -604,14 +604,14 @@
 
 

 

-Other Documents About BIND
+Other Documents About BIND
 

 

 

 

-Bibliography

+Bibliography

 

-
Paul Albitz and Cricket Liu. DNS and BIND. Copyright © 1998 Sebastopol, CA: O'Reilly and Associates. 

+
Paul Albitz and Cricket Liu. DNS and BIND. Copyright © 1998 Sebastopol, CA: O'Reilly and Associates. 

 

 
 
@@ -648,7 +648,7 @@
 
 

 

-Prerequisite

+Prerequisite

 
GNU make is required to build the export libraries (other
   part of BIND 9 can still be built with other types of make). In
   the reminder of this document, "make" means GNU make. Note that
@@ -657,7 +657,7 @@
 
 

 

-Compilation

+Compilation

 
 $ ./configure --enable-exportlib [other flags]
 $ make
@@ -672,7 +672,7 @@ $ make
 
 

 

-Installation

+Installation

 
 $ cd lib/export
 $ make install
@@ -694,7 +694,7 @@ $ make install
 
 

 

-Known Defects/Restrictions

+Known Defects/Restrictions

 
    
 
  • Currently, win32 is not supported for the export
       library. (Normal BIND 9 application can be built as
@@ -734,7 +734,7 @@ $ make
 

 

 

-The dns.conf File

+The dns.conf File

 
The IRS library supports an "advanced" configuration file
   related to the DNS library for configuration parameters that
   would be beyond the capability of the
@@ -752,14 +752,14 @@ $ make
 
 

 

-Sample Applications

+Sample Applications

 
Some sample application programs using this API are
   provided for reference. The following is a brief description of
   these applications.
   

 

 

-sample: a simple stub resolver utility

+sample: a simple stub resolver utility

 

   It sends a query of a given name (of a given optional RR type) to a
   specified recursive server, and prints the result as a list of
@@ -823,7 +823,7 @@ $ make
 
 

 

-sample-async: a simple stub resolver, working asynchronously

+sample-async: a simple stub resolver, working asynchronously

 

   Similar to "sample", but accepts a list
   of (query) domain names as a separate file and resolves the names
@@ -864,7 +864,7 @@ $ make
 
 

 

-sample-request: a simple DNS transaction client

+sample-request: a simple DNS transaction client

 

   It sends a query to a specified server, and
   prints the response with minimal processing. It doesn't act as a
@@ -905,7 +905,7 @@ $ make
 
 

 

-sample-gai: getaddrinfo() and getnameinfo() test code

+sample-gai: getaddrinfo() and getnameinfo() test code

 

   This is a test program
   to check getaddrinfo() and getnameinfo() behavior. It takes a
@@ -922,7 +922,7 @@ $ make
 
 

 

-sample-update: a simple dynamic update client program

+sample-update: a simple dynamic update client program

 

   It accepts a single update command as a
   command-line argument, sends an update request message to the
@@ -1017,7 +1017,7 @@ $ sample-update -a sample-update -k Kxxx.+nnn+mm
 
 

 

-nsprobe: domain/name server checker in terms of RFC 4074

+nsprobe: domain/name server checker in terms of RFC 4074

 

   It checks a set
   of domains to see the name servers of the domains behave
@@ -1074,7 +1074,7 @@ $ sample-update -a sample-update -k Kxxx.+nnn+mm
 
 

 

-Library References

+Library References

 
As of this writing, there is no formal "manual" of the
   libraries, except this document, header files (some of them
   provide pretty detailed explanations), and sample application
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 842d1422eb..b2b27d90c1 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -83,7 +83,7 @@
 
Name Server Operations

 

 
Tools for Use With the Name Server Daemon

-
Signals

+
Signals

 

 
 
4. Advanced DNS Features

@@ -92,64 +92,64 @@
 
Dynamic Update

 
The journal file

 
Incremental Zone Transfers (IXFR)

-
Split DNS

-
Example split DNS setup

+
Split DNS

+
Example split DNS setup

 
TSIG

 

-
Generate Shared Keys for Each Pair of Hosts

-
Copying the Shared Secret to Both Machines

-
Informing the Servers of the Key's Existence

-
Instructing the Server to Use the Key

-
TSIG Key Based Access Control

-
Errors

+
Generate Shared Keys for Each Pair of Hosts

+
Copying the Shared Secret to Both Machines

+
Informing the Servers of the Key's Existence

+
Instructing the Server to Use the Key

+
TSIG Key Based Access Control

+
Errors

 

-
TKEY

-
SIG(0)

+
TKEY

+
SIG(0)

 
DNSSEC

 

-
Generating Keys

-
Signing the Zone

-
Configuring Servers

+
Generating Keys

+
Signing the Zone

+
Configuring Servers

 

 
DNSSEC, Dynamic Zones, and Automatic Signing

 

-
Converting from insecure to secure

-
Dynamic DNS update method

-
Fully automatic zone signing

-
Private-type records

-
DNSKEY rollovers

-
Dynamic DNS update method

-
Automatic key rollovers

-
NSEC3PARAM rollovers via UPDATE

-
Converting from NSEC to NSEC3

-
Converting from NSEC3 to NSEC

-
Converting from secure to insecure

-
Periodic re-signing

-
NSEC3 and OPTOUT

+
Converting from insecure to secure

+
Dynamic DNS update method

+
Fully automatic zone signing

+
Private-type records

+
DNSKEY rollovers

+
Dynamic DNS update method

+
Automatic key rollovers

+
NSEC3PARAM rollovers via UPDATE

+
Converting from NSEC to NSEC3

+
Converting from NSEC3 to NSEC

+
Converting from secure to insecure

+
Periodic re-signing

+
NSEC3 and OPTOUT

 

 
Dynamic Trust Anchor Management

 

-
Validating Resolver

-
Authoritative Server

+
Validating Resolver

+
Authoritative Server

 

 
PKCS #11 (Cryptoki) support

 

-
Prerequisites

-
Building BIND 9 with PKCS#11

-
PKCS #11 Tools

-
Using the HSM

-
Specifying the engine on the command line

-
Running named with automatic zone re-signing

+
Prerequisites

+
Building BIND 9 with PKCS#11

+
PKCS #11 Tools

+
Using the HSM

+
Specifying the engine on the command line

+
Running named with automatic zone re-signing

 

-
IPv6 Support in BIND 9

+
IPv6 Support in BIND 9

 

-
Address Lookups Using AAAA Records

-
Address to Name Lookups Using Nibble Format

+
Address Lookups Using AAAA Records

+
Address to Name Lookups Using Nibble Format

 

 
 
5. The BIND 9 Lightweight Resolver

 

-
The Lightweight Resolver Library

+
The Lightweight Resolver Library

 
Running a Resolver Daemon

 

 
6. BIND 9 Configuration Reference

@@ -157,58 +157,58 @@
 
Configuration File Elements

 

 
Address Match Lists

-
Comment Syntax

+
Comment Syntax

 

 
Configuration File Grammar

 

-
acl Statement Grammar

+
acl Statement Grammar

 
acl Statement Definition and
           Usage

-
controls Statement Grammar

+
controls Statement Grammar

 
controls Statement Definition and
           Usage

-
include Statement Grammar

-
include Statement Definition and
+
include Statement Grammar

+
include Statement Definition and
           Usage

-
key Statement Grammar

-
key Statement Definition and Usage

-
logging Statement Grammar

-
logging Statement Definition and
+
key Statement Grammar

+
key Statement Definition and Usage

+
logging Statement Grammar

+
logging Statement Definition and
           Usage

-
lwres Statement Grammar

-
lwres Statement Definition and Usage

-
masters Statement Grammar

-
masters Statement Definition and
+
lwres Statement Grammar

+
lwres Statement Definition and Usage

+
masters Statement Grammar

+
masters Statement Definition and
           Usage

-
options Statement Grammar

+
options Statement Grammar

 
options Statement Definition and
           Usage

 
server Statement Grammar

 
server Statement Definition and
             Usage

 
statistics-channels Statement Grammar

-
statistics-channels Statement Definition and
+
statistics-channels Statement Definition and
             Usage

 
trusted-keys Statement Grammar

-
trusted-keys Statement Definition
+
trusted-keys Statement Definition
             and Usage

-
managed-keys Statement Grammar

+
managed-keys Statement Grammar

 
managed-keys Statement Definition
             and Usage

 
view Statement Grammar

-
view Statement Definition and Usage

+
view Statement Definition and Usage

 
zone
             Statement Grammar

-
zone Statement Definition and Usage

+
zone Statement Definition and Usage

 

-
Zone File

+
Zone File

 

 
Types of Resource Records and When to Use Them

-
Discussion of MX Records

+
Discussion of MX Records

 
Setting TTLs

-
Inverse Mapping in IPv4

-
Other Zone File Directives

-
BIND Master File Extension: the  $GENERATE Directive

+
Inverse Mapping in IPv4

+
Other Zone File Directives

+
BIND Master File Extension: the  $GENERATE Directive

 
Additional File Formats

 

 
BIND9 Statistics

@@ -217,41 +217,41 @@
 
7. BIND 9 Security Considerations

 

 
Access Control Lists

-
Chroot and Setuid

+
Chroot and Setuid

 

-
The chroot Environment

-
Using the setuid Function

+
The chroot Environment

+
Using the setuid Function

 

 
Dynamic Update Security

 

 
8. Troubleshooting

 

-
Common Problems

-
It's not working; how can I figure out what's wrong?

-
Incrementing and Changing the Serial Number

-
Where Can I Get Help?

+
Common Problems

+
It's not working; how can I figure out what's wrong?

+
Incrementing and Changing the Serial Number

+
Where Can I Get Help?

 

 
A. Appendices

 

-
Acknowledgments

+
Acknowledgments

 
A Brief History of the DNS and BIND

-
General DNS Reference Information

+
General DNS Reference Information

 
IPv6 addresses (AAAA)

 
Bibliography (and Suggested Reading)

 

 
Request for Comments (RFCs)

 
Internet Drafts

-
Other Documents About BIND

+
Other Documents About BIND

 

 
BIND 9 DNS Library Support

 

-
Prerequisite

-
Compilation

-
Installation

-
Known Defects/Restrictions

-
The dns.conf File

-
Sample Applications

-
Library References

+
Prerequisite

+
Compilation

+
Installation

+
Known Defects/Restrictions

+
The dns.conf File

+
Sample Applications

+
Library References

 

 

 
I. Manual pages

diff --git a/doc/arm/man.arpaname.html b/doc/arm/man.arpaname.html
index c341390800..02be5360ff 100644
--- a/doc/arm/man.arpaname.html
+++ b/doc/arm/man.arpaname.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,20 +50,20 @@
 
arpaname  {ipaddress ...}

 
 

-
DESCRIPTION

+
DESCRIPTION

 

       arpaname translates IP addresses (IPv4 and
       IPv6) to the corresponding IN-ADDR.ARPA or IP6.ARPA names.
     

 

 

-
SEE ALSO

+
SEE ALSO

 

       BIND 9 Administrator Reference Manual.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.ddns-confgen.html b/doc/arm/man.ddns-confgen.html
index 35ad5a248b..20c31b7dbc 100644
--- a/doc/arm/man.ddns-confgen.html
+++ b/doc/arm/man.ddns-confgen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
ddns-confgen  [-a algorithm] [-h] [-k keyname] [-r randomfile] [ -s name  |   -z zone ] [-q] [name]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
ddns-confgen
       generates a key for use by nsupdate
       and named.  It simplifies configuration
@@ -77,7 +77,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-a algorithm

 

@@ -144,7 +144,7 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 
nsupdate(1),
       named.conf(5),
       named(8),
@@ -152,7 +152,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index e3b93f78f4..66a362974e 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -52,7 +52,7 @@
 
dig  [global-queryopt...] [query...]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dig
       (domain information groper) is a flexible tool
       for interrogating DNS name servers.  It performs DNS lookups and
@@ -98,7 +98,7 @@
     

 

 

-
SIMPLE USAGE

+
SIMPLE USAGE

 

       A typical invocation of dig looks like:
       

@@ -144,7 +144,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

       The -b option sets the source IP address of the query
       to address.  This must be a valid
@@ -248,7 +248,7 @@
     

 

 

-
QUERY OPTIONS

+
QUERY OPTIONS

 
dig
       provides a number of query options which affect
       the way in which lookups are made and the results displayed.  Some of
@@ -599,7 +599,7 @@
     

 

 

-
MULTIPLE QUERIES

+
MULTIPLE QUERIES

 

       The BIND 9 implementation of dig 
       supports
@@ -645,7 +645,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     

 

 

-
IDN SUPPORT

+
IDN SUPPORT

 

       If dig has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names.
@@ -659,14 +659,14 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     

 

 

-
FILES

+
FILES

 
/etc/resolv.conf
     

 
${HOME}/.digrc
     

 

 

-
SEE ALSO

+
SEE ALSO

 
host(1),
       named(8),
       dnssec-keygen(8),
@@ -674,7 +674,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     

 

 

-
BUGS

+
BUGS

 

       There are probably too many query options.
     

diff --git a/doc/arm/man.dnssec-dsfromkey.html b/doc/arm/man.dnssec-dsfromkey.html
index 28e4ac6953..6a89acb016 100644
--- a/doc/arm/man.dnssec-dsfromkey.html
+++ b/doc/arm/man.dnssec-dsfromkey.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -51,14 +51,14 @@
 
dnssec-dsfromkey  {-s} [-1] [-2] [-a alg] [-K directory] [-l domain] [-s] [-c class] [-T TTL] [-f file] [-A] [-v level] {dnsname}

 

 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-dsfromkey
       outputs the Delegation Signer (DS) resource record (RR), as defined in
       RFC 3658 and RFC 4509, for the given key(s).
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-1

 

@@ -134,7 +134,7 @@
 

 

 

-
EXAMPLE

+
EXAMPLE

 

       To build the SHA-256 DS RR from the
       Kexample.com.+003+26160
@@ -149,7 +149,7 @@
     

 

 

-
FILES

+
FILES

 

       The keyfile can be designed by the key identification
       Knnnn.+aaa+iiiii or the full file name
@@ -163,13 +163,13 @@
     

 

 

-
CAVEAT

+
CAVEAT

 

       A keyfile error can give a "file not found" even if the file exists.
     

 

 

-
SEE ALSO

+
SEE ALSO

 
dnssec-keygen(8),
       dnssec-signzone(8),
       BIND 9 Administrator Reference Manual,
@@ -179,7 +179,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dnssec-keyfromlabel.html b/doc/arm/man.dnssec-keyfromlabel.html
index 1a631c5ecd..f62273570e 100644
--- a/doc/arm/man.dnssec-keyfromlabel.html
+++ b/doc/arm/man.dnssec-keyfromlabel.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
dnssec-keyfromlabel  {-l label} [-3] [-a algorithm] [-A date/offset] [-c class] [-D date/offset] [-E engine] [-f flag] [-G] [-I date/offset] [-k] [-K directory] [-L ttl] [-n nametype] [-P date/offset] [-p protocol] [-R date/offset] [-t type] [-v level] [-y] {name}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-keyfromlabel
       gets keys with the given label from a crypto hardware and builds
       key files for DNSSEC (Secure DNS), as defined in RFC 2535
@@ -63,7 +63,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-a algorithm

 

@@ -191,7 +191,7 @@
 

 

 

-
TIMING OPTIONS

+
TIMING OPTIONS

 

       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -238,7 +238,7 @@
 

 
 

-
GENERATED KEY FILES

+
GENERATED KEY FILES

 

       When dnssec-keyfromlabel completes
       successfully,
@@ -277,7 +277,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 
dnssec-keygen(8),
       dnssec-signzone(8),
       BIND 9 Administrator Reference Manual,
@@ -285,7 +285,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dnssec-keygen.html b/doc/arm/man.dnssec-keygen.html
index f12ad738c8..954c8099d2 100644
--- a/doc/arm/man.dnssec-keygen.html
+++ b/doc/arm/man.dnssec-keygen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
dnssec-keygen  [-a algorithm] [-b keysize] [-n nametype] [-3] [-A date/offset] [-C] [-c class] [-D date/offset] [-E engine] [-e] [-f flag] [-G] [-g generator] [-h] [-I date/offset] [-i interval] [-K directory] [-L ttl] [-k] [-P date/offset] [-p protocol] [-q] [-R date/offset] [-r randomdev] [-S key] [-s strength] [-t type] [-v level] [-z] {name}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-keygen
       generates keys for DNSSEC (Secure DNS), as defined in RFC 2535
       and RFC 4034.  It can also generate keys for use with
@@ -64,7 +64,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-a algorithm

 

@@ -275,7 +275,7 @@
 

 

 

-
TIMING OPTIONS

+
TIMING OPTIONS

 

       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -346,7 +346,7 @@
 

 
 

-
GENERATED KEYS

+
GENERATED KEYS

 

       When dnssec-keygen completes
       successfully,
@@ -392,7 +392,7 @@
     

 

 

-
EXAMPLE

+
EXAMPLE

 

       To generate a 768-bit DSA key for the domain
       example.com, the following command would be
@@ -413,7 +413,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 
dnssec-signzone(8),
       BIND 9 Administrator Reference Manual,
       RFC 2539,
@@ -422,7 +422,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dnssec-revoke.html b/doc/arm/man.dnssec-revoke.html
index ee20536519..605d77a478 100644
--- a/doc/arm/man.dnssec-revoke.html
+++ b/doc/arm/man.dnssec-revoke.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
dnssec-revoke  [-hr] [-v level] [-K directory] [-E engine] [-f] [-R] {keyfile}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-revoke
       reads a DNSSEC key file, sets the REVOKED bit on the key as defined
       in RFC 5011, and creates a new pair of key files containing the
@@ -58,7 +58,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-h

 

@@ -96,14 +96,14 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 
dnssec-keygen(8),
       BIND 9 Administrator Reference Manual,
       RFC 5011.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dnssec-settime.html b/doc/arm/man.dnssec-settime.html
index 59180174c6..c4a18b3363 100644
--- a/doc/arm/man.dnssec-settime.html
+++ b/doc/arm/man.dnssec-settime.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
dnssec-settime  [-f] [-K directory] [-L ttl] [-P date/offset] [-A date/offset] [-R date/offset] [-I date/offset] [-D date/offset] [-h] [-v level] [-E engine] {keyfile}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-settime
       reads a DNSSEC private key file and sets the key timing metadata
       as specified by the -P, -A,
@@ -76,7 +76,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-f

 

@@ -118,7 +118,7 @@
 

 

 

-
TIMING OPTIONS

+
TIMING OPTIONS

 

       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -197,7 +197,7 @@
 

 
 

-
PRINTING OPTIONS

+
PRINTING OPTIONS

 

       dnssec-settime can also be used to print the
       timing metadata associated with a key.
@@ -223,7 +223,7 @@
 

 
 

-
SEE ALSO

+
SEE ALSO

 
dnssec-keygen(8),
       dnssec-signzone(8),
       BIND 9 Administrator Reference Manual,
@@ -231,7 +231,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.dnssec-signzone.html b/doc/arm/man.dnssec-signzone.html
index 7589a5865f..32e9545980 100644
--- a/doc/arm/man.dnssec-signzone.html
+++ b/doc/arm/man.dnssec-signzone.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
dnssec-signzone  [-a] [-c class] [-d directory] [-D] [-E engine] [-e end-time] [-f output-file] [-g] [-h] [-K directory] [-k key] [-L serial] [-l domain] [-i interval] [-I input-format] [-j jitter] [-N soa-serial-format] [-o origin] [-O output-format] [-P] [-p] [-R] [-r randomdev] [-S] [-s start-time] [-T ttl] [-t] [-u] [-v level] [-X extended end-time] [-x] [-z] [-3 salt] [-H iterations] [-A] {zonefile} [key...]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
dnssec-signzone
       signs a zone.  It generates
       NSEC and RRSIG records and produces a signed version of the
@@ -61,7 +61,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-a

 

@@ -464,7 +464,7 @@
 

 

 

-
EXAMPLE

+
EXAMPLE

 

       The following command signs the example.com
       zone with the DSA key generated by dnssec-keygen
@@ -494,14 +494,14 @@ db.example.com.signed
 %

 
 

-
SEE ALSO

+
SEE ALSO

 
dnssec-keygen(8),
       BIND 9 Administrator Reference Manual,
       RFC 4033.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.genrandom.html b/doc/arm/man.genrandom.html
index 303564537f..0aa8397b61 100644
--- a/doc/arm/man.genrandom.html
+++ b/doc/arm/man.genrandom.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
genrandom  [-n number] {size} {filename}

 
 

-
DESCRIPTION

+
DESCRIPTION

 

       genrandom
       generates a file or a set of files containing a specified quantity
@@ -59,7 +59,7 @@
     

 

 

-
ARGUMENTS

+
ARGUMENTS

 

 
-n number

 

@@ -77,14 +77,14 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 

       rand(3),
       arc4random(3)
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.host.html b/doc/arm/man.host.html
index 3bedabf2a2..8c15499b61 100644
--- a/doc/arm/man.host.html
+++ b/doc/arm/man.host.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
host  [-aCdlnrsTwv] [-c class] [-N ndots] [-R number] [-t type] [-W wait] [-m flag] [-4] [-6] {name} [server]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
host
       is a simple utility for performing DNS lookups.
       It is normally used to convert names to IP addresses and vice versa.
@@ -202,7 +202,7 @@
     

 

 

-
IDN SUPPORT

+
IDN SUPPORT

 

       If host has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names. 
@@ -216,12 +216,12 @@
     

 

 

-
FILES

+
FILES

 
/etc/resolv.conf
     

 

 

-
SEE ALSO

+
SEE ALSO

 
dig(1),
       named(8).
     

diff --git a/doc/arm/man.isc-hmac-fixup.html b/doc/arm/man.isc-hmac-fixup.html
index 0a3382e38d..328918ad29 100644
--- a/doc/arm/man.isc-hmac-fixup.html
+++ b/doc/arm/man.isc-hmac-fixup.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
isc-hmac-fixup  {algorithm} {secret}

 

 

-
DESCRIPTION

+
DESCRIPTION

 

       Versions of BIND 9 up to and including BIND 9.6 had a bug causing
       HMAC-SHA* TSIG keys which were longer than the digest length of the
@@ -76,7 +76,7 @@
     

 

 

-
SECURITY CONSIDERATIONS

+
SECURITY CONSIDERATIONS

 

       Secrets that have been converted by isc-hmac-fixup
       are shortened, but as this is how the HMAC protocol works in
@@ -87,14 +87,14 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 

       BIND 9 Administrator Reference Manual,
       RFC 2104.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.named-checkconf.html b/doc/arm/man.named-checkconf.html
index 27fd101a38..a56d73c3a6 100644
--- a/doc/arm/man.named-checkconf.html
+++ b/doc/arm/man.named-checkconf.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
named-checkconf  [-h] [-v] [-j] [-t directory] {filename} [-p] [-z]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
named-checkconf
       checks the syntax, but not the semantics, of a
       named configuration file.  The file is parsed
@@ -70,7 +70,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-h

 

@@ -109,21 +109,21 @@
 

 

 

-
RETURN VALUES

+
RETURN VALUES

 
named-checkconf
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     

 

 

-
SEE ALSO

+
SEE ALSO

 
named(8),
       named-checkzone(8),
       BIND 9 Administrator Reference Manual.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.named-checkzone.html b/doc/arm/man.named-checkzone.html
index 4799c6f230..ae97f0a6d3 100644
--- a/doc/arm/man.named-checkzone.html
+++ b/doc/arm/man.named-checkzone.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -51,7 +51,7 @@
 
named-compilezone  [-d] [-j] [-q] [-v] [-c class] [-C mode] [-f format] [-F format] [-i mode] [-k mode] [-m mode] [-n mode] [-L serial] [-r mode] [-s style] [-t directory] [-w directory] [-D] [-W mode] {-o filename} {zonename} {filename}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
named-checkzone
       checks the syntax and integrity of a zone file.  It performs the
       same checks as named does when loading a
@@ -71,7 +71,7 @@
      

 

 

-
OPTIONS

+
OPTIONS

 

 
-d

 

@@ -281,14 +281,14 @@
 

 

 

-
RETURN VALUES

+
RETURN VALUES

 
named-checkzone
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     

 

 

-
SEE ALSO

+
SEE ALSO

 
named(8),
       named-checkconf(8),
       RFC 1035,
@@ -296,7 +296,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.named-journalprint.html b/doc/arm/man.named-journalprint.html
index d4234a3dfd..d0d6fd6924 100644
--- a/doc/arm/man.named-journalprint.html
+++ b/doc/arm/man.named-journalprint.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
named-journalprint  {journal}

 
 

-
DESCRIPTION

+
DESCRIPTION

 

       named-journalprint
       prints the contents of a zone journal file in a human-readable
@@ -76,7 +76,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 

       named(8),
       nsupdate(8),
@@ -84,7 +84,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.named.html b/doc/arm/man.named.html
index 0790cb1e08..9619876579 100644
--- a/doc/arm/man.named.html
+++ b/doc/arm/man.named.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
named  [-4] [-6] [-c config-file] [-d debug-level] [-E engine-name] [-f] [-g] [-m flag] [-n #cpus] [-p port] [-s] [-S #max-socks] [-t directory] [-U #listeners] [-u user] [-v] [-V] [-x cache-file]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
named
       is a Domain Name System (DNS) server,
       part of the BIND 9 distribution from ISC.  For more
@@ -65,7 +65,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-4

 

@@ -255,7 +255,7 @@
 

 

 

-
SIGNALS

+
SIGNALS

 

       In routine operation, signals should not be used to control
       the nameserver; rndc should be used
@@ -276,7 +276,7 @@
     

 

 

-
CONFIGURATION

+
CONFIGURATION

 

       The named configuration file is too complex
       to describe in detail here.  A complete description is provided
@@ -293,7 +293,7 @@
     

 

 

-
FILES

+
FILES

 

 
/etc/named.conf

 

@@ -306,7 +306,7 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 
RFC 1033,
       RFC 1034,
       RFC 1035,
@@ -319,7 +319,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.nsec3hash.html b/doc/arm/man.nsec3hash.html
index c6965252b0..e248ca306c 100644
--- a/doc/arm/man.nsec3hash.html
+++ b/doc/arm/man.nsec3hash.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -48,7 +48,7 @@
 
nsec3hash  {salt} {algorithm} {iterations} {domain}

 
 

-
DESCRIPTION

+
DESCRIPTION

 

       nsec3hash generates an NSEC3 hash based on
       a set of NSEC3 parameters.  This can be used to check the validity
@@ -56,7 +56,7 @@
     

 

 

-
ARGUMENTS

+
ARGUMENTS

 

 
salt

 

@@ -80,14 +80,14 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 

       BIND 9 Administrator Reference Manual,
       RFC 5155.
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.nsupdate.html b/doc/arm/man.nsupdate.html
index 22cfac81d2..257fb7dc59 100644
--- a/doc/arm/man.nsupdate.html
+++ b/doc/arm/man.nsupdate.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
nsupdate  [-d] [-D] [[-g] |  [-o] |  [-l] |  [-y [hmac:]keyname:secret] |  [-k keyfile]] [-t timeout] [-u udptimeout] [-r udpretries] [-R randomdev] [-v] [filename]

 
 

-
DESCRIPTION

+
DESCRIPTION

 
nsupdate
       is used to submit Dynamic DNS Update requests as defined in RFC 2136
       to a name server.
@@ -210,7 +210,7 @@
     

 

 

-
INPUT FORMAT

+
INPUT FORMAT

 
nsupdate
       reads input from
       filename
@@ -498,7 +498,7 @@
     

 

 

-
EXAMPLES

+
EXAMPLES

 

       The examples below show how
       nsupdate
@@ -552,7 +552,7 @@
     

 

 

-
FILES

+
FILES

 

 
/etc/resolv.conf

 

@@ -575,7 +575,7 @@
 

 

 

-
SEE ALSO

+
SEE ALSO

 

       RFC 2136,
       RFC 3007,
@@ -590,7 +590,7 @@
     

 

 

-
BUGS

+
BUGS

 

       The TSIG key is redundantly stored in two separate files.
       This is a consequence of nsupdate using the DST library
diff --git a/doc/arm/man.rndc-confgen.html b/doc/arm/man.rndc-confgen.html
index 2431aca0af..98ce84602c 100644
--- a/doc/arm/man.rndc-confgen.html
+++ b/doc/arm/man.rndc-confgen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
rndc-confgen  [-a] [-b keysize] [-c keyfile] [-h] [-k keyname] [-p port] [-r randomfile] [-s address] [-t chrootdir] [-u user]

 

 

-
DESCRIPTION

+
DESCRIPTION

 
rndc-confgen
       generates configuration files
       for rndc.  It can be used as a
@@ -66,7 +66,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-a

 

@@ -173,7 +173,7 @@
 

 

 

-
EXAMPLES

+
EXAMPLES

 

       To allow rndc to be used with
       no manual configuration, run
@@ -190,7 +190,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 
rndc(8),
       rndc.conf(5),
       named(8),
@@ -198,7 +198,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.rndc.conf.html b/doc/arm/man.rndc.conf.html
index 07741a4bbd..2927a6b385 100644
--- a/doc/arm/man.rndc.conf.html
+++ b/doc/arm/man.rndc.conf.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
rndc.conf 

 
 

-
DESCRIPTION

+
DESCRIPTION

 
rndc.conf is the configuration file
       for rndc, the BIND 9 name server control
       utility.  This file has a similar structure and syntax to
@@ -135,7 +135,7 @@
     

 

 

-
EXAMPLE

+
EXAMPLE

 
       options {
         default-server  localhost;
@@ -209,7 +209,7 @@
     

 

 

-
NAME SERVER CONFIGURATION

+
NAME SERVER CONFIGURATION

 

       The name server must be configured to accept rndc connections and
       to recognize the key specified in the rndc.conf
@@ -219,7 +219,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 
rndc(8),
       rndc-confgen(8),
       mmencode(1),
@@ -227,7 +227,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index 84db636055..d292e92cd3 100644
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-
+
 
 
 
@@ -50,7 +50,7 @@
 
rndc  [-b source-address] [-c config-file] [-k key-file] [-s server] [-p port] [-V] [-y key_id] {command}

 
 

-
DESCRIPTION

+
DESCRIPTION

 
rndc
       controls the operation of a name
       server.  It supersedes the ndc utility
@@ -79,7 +79,7 @@
     

 

 

-
OPTIONS

+
OPTIONS

 

 
-b source-address

 

@@ -151,7 +151,7 @@
     

 

 

-
LIMITATIONS

+
LIMITATIONS

 
rndc
       does not yet support all the commands of
       the BIND 8 ndc utility.
@@ -165,7 +165,7 @@
     

 

 

-
SEE ALSO

+
SEE ALSO

 
rndc.conf(5),
       rndc-confgen(8),
       named(8),
@@ -175,7 +175,7 @@
     

 

 

-
AUTHOR

+
AUTHOR

 
Internet Systems Consortium
     

 

diff --git a/doc/doxygen/.cvsignore b/doc/doxygen/.cvsignore
new file mode 100644
index 0000000000..1d4c377b30
--- /dev/null
+++ b/doc/doxygen/.cvsignore
@@ -0,0 +1,5 @@
+Doxyfile
+Makefile
+doxygen-input-filter
+html
+xml
diff --git a/doc/misc/.cvsignore b/doc/misc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/doc/misc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/doc/private/SRCID b/doc/private/SRCID
index 5c5f10661b..5b141cac74 100644
--- a/doc/private/SRCID
+++ b/doc/private/SRCID
@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.1207 2012/03/01 00:16:54 tbox Exp $
+# $Id: SRCID,v 1.1162.2.37 2012/03/01 00:16:29 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2012/03/01 00:16:54 $ )"
+SRCID="( $Date: 2012/03/01 00:16:29 $ )"
diff --git a/doc/private/branches b/doc/private/branches
index 1c1ff86ff6..6dd49b2ba1 100644
--- a/doc/private/branches
+++ b/doc/private/branches
@@ -418,7 +418,6 @@ rt25333				new	each	// 2011-08-02 20:37 +0000
 rt25358				new	each	// 2011-08-09 02:41 +0000
 rt25419				new	each	// 2011-09-14 19:56 +0000
 rt25419a			new	ckb	// 2011-12-14 21:32 +0000
-rt25419b			new	each	// 2012-02-07 00:12 +0000
 rt25452				new	each	// 2011-09-06 17:14 +0000
 rt25541_v96			new	each	// 2011-08-19 00:13 +0000
 rt25541_v97			new	each	// 2011-08-18 23:51 +0000
@@ -442,8 +441,6 @@ rt26632				new	marka	// 2011-11-30 05:18 +0000
 rt26676				new	each	// 2011-12-08 19:52 +0000
 rt26676alt			new	marka	// 2011-12-21 06:32 +0000
 rt26677				new	marka	// 2011-11-29 23:26 +0000
-rt26786				new	each	// 2012-02-16 16:17 +0000
-rt26786_v97			new	each	// 2012-02-21 22:17 +0000
 rt26805				new	marka	// 2012-01-23 04:28 +0000
 rt26830				new	marka	// 2011-11-30 22:58 +0000
 rt26845				new	marka	// 2011-12-08 09:35 +0000
@@ -463,7 +460,6 @@ rt27057_custom_ATT_v9_8_1	new	smann	// 2012-01-05 15:51 +0000
 rt27057a_custom_ATT_v9_8_1	new	smann	// 2012-01-11 16:28 +0000
 rt27087				new	marka	// 2011-12-18 21:43 +0000
 rt27139				new	marka	// 2011-12-21 05:08 +0000
-rt27173				new	smann	// 2012-02-03 19:47 +0000
 rt27185				new	marka	// 2011-12-24 00:24 +0000
 rt27292				new	each	// 2012-01-04 22:43 +0000
 rt27308				new	each	// 2012-01-07 01:19 +0000
@@ -471,25 +467,6 @@ rt27336				new	marka	// 2012-01-25 02:57 +0000
 rt27344				new	each	// 2012-01-09 23:58 +0000
 rt27497				new	marka	// 2012-01-17 05:38 +0000
 rt27557				new	marka	// 2012-01-24 00:01 +0000
-rt27596				new	marka	// 2012-02-14 05:02 +0000
-rt27650				new	each	// 2012-01-30 20:46 +0000
-rt27650_v9_8			new	marka	// 2012-01-31 04:42 +0000
-rt27653				new	marka	// 2012-01-30 06:10 +0000
-rt27678				new	each	// 2012-01-31 16:38 +0000
-rt27693				new	marka	// 2012-02-01 09:31 +0000
-rt27696				new	marka	// 2012-02-06 03:57 +0000
-rt27696a			new	fdupont	// 2012-02-07 15:22 +0000
-rt27696a_base			new	fdupont	// 2012-02-07 15:37 +0000
-rt27738				new	each	// 2012-02-07 18:13 +0000
-rt27782				new	marka	// 2012-02-07 05:00 +0000
-rt27792				new	marka	// 2012-02-08 02:19 +0000
-rt27863				new	marka	// 2012-02-12 22:54 +0000
-rt27884				new	marka	// 2012-02-13 03:42 +0000
-rt27925				new	marka	// 2012-02-15 03:53 +0000
-rt28028				new	marka	// 2012-02-21 06:43 +0000
-rt28036				new	marka	// 2012-02-22 20:31 +0000
-rt28039				new	marka	// 2012-02-27 05:38 +0000
-rt28040				new	marka	// 2012-02-22 04:52 +0000
 shane_dbbackend			open	
 skan				open	explorer
 skan-metazones1			private	explorer
@@ -568,7 +545,6 @@ v9_8				new	marka	// 2011-01-30 00:18 +0000
 v9_8_0_patch			new	each	// 2011-04-27 15:35 +0000
 v9_8_1_forensics		new	marka	// 2011-11-16 23:52 +0000
 v9_8_1_patch			new	marka	// 2011-11-16 09:05 +0000
-v9_9				new	each	// 2012-01-30 01:28 +0000
 win64				new	marka	// 2010-11-04 00:17 +0000
 win64sizet			new	marka	// 2010-11-08 05:04 +0000
 
diff --git a/doc/xsl/.cvsignore b/doc/xsl/.cvsignore
new file mode 100644
index 0000000000..6168a7e25b
--- /dev/null
+++ b/doc/xsl/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+isc-docbook-chunk.xsl
+isc-docbook-html.xsl
+isc-docbook-latex.xsl
+isc-manpage.xsl
diff --git a/docutil/.cvsignore b/docutil/.cvsignore
new file mode 100644
index 0000000000..55711bde03
--- /dev/null
+++ b/docutil/.cvsignore
@@ -0,0 +1 @@
+docbook2man-wrapper.sh
diff --git a/lib/.cvsignore b/lib/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind9/.cvsignore b/lib/bind9/.cvsignore
new file mode 100644
index 0000000000..b3b8e7617f
--- /dev/null
+++ b/lib/bind9/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+.libs
+*.la
+*.lo
diff --git a/lib/bind9/include/.cvsignore b/lib/bind9/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind9/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind9/include/bind9/.cvsignore b/lib/bind9/include/bind9/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind9/include/bind9/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/dns/.cvsignore b/lib/dns/.cvsignore
new file mode 100644
index 0000000000..b204723d93
--- /dev/null
+++ b/lib/dns/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+timestamp
+code.h
+gen
+.libs
+*.la
+*.lo
diff --git a/lib/dns/api b/lib/dns/api
index 332a0c5447..2c1bf668b7 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -3,6 +3,6 @@
 # 9.7: 60-79
 # 9.8: 80-89
 # 9.9: 90-109
-LIBINTERFACE = 93
+LIBINTERFACE = 94
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1
diff --git a/lib/dns/include/.cvsignore b/lib/dns/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/dns/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/dns/include/dns/.cvsignore b/lib/dns/include/dns/.cvsignore
new file mode 100644
index 0000000000..5aa676e52e
--- /dev/null
+++ b/lib/dns/include/dns/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+enumtype.h
+enumclass.h
+rdatastruct.h
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index e76b055263..4cf34c4008 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -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-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.h,v 1.57 2012/01/31 23:47:33 tbox Exp $ */
+/* $Id: master.h,v 1.55 2011/12/09 23:47:05 tbox Exp $ */
 
 #ifndef DNS_MASTER_H
 #define DNS_MASTER_H 1
@@ -103,13 +103,6 @@ typedef struct {
 	/* followed by encoded owner name, and then rdata */
 } dns_masterrawrdataset_t;
 
-/*
- * Method prototype: a callback to register each include file as
- * it is encountered.
- */
-typedef void
-(*dns_masterincludecb_t)(const char *file, void *arg);
-
 /***
  ***	Function
  ***/
@@ -144,18 +137,6 @@ dns_master_loadfile3(const char *master_file,
 		     isc_mem_t *mctx,
 		     dns_masterformat_t format);
 
-isc_result_t
-dns_master_loadfile4(const char *master_file,
-		     dns_name_t *top,
-		     dns_name_t *origin,
-		     dns_rdataclass_t zclass,
-		     unsigned int options,
-		     isc_uint32_t resign,
-		     dns_rdatacallbacks_t *callbacks,
-		     dns_masterincludecb_t include_cb,
-		     void *include_arg, isc_mem_t *mctx,
-		     dns_masterformat_t format);
-
 isc_result_t
 dns_master_loadstream(FILE *stream,
 		      dns_name_t *top,
@@ -219,20 +200,6 @@ dns_master_loadfileinc3(const char *master_file,
 			dns_loadctx_t **ctxp, isc_mem_t *mctx,
 			dns_masterformat_t format);
 
-isc_result_t
-dns_master_loadfileinc4(const char *master_file,
-			dns_name_t *top,
-			dns_name_t *origin,
-			dns_rdataclass_t zclass,
-			unsigned int options,
-			isc_uint32_t resign,
-			dns_rdatacallbacks_t *callbacks,
-			isc_task_t *task,
-			dns_loaddonefunc_t done, void *done_arg,
-			dns_loadctx_t **ctxp,
-			dns_masterincludecb_t include_cb, void *include_arg,
-			isc_mem_t *mctx, dns_masterformat_t format);
-
 isc_result_t
 dns_master_loadstreaminc(FILE *stream,
 			 dns_name_t *top,
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 99439dc6bd..cd481d8c36 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.204 2012/02/22 00:37:54 each Exp $ */
+/* $Id: zone.h,v 1.201.2.1 2012/02/22 00:35:53 each Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -2045,41 +2045,6 @@ dns_zone_synckeyzone(dns_zone_t *zone);
  * maintenance timer.
  */
 
-isc_result_t
-dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime);
-/*%
- * Return the time when the zone was last loaded.
- */
-
-isc_result_t
-dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime);
-/*%
- * Return the time when the (slave) zone will need to be refreshed.
- */
-
-isc_result_t
-dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime);
-/*%
- * Return the time when the (slave) zone will expire.
- */
-
-isc_result_t
-dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime);
-/*%
- * Return the time of the next scheduled DNSSEC key event.
- */
-
-unsigned int
-dns_zone_getincludes(dns_zone_t *zone, char ***includesp);
-/*%
- * Return the number include files that were encountered
- * during load.  If the number is greater than zero, 'includesp'
- * will point to an array containing the filenames.
- *
- * The array and its contents need to be freed using isc_mem_free.
- */
-
 ISC_LANG_ENDDECLS
 
-
 #endif /* DNS_ZONE_H */
diff --git a/lib/dns/include/dst/.cvsignore b/lib/dns/include/dst/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/dns/include/dst/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 0bf22f0430..6ac1c61d95 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.184 2012/02/13 23:46:24 marka Exp $ */
+/* $Id: master.c,v 1.181.36.2 2012/02/14 23:46:49 tbox Exp $ */
 
 /*! \file */
 
@@ -145,9 +145,6 @@ struct dns_loadctx {
 	isc_uint32_t		references;
 	dns_incctx_t		*inc;
 	isc_uint32_t		resign;
-
-	dns_masterincludecb_t	include_cb;
-	void			*include_arg;
 };
 
 struct dns_incctx {
@@ -515,9 +512,8 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx,
 	       unsigned int options, isc_uint32_t resign, dns_name_t *top,
 	       dns_rdataclass_t zclass, dns_name_t *origin,
 	       dns_rdatacallbacks_t *callbacks, isc_task_t *task,
-	       dns_loaddonefunc_t done, void *done_arg,
-	       dns_masterincludecb_t include_cb, void *include_arg,
-	       isc_lex_t *lex, dns_loadctx_t **lctxp)
+	       dns_loaddonefunc_t done, void *done_arg, isc_lex_t *lex,
+	       dns_loadctx_t **lctxp)
 {
 	dns_loadctx_t *lctx;
 	isc_result_t result;
@@ -592,8 +588,6 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx,
 	lctx->zclass = zclass;
 	lctx->resign = resign;
 	lctx->result = ISC_R_SUCCESS;
-	lctx->include_cb = include_cb;
-	lctx->include_arg = include_arg;
 
 	dns_fixedname_init(&lctx->fixed_top);
 	lctx->top = dns_fixedname_name(&lctx->fixed_top);
@@ -2050,9 +2044,6 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) {
 		goto cleanup;
 	new->parent = ictx;
 	lctx->inc = new;
-
-	if (lctx->include_cb != NULL)
-		lctx->include_cb(master_file, lctx->include_arg);
 	return (ISC_R_SUCCESS);
 
  cleanup:
@@ -2410,9 +2401,8 @@ dns_master_loadfile(const char *master_file, dns_name_t *top,
 		    dns_rdataclass_t zclass, unsigned int options,
 		    dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx)
 {
-	return (dns_master_loadfile4(master_file, top, origin, zclass, options,
-				     0, callbacks, NULL, NULL, mctx,
-				     dns_masterformat_text));
+	return (dns_master_loadfile3(master_file, top, origin, zclass, options,
+				     0, callbacks, mctx, dns_masterformat_text));
 }
 
 isc_result_t
@@ -2422,8 +2412,8 @@ dns_master_loadfile2(const char *master_file, dns_name_t *top,
 		     dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx,
 		     dns_masterformat_t format)
 {
-	return (dns_master_loadfile4(master_file, top, origin, zclass, options,
-				     0, callbacks, NULL, NULL, mctx, format));
+	return (dns_master_loadfile3(master_file, top, origin, zclass, options,
+				     0, callbacks, mctx, format));
 }
 
 isc_result_t
@@ -2432,26 +2422,13 @@ dns_master_loadfile3(const char *master_file, dns_name_t *top,
 		     unsigned int options, isc_uint32_t resign,
 		     dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx,
 		     dns_masterformat_t format)
-{
-	return (dns_master_loadfile4(master_file, top, origin, zclass, options,
-				     resign, callbacks, NULL, NULL, mctx,
-				     format));
-}
-
-isc_result_t
-dns_master_loadfile4(const char *master_file, dns_name_t *top,
-		     dns_name_t *origin, dns_rdataclass_t zclass,
-		     unsigned int options, isc_uint32_t resign,
-		     dns_rdatacallbacks_t *callbacks,
-		     dns_masterincludecb_t include_cb, void *include_arg,
-		     isc_mem_t *mctx, dns_masterformat_t format)
 {
 	dns_loadctx_t *lctx = NULL;
 	isc_result_t result;
 
 	result = loadctx_create(format, mctx, options, resign, top, zclass,
-				origin, callbacks, NULL, NULL, NULL,
-				include_cb, include_arg, NULL, &lctx);
+				origin, callbacks, NULL, NULL, NULL, NULL,
+				&lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
@@ -2474,9 +2451,9 @@ dns_master_loadfileinc(const char *master_file, dns_name_t *top,
 		       isc_task_t *task, dns_loaddonefunc_t done,
 		       void *done_arg, dns_loadctx_t **lctxp, isc_mem_t *mctx)
 {
-	return (dns_master_loadfileinc4(master_file, top, origin, zclass,
+	return (dns_master_loadfileinc3(master_file, top, origin, zclass,
 					options, 0, callbacks, task, done,
-					done_arg, lctxp, NULL, NULL, mctx,
+					done_arg, lctxp, mctx,
 					dns_masterformat_text));
 }
 
@@ -2488,10 +2465,9 @@ dns_master_loadfileinc2(const char *master_file, dns_name_t *top,
 			void *done_arg, dns_loadctx_t **lctxp, isc_mem_t *mctx,
 			dns_masterformat_t format)
 {
-	return (dns_master_loadfileinc4(master_file, top, origin, zclass,
+	return (dns_master_loadfileinc3(master_file, top, origin, zclass,
 					options, 0, callbacks, task, done,
-					done_arg, lctxp, NULL, NULL, mctx,
-					format));
+					done_arg, lctxp, mctx, format));
 }
 
 isc_result_t
@@ -2502,22 +2478,6 @@ dns_master_loadfileinc3(const char *master_file, dns_name_t *top,
 			dns_loaddonefunc_t done, void *done_arg,
 			dns_loadctx_t **lctxp, isc_mem_t *mctx,
 			dns_masterformat_t format)
-{
-	return (dns_master_loadfileinc4(master_file, top, origin, zclass,
-					options, resign, callbacks, task,
-					done, done_arg, lctxp, NULL, NULL,
-					mctx, format));
-}
-
-isc_result_t
-dns_master_loadfileinc4(const char *master_file, dns_name_t *top,
-			dns_name_t *origin, dns_rdataclass_t zclass,
-			unsigned int options, isc_uint32_t resign,
-			dns_rdatacallbacks_t *callbacks,
-			isc_task_t *task, dns_loaddonefunc_t done,
-			void *done_arg, dns_loadctx_t **lctxp,
-			dns_masterincludecb_t include_cb, void *include_arg,
-			isc_mem_t *mctx, dns_masterformat_t format)
 {
 	dns_loadctx_t *lctx = NULL;
 	isc_result_t result;
@@ -2526,8 +2486,8 @@ dns_master_loadfileinc4(const char *master_file, dns_name_t *top,
 	REQUIRE(done != NULL);
 
 	result = loadctx_create(format, mctx, options, resign, top, zclass,
-				origin, callbacks, task, done, done_arg,
-				include_cb, include_arg, NULL, &lctx);
+				origin, callbacks, task, done, done_arg, NULL,
+				&lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
@@ -2558,7 +2518,7 @@ dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, NULL, NULL, NULL,
-				NULL, NULL, NULL, &lctx);
+				NULL, &lctx);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
@@ -2591,7 +2551,7 @@ dns_master_loadstreaminc(FILE *stream, dns_name_t *top, dns_name_t *origin,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, task, done,
-				done_arg, NULL, NULL, NULL, &lctx);
+				done_arg, NULL, &lctx);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 
@@ -2624,7 +2584,7 @@ dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, NULL, NULL, NULL,
-				NULL, NULL, NULL, &lctx);
+				NULL, &lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
@@ -2657,7 +2617,7 @@ dns_master_loadbufferinc(isc_buffer_t *buffer, dns_name_t *top,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, task, done,
-				done_arg, NULL, NULL, NULL, &lctx);
+				done_arg, NULL, &lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
@@ -2689,7 +2649,7 @@ dns_master_loadlexer(isc_lex_t *lex, dns_name_t *top,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, NULL, NULL, NULL,
-				NULL, NULL, lex, &lctx);
+				lex, &lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
@@ -2717,7 +2677,7 @@ dns_master_loadlexerinc(isc_lex_t *lex, dns_name_t *top,
 
 	result = loadctx_create(dns_masterformat_text, mctx, options, 0, top,
 				zclass, origin, callbacks, task, done,
-				done_arg, NULL, NULL, lex, &lctx);
+				done_arg, lex, &lctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a6422f219f..8852de9cd9 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.330 2012/02/17 00:18:18 marka Exp $ */
+/* $Id: rbtdb.c,v 1.326.16.4 2012/02/15 12:29:39 marka Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/request.c b/lib/dns/request.c
index f5a62a7619..f09b48977e 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.91 2012/02/07 23:47:24 tbox Exp $ */
+/* $Id: request.c,v 1.89.250.2 2012/02/07 23:46:57 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index cf647f9ca8..4bd3606615 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.448 2012/02/14 23:47:15 tbox Exp $ */
+/* $Id: resolver.c,v 1.446.38.2 2012/02/14 23:46:49 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/.cvsignore b/lib/dns/tests/.cvsignore
new file mode 100644
index 0000000000..6abab36d4a
--- /dev/null
+++ b/lib/dns/tests/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+atf.out
+*_test
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 22ca62e007..82d2efd481 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.10 2012/02/01 00:20:09 marka Exp $ */
+/* $Id: master_test.c,v 1.7 2011/12/08 16:07:22 each Exp $ */
 
 /*! \file */
 
@@ -47,12 +47,6 @@
 static dns_masterrawheader_t header;
 static isc_boolean_t headerset;
 
-dns_name_t dns_origin;
-char origin[sizeof(TEST_ORIGIN)];
-unsigned char name_buf[BUFLEN];
-dns_rdatacallbacks_t callbacks;
-char *include_file = NULL;
-
 static isc_result_t
 add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset);
 
@@ -80,12 +74,16 @@ rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *h) {
 	headerset = ISC_TRUE;
 }
 
-static isc_result_t
-setup_master() {
+static int
+test_master(const char *testfile, dns_masterformat_t format) {
 	isc_result_t		result;
 	int			len;
+	char			origin[sizeof(TEST_ORIGIN)];
+	dns_name_t		dns_origin;
 	isc_buffer_t		source;
 	isc_buffer_t		target;
+	unsigned char		name_buf[BUFLEN];
+	dns_rdatacallbacks_t	callbacks;
 
 	strcpy(origin, TEST_ORIGIN);
 	len = strlen(origin);
@@ -105,13 +103,6 @@ setup_master() {
 	callbacks.add = add_callback;
 	callbacks.rawdata = rawdata_callback;
 	callbacks.zone = NULL;
-
-	return (result);
-}
-
-static isc_result_t
-test_master(const char *testfile, dns_masterformat_t format) {
-	isc_result_t result;
 	headerset = ISC_FALSE;
 	result = dns_master_loadfile2(testfile, &dns_origin, &dns_origin,
 				      dns_rdataclass_in, ISC_TRUE,
@@ -119,12 +110,6 @@ test_master(const char *testfile, dns_masterformat_t format) {
 	return (result);
 }
 
-static void
-include_callback(const char *filename, void *arg) {
-	char **argp = (char **) arg;
-	*argp = isc_mem_strdup(mctx, filename);
-}
-
 /*
  * Individual unit tests
  */
@@ -143,7 +128,6 @@ ATF_TC_BODY(load, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master1.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -167,7 +151,6 @@ ATF_TC_BODY(unexpected, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master2.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_UNEXPECTEDEND);
@@ -191,7 +174,6 @@ ATF_TC_BODY(noowner, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master3.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, DNS_R_NOOWNER);
@@ -216,7 +198,6 @@ ATF_TC_BODY(nottl, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master4.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -240,7 +221,6 @@ ATF_TC_BODY(badclass, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master5.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, DNS_R_BADCLASS);
@@ -262,7 +242,6 @@ ATF_TC_BODY(dnskey, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master6.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -285,7 +264,6 @@ ATF_TC_BODY(dnsnokey, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master7.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -307,7 +285,6 @@ ATF_TC_BODY(include, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master8.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, DNS_R_SEENINCLUDE);
@@ -315,37 +292,6 @@ ATF_TC_BODY(include, tc) {
 	dns_test_end();
 }
 
-/* Include file list test */
-ATF_TC(master_includelist);
-ATF_TC_HEAD(master_includelist, tc) {
-	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile4() returns "
-				       "names of included file");
-}
-ATF_TC_BODY(master_includelist, tc) {
-	isc_result_t result;
-	char *filename = NULL;
-
-	UNUSED(tc);
-
-	result = dns_test_begin(NULL, ISC_FALSE);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-
-	setup_master();
-	result = dns_master_loadfile4("testdata/master/master8.data",
-				      &dns_origin, &dns_origin,
-				      dns_rdataclass_in, 0, ISC_TRUE,
-				      &callbacks, include_callback,
-				      &filename, mctx, dns_masterformat_text);
-	ATF_CHECK_EQ(result, DNS_R_SEENINCLUDE);
-	ATF_CHECK(filename != NULL);
-	if (filename != NULL) {
-		ATF_CHECK_STREQ(filename, "testdata/master/master7.data");
-		isc_mem_free(mctx, filename);
-	}
-
-	dns_test_end();
-}
-
 /* Include failure test */
 ATF_TC(includefail);
 ATF_TC_HEAD(includefail, tc) {
@@ -360,7 +306,6 @@ ATF_TC_BODY(includefail, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master9.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, DNS_R_BADCLASS);
@@ -383,7 +328,6 @@ ATF_TC_BODY(blanklines, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master10.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -405,7 +349,6 @@ ATF_TC_BODY(leadingzero, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master11.data",
 			     dns_masterformat_text);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -472,7 +415,6 @@ ATF_TC_BODY(loadraw, tc) {
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	/* Raw format version 0 */
-	setup_master();
 	result = test_master("testdata/master/master12.data",
 			     dns_masterformat_raw);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
@@ -480,7 +422,6 @@ ATF_TC_BODY(loadraw, tc) {
 	ATF_CHECK_EQ(header.flags, 0);
 
 	/* Raw format version 1, no source serial  */
-	setup_master();
 	result = test_master("testdata/master/master13.data",
 			     dns_masterformat_raw);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
@@ -488,7 +429,6 @@ ATF_TC_BODY(loadraw, tc) {
 	ATF_CHECK_EQ(header.flags, 0);
 
 	/* Raw format version 1, source serial == 2011120101 */
-	setup_master();
 	result = test_master("testdata/master/master14.data",
 			     dns_masterformat_raw);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
@@ -545,7 +485,6 @@ ATF_TC_BODY(dumpraw, tc) {
 				  dns_masterformat_raw);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("test.dump", dns_masterformat_raw);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
@@ -561,7 +500,6 @@ ATF_TC_BODY(dumpraw, tc) {
 				  dns_masterformat_raw, &header);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("test.dump", dns_masterformat_raw);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
@@ -586,7 +524,6 @@ ATF_TP_ADD_TCS(tp) {
 	ATF_TP_ADD_TC(tp, dnskey);
 	ATF_TP_ADD_TC(tp, dnsnokey);
 	ATF_TP_ADD_TC(tp, include);
-	ATF_TP_ADD_TC(tp, master_includelist);
 	ATF_TP_ADD_TC(tp, includefail);
 	ATF_TP_ADD_TC(tp, blanklines);
 	ATF_TP_ADD_TC(tp, leadingzero);
diff --git a/lib/dns/tests/testdata/master/.cvsignore b/lib/dns/tests/testdata/master/.cvsignore
new file mode 100644
index 0000000000..384d54f7a2
--- /dev/null
+++ b/lib/dns/tests/testdata/master/.cvsignore
@@ -0,0 +1,3 @@
+master12.data
+master13.data
+master14.data
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 16557b80ab..6655a53403 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.210 2012/02/15 21:19:59 tbox Exp $ */
+/* $Id: validator.c,v 1.208.72.2 2012/02/15 23:46:20 tbox Exp $ */
 
 #include 
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index efa188af4f..ef47a2053d 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.675 2012/02/23 07:09:29 tbox Exp $ */
+/* $Id: zone.c,v 1.667.2.7 2012/02/29 21:31:06 each Exp $ */
 
 /*! \file */
 
@@ -150,7 +150,6 @@ typedef struct dns_nsec3chain dns_nsec3chain_t;
 typedef ISC_LIST(dns_nsec3chain_t) dns_nsec3chainlist_t;
 typedef struct dns_keyfetch dns_keyfetch_t;
 typedef struct dns_asyncload dns_asyncload_t;
-typedef struct dns_include dns_include_t;
 
 #define DNS_ZONE_CHECKLOCK
 #ifdef DNS_ZONE_CHECKLOCK
@@ -204,8 +203,6 @@ struct dns_zone {
 	unsigned int		irefs;
 	dns_name_t		origin;
 	char			*masterfile;
-	ISC_LIST(dns_include_t)	includes;	/* Include files */
-	unsigned int		nincludes;
 	dns_masterformat_t	masterformat;
 	char			*journal;
 	isc_int32_t		journalsize;
@@ -620,14 +617,6 @@ struct dns_asyncload {
 	void *loaded_arg;
 };
 
-/*%
- * Reference to an include file encountered during loading
- */
-struct dns_include {
-	char *name;
-	ISC_LINK(dns_include_t)	link;
-};
-
 #define HOUR 3600
 #define DAY (24*HOUR)
 #define MONTH (30*DAY)
@@ -816,8 +805,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	zone->strrdclass = NULL;
 	zone->strviewname = NULL;
 	zone->masterfile = NULL;
-	ISC_LIST_INIT(zone->includes);
-	zone->nincludes = 0;
 	zone->masterformat = dns_masterformat_none;
 	zone->keydirectory = NULL;
 	zone->journalsize = -1;
@@ -955,7 +942,6 @@ zone_free(dns_zone_t *zone) {
 	isc_mem_t *mctx = NULL;
 	dns_signing_t *signing;
 	dns_nsec3chain_t *nsec3chain;
-	dns_include_t *include;
 
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(isc_refcount_current(&zone->erefs) == 0);
@@ -996,13 +982,6 @@ zone_free(dns_zone_t *zone) {
 		dns_dbiterator_destroy(&nsec3chain->dbiterator);
 		isc_mem_put(zone->mctx, nsec3chain, sizeof *nsec3chain);
 	}
-	for (include = ISC_LIST_HEAD(zone->includes);
-	     include != NULL;
-	     include = ISC_LIST_HEAD(zone->includes)) {
-		ISC_LIST_UNLINK(zone->includes, include, link);
-		isc_mem_free(zone->mctx, include->name);
-		isc_mem_put(zone->mctx, include, sizeof *include);
-	}
 	if (zone->masterfile != NULL)
 		isc_mem_free(zone->mctx, zone->masterfile);
 	zone->masterfile = NULL;
@@ -1834,30 +1813,6 @@ get_master_options(dns_zone_t *zone) {
 	return (options);
 }
 
-static void
-zone_registerinclude(const char *filename, void *arg) {
-	dns_zone_t *zone = (dns_zone_t *) arg;
-	dns_include_t *inc = NULL;
-
-	REQUIRE(DNS_ZONE_VALID(zone));
-
-	if (filename == NULL)
-		return;
-
-	inc = isc_mem_get(zone->mctx, sizeof(dns_include_t));
-	if (inc == NULL)
-		return;
-	inc->name = isc_mem_strdup(zone->mctx, filename);
-	if (inc->name == NULL) {
-		isc_mem_put(zone->mctx, inc, sizeof(dns_include_t));
-		return;
-	}
-	ISC_LINK_INIT(inc, link);
-
-	ISC_LIST_APPEND(zone->includes, inc, link);
-	zone->nincludes++;
-}
-
 static void
 zone_gotreadhandle(isc_task_t *task, isc_event_t *event) {
 	dns_load_t *load = event->ev_arg;
@@ -1874,16 +1829,14 @@ zone_gotreadhandle(isc_task_t *task, isc_event_t *event) {
 
 	options = get_master_options(load->zone);
 
-	result = dns_master_loadfileinc4(load->zone->masterfile,
+	result = dns_master_loadfileinc3(load->zone->masterfile,
 					 dns_db_origin(load->db),
 					 dns_db_origin(load->db),
 					 load->zone->rdclass, options,
 					 load->zone->sigresigninginterval,
 					 &load->callbacks, task,
 					 zone_loaddone, load,
-					 &load->zone->lctx,
-					 zone_registerinclude,
-					 load->zone, load->zone->mctx,
+					 &load->zone->lctx, load->zone->mctx,
 					 load->zone->masterformat);
 	if (result != ISC_R_SUCCESS && result != DNS_R_CONTINUE &&
 	    result != DNS_R_SEENINCLUDE)
@@ -2033,13 +1986,11 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
 			zone_idetach(&callbacks.zone);
 			return (result);
 		}
-		result = dns_master_loadfile4(zone->masterfile,
+		result = dns_master_loadfile3(zone->masterfile,
 					      &zone->origin, &zone->origin,
 					      zone->rdclass, options,
 					      zone->sigresigninginterval,
-					      &callbacks,
-					      zone_registerinclude,
-					      zone, zone->mctx,
+					      &callbacks, zone->mctx,
 					      zone->masterformat);
 		tresult = dns_db_endload(db, &callbacks.add_private);
 		if (result == ISC_R_SUCCESS)
@@ -15784,7 +15735,6 @@ dns_zone_nscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version,
 void
 dns_zone_setadded(dns_zone_t *zone, isc_boolean_t added) {
 	REQUIRE(DNS_ZONE_VALID(zone));
-
 	LOCK_ZONE(zone);
 	zone->added = added;
 	UNLOCK_ZONE(zone);
@@ -16352,77 +16302,3 @@ dns_zone_setnsec3param(dns_zone_t *zone, isc_uint8_t hash, isc_uint8_t flags,
 	UNLOCK_ZONE(zone);
 	return (result);
 }
-
-isc_result_t
-dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(loadtime != NULL);
-
-	LOCK_ZONE(zone);
-	*loadtime = zone->loadtime;
-	UNLOCK_ZONE(zone);
-	return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(expiretime != NULL);
-
-	LOCK_ZONE(zone);
-	*expiretime = zone->expiretime;
-	UNLOCK_ZONE(zone);
-	return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(refreshtime != NULL);
-
-	LOCK_ZONE(zone);
-	*refreshtime = zone->refreshtime;
-	UNLOCK_ZONE(zone);
-	return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(refreshkeytime != NULL);
-
-	LOCK_ZONE(zone);
-	*refreshkeytime = zone->refreshkeytime;
-	UNLOCK_ZONE(zone);
-	return (ISC_R_SUCCESS);
-}
-
-unsigned int
-dns_zone_getincludes(dns_zone_t *zone, char ***includesp) {
-	dns_include_t *include;
-	char **array = NULL;
-	unsigned int n = 0;
-
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(includesp != NULL && *includesp == NULL);
-
-	LOCK_ZONE(zone);
-	if (zone->nincludes == 0)
-		goto done;
-
-	array = isc_mem_allocate(zone->mctx, sizeof(char *) * zone->nincludes);
-	if (array == NULL)
-		goto done;
-	for (include = ISC_LIST_HEAD(zone->includes);
-	     include != NULL;
-	     include = ISC_LIST_NEXT(include, link)) {
-		INSIST(n < zone->nincludes);
-		array[n++] = isc_mem_strdup(zone->mctx, include->name);
-	}
-	INSIST(n == zone->nincludes);
-	*includesp = array;
-
- done:
-	UNLOCK_ZONE(zone);
-	return (n);
-}
diff --git a/lib/export/.cvsignore b/lib/export/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/dns/.cvsignore b/lib/export/dns/.cvsignore
new file mode 100644
index 0000000000..6ee29f9529
--- /dev/null
+++ b/lib/export/dns/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+code.h
+gen
+timestamp
diff --git a/lib/export/dns/include/.cvsignore b/lib/export/dns/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/dns/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/dns/include/dns/.cvsignore b/lib/export/dns/include/dns/.cvsignore
new file mode 100644
index 0000000000..960dd99eeb
--- /dev/null
+++ b/lib/export/dns/include/dns/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+enumclass.h
+enumtype.h
+rdatastruct.h
diff --git a/lib/export/dns/include/dst/.cvsignore b/lib/export/dns/include/dst/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/dns/include/dst/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/irs/.cvsignore b/lib/export/irs/.cvsignore
new file mode 100644
index 0000000000..8df5b29f00
--- /dev/null
+++ b/lib/export/irs/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+timestamp
diff --git a/lib/export/irs/include/.cvsignore b/lib/export/irs/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/irs/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/irs/include/irs/.cvsignore b/lib/export/irs/include/irs/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/irs/include/irs/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/.cvsignore b/lib/export/isc/.cvsignore
new file mode 100644
index 0000000000..8df5b29f00
--- /dev/null
+++ b/lib/export/isc/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+timestamp
diff --git a/lib/export/isc/include/.cvsignore b/lib/export/isc/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/include/isc/.cvsignore b/lib/export/isc/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/nls/.cvsignore b/lib/export/isc/nls/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/nls/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/nothreads/.cvsignore b/lib/export/isc/nothreads/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/nothreads/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/nothreads/include/.cvsignore b/lib/export/isc/nothreads/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/nothreads/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/nothreads/include/isc/.cvsignore b/lib/export/isc/nothreads/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/nothreads/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/pthreads/.cvsignore b/lib/export/isc/pthreads/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/pthreads/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/pthreads/include/.cvsignore b/lib/export/isc/pthreads/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/pthreads/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/pthreads/include/isc/.cvsignore b/lib/export/isc/pthreads/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/pthreads/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/unix/.cvsignore b/lib/export/isc/unix/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/unix/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/unix/include/.cvsignore b/lib/export/isc/unix/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/unix/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isc/unix/include/isc/.cvsignore b/lib/export/isc/unix/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isc/unix/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isccfg/.cvsignore b/lib/export/isccfg/.cvsignore
new file mode 100644
index 0000000000..8df5b29f00
--- /dev/null
+++ b/lib/export/isccfg/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+timestamp
diff --git a/lib/export/isccfg/include/.cvsignore b/lib/export/isccfg/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isccfg/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/isccfg/include/isccfg/.cvsignore b/lib/export/isccfg/include/isccfg/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/export/isccfg/include/isccfg/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/export/samples/.cvsignore b/lib/export/samples/.cvsignore
new file mode 100644
index 0000000000..5e42ccc5a3
--- /dev/null
+++ b/lib/export/samples/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+Makefile-postinstall
+nsprobe
+sample
+sample-async
+sample-gai
+sample-request
+sample-update
diff --git a/lib/irs/.cvsignore b/lib/irs/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/irs/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/irs/include/.cvsignore b/lib/irs/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/irs/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/irs/include/irs/.cvsignore b/lib/irs/include/irs/.cvsignore
new file mode 100644
index 0000000000..67360141e7
--- /dev/null
+++ b/lib/irs/include/irs/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+netdb.h
+platform.h
diff --git a/lib/isc/.cvsignore b/lib/isc/.cvsignore
new file mode 100644
index 0000000000..b3b8e7617f
--- /dev/null
+++ b/lib/isc/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+.libs
+*.la
+*.lo
diff --git a/lib/isc/alpha/.cvsignore b/lib/isc/alpha/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/alpha/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/alpha/include/.cvsignore b/lib/isc/alpha/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/alpha/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/alpha/include/isc/.cvsignore b/lib/isc/alpha/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/alpha/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/ia64/.cvsignore b/lib/isc/ia64/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/ia64/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/ia64/include/.cvsignore b/lib/isc/ia64/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/ia64/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/ia64/include/isc/.cvsignore b/lib/isc/ia64/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/ia64/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/include/.cvsignore b/lib/isc/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/include/isc/.cvsignore b/lib/isc/include/isc/.cvsignore
new file mode 100644
index 0000000000..6dd03c914c
--- /dev/null
+++ b/lib/isc/include/isc/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+platform.h
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 7bbb938fad..7c125a6123 100644
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.70 2012/02/28 23:46:59 tbox Exp $
+# $Id: Makefile.in,v 1.68.630.2 2012/02/28 23:46:24 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/mips/.cvsignore b/lib/isc/mips/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/mips/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/mips/include/.cvsignore b/lib/isc/mips/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/mips/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/mips/include/isc/.cvsignore b/lib/isc/mips/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/mips/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/nls/.cvsignore b/lib/isc/nls/.cvsignore
new file mode 100644
index 0000000000..1c44159d27
--- /dev/null
+++ b/lib/isc/nls/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+.libs
+*.la
+*.lo
diff --git a/lib/isc/noatomic/.cvsignore b/lib/isc/noatomic/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/noatomic/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/noatomic/include/.cvsignore b/lib/isc/noatomic/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/noatomic/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/noatomic/include/isc/.cvsignore b/lib/isc/noatomic/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/noatomic/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/nothreads/.cvsignore b/lib/isc/nothreads/.cvsignore
new file mode 100644
index 0000000000..1c44159d27
--- /dev/null
+++ b/lib/isc/nothreads/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+.libs
+*.la
+*.lo
diff --git a/lib/isc/nothreads/include/.cvsignore b/lib/isc/nothreads/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/nothreads/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/nothreads/include/isc/.cvsignore b/lib/isc/nothreads/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/nothreads/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/powerpc/.cvsignore b/lib/isc/powerpc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/powerpc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/powerpc/include/.cvsignore b/lib/isc/powerpc/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/powerpc/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/powerpc/include/isc/.cvsignore b/lib/isc/powerpc/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/powerpc/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/pthreads/.cvsignore b/lib/isc/pthreads/.cvsignore
new file mode 100644
index 0000000000..1c44159d27
--- /dev/null
+++ b/lib/isc/pthreads/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+.libs
+*.la
+*.lo
diff --git a/lib/isc/pthreads/include/.cvsignore b/lib/isc/pthreads/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/pthreads/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/pthreads/include/isc/.cvsignore b/lib/isc/pthreads/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/pthreads/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/sparc64/.cvsignore b/lib/isc/sparc64/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/sparc64/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/sparc64/include/.cvsignore b/lib/isc/sparc64/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/sparc64/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/sparc64/include/isc/.cvsignore b/lib/isc/sparc64/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/sparc64/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/tests/.cvsignore b/lib/isc/tests/.cvsignore
new file mode 100644
index 0000000000..6abab36d4a
--- /dev/null
+++ b/lib/isc/tests/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+atf.out
+*_test
diff --git a/lib/isc/unix/.cvsignore b/lib/isc/unix/.cvsignore
new file mode 100644
index 0000000000..1c44159d27
--- /dev/null
+++ b/lib/isc/unix/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+.libs
+*.la
+*.lo
diff --git a/lib/isc/unix/include/.cvsignore b/lib/isc/unix/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/unix/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/unix/include/isc/.cvsignore b/lib/isc/unix/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/unix/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index c6b76f9b86..7f88000368 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.13 2012/02/29 23:47:21 tbox Exp $ */
+/* $Id: stdio.c,v 1.11.20.2 2012/02/29 23:46:55 tbox Exp $ */
 
 #include 
 
diff --git a/lib/isc/win32/.cvsignore b/lib/isc/win32/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/win32/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/win32/include/.cvsignore b/lib/isc/win32/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/win32/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/win32/include/isc/.cvsignore b/lib/isc/win32/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/win32/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 593ccd44db..8b801c28b1 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.95 2012/02/06 23:46:49 tbox Exp $ */
+/* $Id: socket.c,v 1.93.52.2 2012/02/06 23:46:23 tbox Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
diff --git a/lib/isc/x86_32/.cvsignore b/lib/isc/x86_32/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_32/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/x86_32/include/.cvsignore b/lib/isc/x86_32/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_32/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/x86_32/include/isc/.cvsignore b/lib/isc/x86_32/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_32/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/x86_64/.cvsignore b/lib/isc/x86_64/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_64/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/x86_64/include/.cvsignore b/lib/isc/x86_64/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_64/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isc/x86_64/include/isc/.cvsignore b/lib/isc/x86_64/include/isc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isc/x86_64/include/isc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isccc/.cvsignore b/lib/isccc/.cvsignore
new file mode 100644
index 0000000000..b3b8e7617f
--- /dev/null
+++ b/lib/isccc/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+.libs
+*.la
+*.lo
diff --git a/lib/isccc/include/.cvsignore b/lib/isccc/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isccc/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isccc/include/isccc/.cvsignore b/lib/isccc/include/isccc/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isccc/include/isccc/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isccfg/.cvsignore b/lib/isccfg/.cvsignore
new file mode 100644
index 0000000000..b3b8e7617f
--- /dev/null
+++ b/lib/isccfg/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+.libs
+*.la
+*.lo
diff --git a/lib/isccfg/include/.cvsignore b/lib/isccfg/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isccfg/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/isccfg/include/isccfg/.cvsignore b/lib/isccfg/include/isccfg/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/isccfg/include/isccfg/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/.cvsignore b/lib/lwres/.cvsignore
new file mode 100644
index 0000000000..b3b8e7617f
--- /dev/null
+++ b/lib/lwres/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+.libs
+*.la
+*.lo
diff --git a/lib/lwres/include/.cvsignore b/lib/lwres/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/include/lwres/.cvsignore b/lib/lwres/include/lwres/.cvsignore
new file mode 100644
index 0000000000..67360141e7
--- /dev/null
+++ b/lib/lwres/include/lwres/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+netdb.h
+platform.h
diff --git a/lib/lwres/man/.cvsignore b/lib/lwres/man/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/man/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/unix/.cvsignore b/lib/lwres/unix/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/unix/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/unix/include/.cvsignore b/lib/lwres/unix/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/unix/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/unix/include/lwres/.cvsignore b/lib/lwres/unix/include/lwres/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/unix/include/lwres/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/win32/.cvsignore b/lib/lwres/win32/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/win32/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/win32/include/.cvsignore b/lib/lwres/win32/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/win32/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/lwres/win32/include/lwres/.cvsignore b/lib/lwres/win32/include/lwres/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/lwres/win32/include/lwres/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/tests/.cvsignore b/lib/tests/.cvsignore
new file mode 100644
index 0000000000..cd674ca368
--- /dev/null
+++ b/lib/tests/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+timestamp
+*.lo
+*.la
+.libs
diff --git a/lib/tests/include/.cvsignore b/lib/tests/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/tests/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/tests/include/tests/.cvsignore b/lib/tests/include/tests/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/tests/include/tests/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/make/.cvsignore b/make/.cvsignore
new file mode 100644
index 0000000000..317ec27c1c
--- /dev/null
+++ b/make/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+includes
+rules
+mkdep
diff --git a/make/rules.in b/make/rules.in
index eeb1a34572..5a688793d2 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.74 2012/01/31 23:47:33 tbox Exp $
+# $Id: rules.in,v 1.72.22.2 2012/01/31 23:47:02 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
diff --git a/unit/.cvsignore b/unit/.cvsignore
new file mode 100644
index 0000000000..6ff543b028
--- /dev/null
+++ b/unit/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+atf
+unittest.sh
diff --git a/unit/atf-src/.cvsignore b/unit/atf-src/.cvsignore
new file mode 100644
index 0000000000..20c3d874f2
--- /dev/null
+++ b/unit/atf-src/.cvsignore
@@ -0,0 +1,11 @@
+.libs
+Makefile
+autom4te.cache
+bconfig.h
+config.log
+config.status
+configure.lineno
+libatf-c++.la
+libatf-c.la
+libtool
+stamp-h1
diff --git a/unit/atf-src/atf-c++/.cvsignore b/unit/atf-src/atf-c++/.cvsignore
new file mode 100644
index 0000000000..02680616ae
--- /dev/null
+++ b/unit/atf-src/atf-c++/.cvsignore
@@ -0,0 +1,16 @@
+.deps
+.dirstamp
+.libs
+atf-c++.pc
+atf_c++_test
+build.lo
+build_test
+check.lo
+check_test
+config.lo
+config_test
+macros_test
+pkg_config_test
+tests.lo
+tests_test
+utils_test
diff --git a/unit/atf-src/atf-c++/detail/.cvsignore b/unit/atf-src/atf-c++/detail/.cvsignore
new file mode 100644
index 0000000000..645b034586
--- /dev/null
+++ b/unit/atf-src/atf-c++/detail/.cvsignore
@@ -0,0 +1,24 @@
+.deps
+.dirstamp
+.libs
+application.lo
+application_test
+env.lo
+env_test
+exceptions.lo
+exceptions_test
+expand.lo
+expand_test
+fs.lo
+fs_test
+libtest_helpers.la
+parser.lo
+parser_test
+process.lo
+process_test
+sanity_test
+test_helpers.lo
+text.lo
+text_test
+ui.lo
+ui_test
diff --git a/unit/atf-src/atf-c/.cvsignore b/unit/atf-src/atf-c/.cvsignore
new file mode 100644
index 0000000000..c6c159b760
--- /dev/null
+++ b/unit/atf-src/atf-c/.cvsignore
@@ -0,0 +1,22 @@
+.deps
+defs.h
+.dirstamp
+.libs
+atf-c.pc
+atf_c_test
+build_test
+check_test
+config_test
+error_test
+libatf_c_la-build.lo
+libatf_c_la-check.lo
+libatf_c_la-config.lo
+libatf_c_la-error.lo
+libatf_c_la-tc.lo
+libatf_c_la-tp.lo
+libatf_c_la-utils.lo
+macros_test
+pkg_config_test
+tc_test
+tp_test
+utils_test
diff --git a/unit/atf-src/atf-c/detail/.cvsignore b/unit/atf-src/atf-c/detail/.cvsignore
new file mode 100644
index 0000000000..ea9b4e9278
--- /dev/null
+++ b/unit/atf-src/atf-c/detail/.cvsignore
@@ -0,0 +1,26 @@
+.deps
+.dirstamp
+.libs
+atf_c_detail_libtest_helpers_la-test_helpers.lo
+dynstr_test
+env_test
+fs_test
+libatf_c_la-dynstr.lo
+libatf_c_la-env.lo
+libatf_c_la-fs.lo
+libatf_c_la-list.lo
+libatf_c_la-map.lo
+libatf_c_la-process.lo
+libatf_c_la-sanity.lo
+libatf_c_la-text.lo
+libatf_c_la-tp_main.lo
+libatf_c_la-user.lo
+libtest_helpers.la
+list_test
+map_test
+process_helpers
+process_test
+sanity_test
+test_helpers_test
+text_test
+user_test
diff --git a/unit/atf-src/atf-config/.cvsignore b/unit/atf-src/atf-config/.cvsignore
new file mode 100644
index 0000000000..e902f59c67
--- /dev/null
+++ b/unit/atf-src/atf-config/.cvsignore
@@ -0,0 +1,5 @@
+.deps
+.dirstamp
+.libs
+atf-config
+integration_test
diff --git a/unit/atf-src/atf-report/.cvsignore b/unit/atf-src/atf-report/.cvsignore
new file mode 100644
index 0000000000..337d22a1dd
--- /dev/null
+++ b/unit/atf-src/atf-report/.cvsignore
@@ -0,0 +1,9 @@
+.deps
+.dirstamp
+.libs
+atf-report
+fail_helper
+integration_test
+misc_helpers
+pass_helper
+reader_test
diff --git a/unit/atf-src/atf-run/.cvsignore b/unit/atf-src/atf-run/.cvsignore
new file mode 100644
index 0000000000..d36a5f8efa
--- /dev/null
+++ b/unit/atf-src/atf-run/.cvsignore
@@ -0,0 +1,19 @@
+.deps
+.dirstamp
+.libs
+atf-run
+atffile_test
+bad_metadata_helper
+config_test
+expect_helpers
+fs_test
+integration_test
+io_test
+misc_helpers
+pass_helper
+requirements_test
+several_tcs_helper
+signals_test
+test_program_test
+user_test
+zero_tcs_helper
diff --git a/unit/atf-src/atf-sh/.cvsignore b/unit/atf-src/atf-sh/.cvsignore
new file mode 100644
index 0000000000..837da623b8
--- /dev/null
+++ b/unit/atf-src/atf-sh/.cvsignore
@@ -0,0 +1,13 @@
+.deps
+.dirstamp
+.libs
+atf-check
+atf-check_test
+atf-sh
+atf_check_test
+config_test
+integration_test
+misc_helpers
+normalize_test
+tc_test
+tp_test
diff --git a/unit/atf-src/atf-version/.cvsignore b/unit/atf-src/atf-version/.cvsignore
new file mode 100644
index 0000000000..3e3a877637
--- /dev/null
+++ b/unit/atf-src/atf-version/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.dirstamp
+.libs
+atf-version
+revision.h
+revision.h.stamp
diff --git a/unit/atf-src/bootstrap/.cvsignore b/unit/atf-src/bootstrap/.cvsignore
new file mode 100644
index 0000000000..5b7c16c63d
--- /dev/null
+++ b/unit/atf-src/bootstrap/.cvsignore
@@ -0,0 +1,2 @@
+.deps
+atconfig
diff --git a/unit/atf-src/doc/.cvsignore b/unit/atf-src/doc/.cvsignore
new file mode 100644
index 0000000000..7c31856450
--- /dev/null
+++ b/unit/atf-src/doc/.cvsignore
@@ -0,0 +1 @@
+atf.7
diff --git a/unit/atf-src/test-programs/.cvsignore b/unit/atf-src/test-programs/.cvsignore
new file mode 100644
index 0000000000..e8b6d684d6
--- /dev/null
+++ b/unit/atf-src/test-programs/.cvsignore
@@ -0,0 +1,12 @@
+.deps
+.dirstamp
+.libs
+c_helpers
+config_test
+cpp_helpers
+expect_test
+fork_test
+meta_data_test
+result_test
+sh_helpers
+srcdir_test
diff --git a/util/copyrights b/util/copyrights
index c1a10f703f..2062158612 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -143,16 +143,16 @@
 ./bin/named/bind9.xsl.h				X	2007,2008,2009,2011
 ./bin/named/bindkeys.pl				PERL	2009,2010,2011
 ./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2009,2010,2011,2012
-./bin/named/client.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./bin/named/client.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./bin/named/config.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
-./bin/named/control.c				C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012
+./bin/named/control.c				C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
 ./bin/named/controlconf.c			C	2001,2002,2003,2004,2005,2006,2007,2008,2011
 ./bin/named/convertxsl.pl			PERL	2006,2007,2008
 ./bin/named/include/dlz/dlz_dlopen_driver.h	C	2011
 ./bin/named/include/named/builtin.h		C	2001,2004,2005,2007
-./bin/named/include/named/client.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012
+./bin/named/include/named/client.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
 ./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009
-./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012
+./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
 ./bin/named/include/named/globals.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./bin/named/include/named/interfacemgr.h	C	1999,2000,2001,2002,2004,2005,2007,2011
 ./bin/named/include/named/listenlist.h		C	2000,2001,2004,2005,2007
@@ -166,7 +166,7 @@
 ./bin/named/include/named/notify.h		C	1999,2000,2001,2004,2005,2007,2009
 ./bin/named/include/named/ns_smf_globals.h	C	2005,2007
 ./bin/named/include/named/query.h		C	1999,2000,2001,2002,2004,2005,2007,2010,2011
-./bin/named/include/named/server.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./bin/named/include/named/server.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./bin/named/include/named/sortlist.h		C	2000,2001,2004,2005,2006,2007
 ./bin/named/include/named/statschannel.h	C	2008
 ./bin/named/include/named/tkeyconf.h		C	1999,2000,2001,2004,2005,2006,2007
@@ -897,22 +897,22 @@
 ./bin/tests/system/filter-aaaa/conf/good8.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/filter-aaaa.c	C	2010,2011
 ./bin/tests/system/filter-aaaa/ns1/named.conf	CONF-C	2010
-./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010,2012
+./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns1/sign.sh	SH	2010
-./bin/tests/system/filter-aaaa/ns1/signed.db.in	ZONE	2010,2012
-./bin/tests/system/filter-aaaa/ns1/unsigned.db	ZONE	2010,2012
+./bin/tests/system/filter-aaaa/ns1/signed.db.in	ZONE	2010
+./bin/tests/system/filter-aaaa/ns1/unsigned.db	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns2/hints	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns2/named.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/ns3/hints	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns3/named.conf	CONF-C	2010
 ./bin/tests/system/filter-aaaa/ns4/named.conf	CONF-C	2010
-./bin/tests/system/filter-aaaa/ns4/root.db	ZONE	2010,2012
+./bin/tests/system/filter-aaaa/ns4/root.db	ZONE	2010
 ./bin/tests/system/filter-aaaa/ns4/sign.sh	SH	2010
-./bin/tests/system/filter-aaaa/ns4/signed.db.in	ZONE	2010,2012
-./bin/tests/system/filter-aaaa/ns4/unsigned.db	ZONE	2010,2012
+./bin/tests/system/filter-aaaa/ns4/signed.db.in	ZONE	2010
+./bin/tests/system/filter-aaaa/ns4/unsigned.db	ZONE	2010
 ./bin/tests/system/filter-aaaa/prereq.sh	SH	2010
 ./bin/tests/system/filter-aaaa/setup.sh		SH	2010
-./bin/tests/system/filter-aaaa/tests.sh		SH	2010,2012
+./bin/tests/system/filter-aaaa/tests.sh		SH	2010
 ./bin/tests/system/forward/clean.sh		SH	2000,2001,2004,2007
 ./bin/tests/system/forward/ns1/.cvsignore	X	2000,2001
 ./bin/tests/system/forward/ns1/example.db	X	2000,2001
@@ -1444,15 +1444,12 @@
 ./bin/tests/system/xferquota/tests.sh		SH	2000,2001,2004,2007
 ./bin/tests/system/zonechecks/a.db		ZONE	2004,2007
 ./bin/tests/system/zonechecks/aaaa.db		ZONE	2004,2007
-./bin/tests/system/zonechecks/clean.sh		SH	2004,2007,2012
+./bin/tests/system/zonechecks/clean.sh		SH	2004,2007
 ./bin/tests/system/zonechecks/cname.db		ZONE	2004,2007
 ./bin/tests/system/zonechecks/dname.db		ZONE	2004,2007
 ./bin/tests/system/zonechecks/noaddress.db	ZONE	2004,2007
-./bin/tests/system/zonechecks/ns1/named.conf	CONF-C	2012
-./bin/tests/system/zonechecks/ns2/named.conf	CONF-C	2012
 ./bin/tests/system/zonechecks/nxdomain.db	ZONE	2004,2007
-./bin/tests/system/zonechecks/setup.sh		SH	2012
-./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009,2012
+./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009
 ./bin/tests/t_api.pl				PERL	1999,2000,2001,2004,2007
 ./bin/tests/task_test.c				C	1998,1999,2000,2001,2004,2007
 ./bin/tests/tasks/.cvsignore			X	1999,2000,2001
@@ -2237,7 +2234,7 @@
 ./lib/dns/include/dns/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/log.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011
 ./lib/dns/include/dns/lookup.h			C	2000,2001,2004,2005,2006,2007,2009
-./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
+./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2011
 ./lib/dns/include/dns/message.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/include/dns/name.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
@@ -2473,7 +2470,7 @@
 ./lib/dns/tests/dbversion_test.c		C	2011
 ./lib/dns/tests/dnstest.c			C	2011
 ./lib/dns/tests/dnstest.h			C	2011
-./lib/dns/tests/master_test.c			C	2011,2012
+./lib/dns/tests/master_test.c			C	2011
 ./lib/dns/tests/mkraw.pl			PERL	2011
 ./lib/dns/tests/nsec3_test.c			C	2012
 ./lib/dns/tests/private_test.c			C	2011
diff --git a/util/kit.sh b/util/kit.sh
index a5bcecbe3a..b43307142c 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: kit.sh,v 1.46 2012/01/30 23:47:17 tbox Exp $
+# $Id: kit.sh,v 1.45.2.1 2012/01/31 23:47:02 tbox Exp $
 
 # Make a release kit
 #
diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl
index e7fe61c9f0..15e5fe34fd 100755
--- a/util/mksymtbl.pl
+++ b/util/mksymtbl.pl
@@ -14,13 +14,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mksymtbl.pl,v 1.6 2012/01/31 23:47:33 tbox Exp $
+# $Id: mksymtbl.pl,v 1.4.688.2 2012/01/31 23:47:03 tbox Exp $
 
 use strict;
 use diagnostics;
 $^W = 1;
 
-my $rev = '$Id: mksymtbl.pl,v 1.6 2012/01/31 23:47:33 tbox Exp $';
+my $rev = '$Id: mksymtbl.pl,v 1.4.688.2 2012/01/31 23:47:03 tbox Exp $';
 $rev =~ s/\$//g;
 $rev =~ s/,v//g;
 $rev =~ s/Id: //;
diff --git a/version b/version
index 090ef5850d..eddbb3c681 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.61 2012/01/31 01:15:59 each Exp $
+# $Id: version,v 1.60.2.4 2012/02/23 08:46:54 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=9
 PATCHVER=0
-RELEASETYPE=rc
-RELEASEVER=2
+RELEASETYPE=
+RELEASEVER=