* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: server.c,v 1.535 2009/06/30 02:52:32 each Exp $ */
+/* $Id: server.c,v 1.536 2009/06/30 23:48:01 tbox Exp $ */
/*! \file */
if (builtin_managed_keys != NULL)
ns_g_server->managedkeys = ISC_TRUE;
CHECK(load_view_keys(builtin_keys, vconfig, view,
- ISC_FALSE, mctx));
+ ISC_FALSE, mctx));
if (strcmp(view->name, "_meta") == 0)
CHECK(load_view_keys(builtin_managed_keys, vconfig,
- view, ISC_TRUE, mctx));
+ view, ISC_TRUE, mctx));
}
CHECK(load_view_keys(view_keys, vconfig, view, ISC_FALSE, mctx));
CHECK(dns_zone_create(&zone, mctx));
- dns_name_init(&zname, NULL);
+ dns_name_init(&zname, NULL);
CHECK(dns_name_fromstring(&zname, KEYZONE, mctx));
CHECK(dns_zone_setorigin(zone, &zname));
dns_name_free(&zname, mctx);
/*
* Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.21 2009/06/30 02:52:32 each Exp $
+ * $Id: dst_api.c,v 1.22 2009/06/30 23:48:01 tbox Exp $
*/
/*! \file */
*/
isc_result_t
dst_key_setflags(dst_key_t *key, isc_uint32_t flags) {
- REQUIRE(VALID_KEY(key));
- key->key_flags = flags;
- return (computeid(key));
+ REQUIRE(VALID_KEY(key));
+ key->key_flags = flags;
+ return (computeid(key));
}
static isc_boolean_t
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: zone.c,v 1.494 2009/06/30 02:52:32 each Exp $ */
+/* $Id: zone.c,v 1.495 2009/06/30 23:48:01 tbox Exp $ */
/*! \file */
}
/*
- * Synchronize the set of initializing keys found in managed-keys {}
+ * Synchronize the set of initializing keys found in managed-keys {}
* statements with the set of trust anchors found in the managed-keys.bind
* zone. If a domain is no longer named in managed-keys, delete all keys
* from that domain from the key zone. If a domain is mentioned in in
if (!dns_rdataset_isassociated(rdataset)) {
dns_rriterator_destroy(&rrit);
goto failure;
- }
+ }
if (rdataset->type != dns_rdatatype_keydata)
continue;
* timer to 30 days in the future
* - All keys not being removed have their refresh timers
* updated
- */
+ */
initializing = ISC_TRUE;
for (result = dns_rdataset_first(&kfetch->keydataset);
result == ISC_R_SUCCESS;
&keydata, &keyb);
/* Insert updated version */
- CHECK(update_one_rr(kfetch->db, ver, &diff,
+ CHECK(update_one_rr(kfetch->db, ver, &diff,
DNS_DIFFOP_ADD, keyname, 0,
&keydatarr));
changed = ISC_TRUE;
} else {
if (keydata.removehd != 0) {
/*
- * Key isn't revoked--but it
- * seems it used to be.
+ * Key isn't revoked--but it
+ * seems it used to be.
* Remove it now and add it
* back as if it were a fresh key.
*/
updatekey = ISC_TRUE;
} else {
/*
- * Key wasn't in the key zone but it's
+ * Key wasn't in the key zone but it's
* revoked now anyway, so just skip it
*/
if (revoked)
/* Delete old version */
if (deletekey || !newkey) {
- CHECK(update_one_rr(kfetch->db, ver, &diff,
+ CHECK(update_one_rr(kfetch->db, ver, &diff,
DNS_DIFFOP_DEL, keyname, 0,
&keydatarr));
changed = ISC_TRUE;
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
zone_needdump(zone, 30);
}
-
+
if (alldone)
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_REFRESHING);
dns_resolver_createfetch(zone->view->resolver,
dns_fixedname_name(&kfetch->name),
- dns_rdatatype_dnskey,
+ dns_rdatatype_dnskey,
NULL, NULL, NULL,
DNS_FETCHOPT_NOVALIDATE,
zone->task, keyfetch_done, kfetch,