From a820cd51ec6cfe7fc666171ef6d1107c3b3f4001 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 27 Jan 2000 00:44:56 +0000 Subject: [PATCH] removed 'pubkey' from the zone object; if we decide it is actually needed, it should be restored but as a dns_pubkey_t, not dns_c_pubkey_t. --- bin/named/zoneconf.c | 71 -------------------------------------- lib/dns/include/dns/zone.h | 18 ---------- lib/dns/zone.c | 22 +----------- lib/dns/zoneconf.c | 71 -------------------------------------- 4 files changed, 1 insertion(+), 181 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 004a4740eb..1f5c2dd3cc 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -89,8 +89,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, const char *filename = NULL; dns_c_severity_t severity; dns_c_iplist_t *iplist = NULL; - dns_c_pubkey_t *pubkey = NULL; - dns_c_pklist_t *pubkeylist = NULL; isc_uint32_t i; isc_sockaddr_t sockaddr; isc_int32_t maxxfr; @@ -174,23 +172,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, } else dns_zone_clearnotify(zone); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr); if (result == ISC_R_SUCCESS) dns_zone_setmaxxfrout(zone, maxxfr); @@ -239,23 +220,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, if (result != DNS_R_SUCCESS) return (result); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif result = dns_c_zone_getmasterport(czone, &port); if (result != ISC_R_SUCCESS) @@ -327,24 +291,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, if (result != DNS_R_SUCCESS) return (result); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif - result = dns_c_zone_getmasterport(czone, &port); if (result != ISC_R_SUCCESS) port = 53; @@ -396,23 +342,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, else dns_zone_setchecknames(zone, dns_c_severity_fail); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif break; } diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 90f4ba4a59..2a2f1eb14a 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -539,24 +539,6 @@ dns_c_severity_t dns_zone_getchecknames(dns_zone_t *zone); * 'zone' to be initalised. */ -void dns_zone_setpubkey(dns_zone_t *zone, dns_c_pubkey_t *pubkey); -/* - * Set the current public key to validate this and child zones - * via DNSSEC. - * - * Require: - * 'zone' to be initalised. - * 'pubkey' to be valid or NULL - */ - -dns_c_pubkey_t * dns_zone_getpubkey(dns_zone_t *zone); -/* - * Return the current public key. - * - * Require: - * 'zone' to be initalised. - */ - void dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size); isc_int32_t dns_zone_getjournalsize(dns_zone_t *zone); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 1606964088..9212b4ebb4 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: zone.c,v 1.63 2000/01/26 21:12:04 halley Exp $ */ + /* $Id: zone.c,v 1.64 2000/01/27 00:44:53 gson Exp $ */ #include @@ -148,7 +148,6 @@ struct dns_zone { dns_acl_t *query_acl; dns_acl_t *xfr_acl; dns_c_severity_t check_names; - dns_c_pubkey_t *pubkey; ISC_LIST(dns_zone_checkservers_t) checkservers; dns_fetch_t *fetch; dns_resolver_t *res; @@ -306,7 +305,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) { zone->query_acl = NULL; zone->xfr_acl = NULL; zone->check_names = dns_c_severity_ignore; - zone->pubkey = NULL; zone->fetch = NULL; zone->res = NULL; zone->socketmgr = NULL; @@ -370,7 +368,6 @@ zone_free(dns_zone_t *zone) { zone->masterport = 0; dns_zone_clearnotify(zone); zone->check_names = dns_c_severity_ignore; - zone->pubkey = NULL; /* XXX detach */ if (zone->update_acl != NULL) dns_acl_detach(&zone->update_acl); if (zone->query_acl != NULL) @@ -2528,22 +2525,6 @@ dns_zone_getchecknames(dns_zone_t *zone) { return (zone->check_names); } -void -dns_zone_setpubkey(dns_zone_t *zone, dns_c_pubkey_t *pubkey) { - - REQUIRE(DNS_ZONE_VALID(zone)); - - zone->pubkey = pubkey; /* XXX should be an attach */ -} - -dns_c_pubkey_t * -dns_zone_getpubkey(dns_zone_t *zone) { - - REQUIRE(DNS_ZONE_VALID(zone)); - - return (zone->pubkey); -} - void dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size) { @@ -2817,7 +2798,6 @@ dns_zone_equal(dns_zone_t *oldzone, dns_zone_t *newzone) { COMPARE_POINTERS(dns_acl_equal, update_acl); COMPARE_POINTERS(dns_acl_equal, query_acl); COMPARE_POINTERS(dns_acl_equal, xfr_acl); - COMPARE_POINTERS(dns_c_pubkey_equal, pubkey); #undef COMPARE_POINTERS diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c index 004a4740eb..1f5c2dd3cc 100644 --- a/lib/dns/zoneconf.c +++ b/lib/dns/zoneconf.c @@ -89,8 +89,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, const char *filename = NULL; dns_c_severity_t severity; dns_c_iplist_t *iplist = NULL; - dns_c_pubkey_t *pubkey = NULL; - dns_c_pklist_t *pubkeylist = NULL; isc_uint32_t i; isc_sockaddr_t sockaddr; isc_int32_t maxxfr; @@ -174,23 +172,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, } else dns_zone_clearnotify(zone); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif result = dns_c_zone_getmaxtranstimeout(czone, &maxxfr); if (result == ISC_R_SUCCESS) dns_zone_setmaxxfrout(zone, maxxfr); @@ -239,23 +220,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, if (result != DNS_R_SUCCESS) return (result); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif result = dns_c_zone_getmasterport(czone, &port); if (result != ISC_R_SUCCESS) @@ -327,24 +291,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, if (result != DNS_R_SUCCESS) return (result); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif - result = dns_c_zone_getmasterport(czone, &port); if (result != ISC_R_SUCCESS) port = 53; @@ -396,23 +342,6 @@ dns_zone_configure(dns_c_ctx_t *ctx, dns_aclconfctx_t *ac, else dns_zone_setchecknames(zone, dns_c_severity_fail); -#if 1 /* XXX brister */ - - result = dns_c_zone_getpubkeylist(czone, &pubkeylist); - if (result == ISC_R_SUCCESS) { - pubkey = ISC_LIST_HEAD(pubkeylist->keylist); - } - dns_zone_setpubkey(zone, pubkey); - -#else - - result = dns_c_zone_getpubkey(czone, &pubkey); - if (result == ISC_R_SUCCESS) - dns_zone_setpubkey(zone, pubkey); - else - dns_zone_setpubkey(zone, NULL); - -#endif break; }