From 651421a5db8a9edf39c76fd8cf859409eb8c373b Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Tue, 30 Jan 2001 22:02:31 +0000 Subject: [PATCH] removed the "additional-data" option, since it was never fully implemented and because it causes "internal" to be a reserved word in named.conf, causing problems for those using "internal" as an ACL name. Since additional-data was never documented, the user-visible aspect of the change is: 718. [cleanup] "internal" is no longer a reserved word in named.conf. [RT #753, #731] --- CHANGES | 4 +++ lib/dns/config/confcommon.c | 27 +---------------- lib/dns/config/confctx.c | 12 +------- lib/dns/config/confparser.y.dirty | 50 +------------------------------ lib/dns/config/confview.c | 11 +------ lib/dns/include/dns/confcommon.h | 13 +------- lib/dns/include/dns/confctx.h | 11 +------ lib/dns/include/dns/confview.h | 11 +------ 8 files changed, 11 insertions(+), 128 deletions(-) diff --git a/CHANGES b/CHANGES index 86365932e9..293f334ab2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ + + 718. [cleanup] "internal" is no longer a reserved word in named.conf. + [RT #753, #731] + 717. [bug] Certain TKEY processing failure modes could reference an uninitialized variable, causing the server to crash. [RT #750] diff --git a/lib/dns/config/confcommon.c b/lib/dns/config/confcommon.c index 8f36a32c57..d8c6a082b1 100644 --- a/lib/dns/config/confcommon.c +++ b/lib/dns/config/confcommon.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confcommon.c,v 1.37 2001/01/22 03:59:11 gson Exp $ */ +/* $Id: confcommon.c,v 1.38 2001/01/30 22:02:23 gson Exp $ */ #include @@ -491,31 +491,6 @@ dns_c_forward2string(dns_c_forw_t forw, -const char * -dns_c_addata2string(dns_c_addata_t addata, - isc_boolean_t printable) -{ - const char *rval = NULL; - - switch (addata) { - case dns_c_ad_internal: - rval = "internal"; - break; - - case dns_c_ad_minimal: - rval = "minimal"; - break; - - case dns_c_ad_maximal: - rval = "maximal"; - break; - } - - return (rval == NULL && printable ? "UNKNOWN_ADDITIONAL_DATA" : rval); -} - - - int dns_c_isanyaddr(isc_sockaddr_t *inaddr) { int result = 0; diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c index 18b6709e4f..a422cdc03c 100644 --- a/lib/dns/config/confctx.c +++ b/lib/dns/config/confctx.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confctx.c,v 1.117 2001/01/25 02:33:43 bwelling Exp $ */ +/* $Id: confctx.c,v 1.118 2001/01/30 22:02:25 gson Exp $ */ #include @@ -1065,13 +1065,6 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options) PRINT_QUERYSOURCE(query_source, "query-source"); PRINT_QUERYSOURCE(query_source_v6, "query-source-v6"); - if (options->additional_data != NULL) { - dns_c_printtabs(fp, indent + 1); - fprintf(fp, "additional-data %s;\n", - dns_c_addata2string(*options->additional_data, - ISC_TRUE)); - } - PRINT_CHECKNAME(dns_trans_primary); PRINT_CHECKNAME(dns_trans_secondary); PRINT_CHECKNAME(dns_trans_response); @@ -1588,7 +1581,6 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options) opts->query_source = NULL; opts->query_source_v6 = NULL; - opts->additional_data = NULL; opts->forward = NULL; opts->tkeydhkeycp = NULL; @@ -1742,7 +1734,6 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts) FREEFIELD(query_source); FREEFIELD(query_source_v6); - FREEFIELD(additional_data); FREEFIELD(forward); FREESTRING(tkeydomain); @@ -1888,7 +1879,6 @@ SOCKADDR_FUNCS(querysourcev6, query_source_v6) BYTYPE_FUNCS(dns_c_forw_t, forward, forward) BYTYPE_FUNCS(dns_transfer_format_t, transferformat, transfer_format) -BYTYPE_FUNCS(dns_c_addata_t, additionaldata, additional_data) BYTYPE_FUNCS(dns_dialuptype_t, dialup, dialup) diff --git a/lib/dns/config/confparser.y.dirty b/lib/dns/config/confparser.y.dirty index 0b2c6f0511..3a165cfee9 100644 --- a/lib/dns/config/confparser.y.dirty +++ b/lib/dns/config/confparser.y.dirty @@ -33,7 +33,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confparser.y.dirty,v 1.53 2001/01/27 02:12:13 gson Exp $ */ +/* $Id: confparser.y.dirty,v 1.54 2001/01/30 22:02:26 gson Exp $ */ #include @@ -231,7 +231,6 @@ static isc_boolean_t int_too_big(isc_uint32_t base, isc_uint32_t mult); struct confssu_s ssu; struct confrdtype_s rdatatypelist; dns_rdatatype_t rdatatype; - dns_c_addata_t addata; isc_boolean_t boolean; dns_rdataclass_t rrclass; @@ -264,7 +263,6 @@ static isc_boolean_t int_too_big(isc_uint32_t base, isc_uint32_t mult); %token L_IP6ADDR %token L_ACL -%token L_ADDITIONAL_DATA %token L_ADDRESS %token L_ALGID %token L_ALLOW @@ -447,7 +445,6 @@ static isc_boolean_t int_too_big(isc_uint32_t base, isc_uint32_t mult); %token L_ZONE -%type additional_data %type grantp %type yea_or_nay %type notify_setting @@ -1739,19 +1736,6 @@ option: /* Empty */ YYABORT; } } - | L_ADDITIONAL_DATA additional_data - { - tmpres = dns_c_ctx_setadditionaldata(currcfg, $2); - if (tmpres == ISC_R_EXISTS) { - parser_error(ISC_FALSE, - "cannot redefine additional-data"); - YYABORT; - } else if (tmpres != ISC_R_SUCCESS) { - parser_error(ISC_FALSE, - "failed to set additional-data"); - YYABORT; - } - } ; @@ -2138,19 +2122,6 @@ maybe_zero_port : /* nothing */ } ; -additional_data: L_INTERNAL - { - $$ = dns_c_ad_internal; - } - | L_MINIMAL - { - $$ = dns_c_ad_minimal; - } - | L_MAXIMAL - { - $$ = dns_c_ad_maximal; - }; - yea_or_nay: L_YES { $$ = isc_boolean_true; @@ -4468,23 +4439,6 @@ view_option: L_FORWARD zone_forward_opt YYABORT; } } - | L_ADDITIONAL_DATA additional_data - { - dns_c_view_t *view = dns_c_ctx_getcurrview(currcfg); - - INSIST(view != NULL); - - tmpres = dns_c_view_setadditionaldata(view, $2); - if (tmpres == ISC_R_EXISTS) { - parser_error(ISC_FALSE, - "cannot redefine view additional-data"); - YYABORT; - } else if (tmpres != ISC_R_SUCCESS) { - parser_error(ISC_FALSE, - "failed to set view additional-data"); - YYABORT; - } - } | L_TRANSFER_FORMAT transfer_format { dns_c_view_t *view = dns_c_ctx_getcurrview(currcfg); @@ -6069,7 +6023,6 @@ static struct token keyword_tokens [] = { { "!", L_BANG }, { "acl", L_ACL }, - { "additional-data", L_ADDITIONAL_DATA }, { "address", L_ADDRESS }, { "algorithm", L_ALGID }, { "allow", L_ALLOW }, @@ -6129,7 +6082,6 @@ static struct token keyword_tokens [] = { { "include", L_INCLUDE }, { "inet", L_INET }, { "interface-interval", L_INTERFACE_INTERVAL }, - { "internal", L_INTERNAL }, { "ixfr-base", L_FILE_IXFR }, { "ixfr-tmp-file", L_IXFR_TMP }, { "key", L_SEC_KEY }, diff --git a/lib/dns/config/confview.c b/lib/dns/config/confview.c index 230476ec8c..b466a14b24 100644 --- a/lib/dns/config/confview.c +++ b/lib/dns/config/confview.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confview.c,v 1.71 2001/01/25 02:33:46 bwelling Exp $ */ +/* $Id: confview.c,v 1.72 2001/01/30 22:02:27 gson Exp $ */ #include @@ -581,7 +581,6 @@ dns_c_view_new(isc_mem_t *mem, const char *name, dns_rdataclass_t viewclass, view->notify_forward = NULL; #endif /* NOMINUM_PUBLIC */ - view->additional_data = NULL; view->transfer_format = NULL; view->keydefs = NULL; view->peerlist = NULL; @@ -851,12 +850,6 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) { PRINT_AS_SIZE_CLAUSE(max_cache_size, "max-cache-size"); - if (view->additional_data != NULL) { - dns_c_printtabs(fp, indent + 1); - fprintf(fp, "additional-data %s;\n", - dns_c_addata2string(*view->additional_data, ISC_TRUE)); - } - if (view->transfer_format != NULL) { dns_c_printtabs(fp, indent + 1); fprintf(fp, "transfer-format %s;\n", @@ -1000,7 +993,6 @@ dns_c_view_delete(dns_c_view_t **viewptr) { FREEFIELD(notify_forward); #endif /* NOMINUM_PUBLIC */ - FREEFIELD(additional_data); FREEFIELD(transfer_format); dns_c_view_unsetkeydefs(view); @@ -1625,7 +1617,6 @@ UINT32_FUNCS(maxretrytime, max_retry_time) UINT32_FUNCS(minrefreshtime, min_refresh_time) UINT32_FUNCS(maxrefreshtime, max_refresh_time) -BYTYPE_FUNCS(dns_c_addata_t, additionaldata, additional_data) BYTYPE_FUNCS(dns_transfer_format_t, transferformat, transfer_format) #if 0 diff --git a/lib/dns/include/dns/confcommon.h b/lib/dns/include/dns/confcommon.h index 5b135547a1..ede2b4d05c 100644 --- a/lib/dns/include/dns/confcommon.h +++ b/lib/dns/include/dns/confcommon.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confcommon.h,v 1.32 2001/01/09 21:52:26 bwelling Exp $ */ +/* $Id: confcommon.h,v 1.33 2001/01/30 22:02:29 gson Exp $ */ #ifndef DNS_CONFCOMMON_H #define DNS_CONFCOMMON_H 1 @@ -180,14 +180,6 @@ typedef enum { } dns_c_logseverity_t; -/* Type of additional-data field */ -typedef enum { - dns_c_ad_minimal, - dns_c_ad_maximal, - dns_c_ad_internal -} dns_c_addata_t; - - /* Type of the bit sets used in various structures. Macros in confpvt.h * depending on this being an integer type, and some structures need more * than 32 bits. @@ -247,9 +239,6 @@ dns_c_nameseverity2string(dns_severity_t severity, isc_boolean_t printable); const char * dns_c_forward2string(dns_c_forw_t forw, isc_boolean_t printable); -const char * -dns_c_addata2string(dns_c_addata_t addata, isc_boolean_t printable); - /* * The following dns_c_string2xxx() functions will look up the string * argument in a table of values and will return the appropriate enum/integer diff --git a/lib/dns/include/dns/confctx.h b/lib/dns/include/dns/confctx.h index 55dfe755f9..a41354f0e0 100644 --- a/lib/dns/include/dns/confctx.h +++ b/lib/dns/include/dns/confctx.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confctx.h,v 1.63 2001/01/25 02:33:48 bwelling Exp $ */ +/* $Id: confctx.h,v 1.64 2001/01/30 22:02:30 gson Exp $ */ #ifndef DNS_CONFCTX_H #define DNS_CONFCTX_H 1 @@ -189,8 +189,6 @@ struct dns_c_options { isc_sockaddr_t *query_source; isc_sockaddr_t *query_source_v6; - dns_c_addata_t *additional_data; - dns_c_forw_t *forward; char *tkeydhkeycp; @@ -701,13 +699,6 @@ isc_result_t dns_c_ctx_getquerysourcev6(dns_c_ctx_t *ctx, isc_result_t dns_c_ctx_unsetquerysourcev6(dns_c_ctx_t *ctx); -isc_result_t dns_c_ctx_setadditionaldata(dns_c_ctx_t *ctx, - dns_c_addata_t addata); -isc_result_t dns_c_ctx_getadditionaldata(dns_c_ctx_t *ctx, - dns_c_addata_t *addata); -isc_result_t dns_c_ctx_unsetadditionaldata(dns_c_ctx_t *ctx); - - isc_result_t dns_c_ctx_setforward(dns_c_ctx_t *cfg, dns_c_forw_t forward); isc_result_t dns_c_ctx_getforward(dns_c_ctx_t *cfg, dns_c_forw_t *forward); isc_result_t dns_c_ctx_unsetforward(dns_c_ctx_t *cfg); diff --git a/lib/dns/include/dns/confview.h b/lib/dns/include/dns/confview.h index 1db0b1e841..301974d6a3 100644 --- a/lib/dns/include/dns/confview.h +++ b/lib/dns/include/dns/confview.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: confview.h,v 1.51 2001/01/25 02:33:52 bwelling Exp $ */ +/* $Id: confview.h,v 1.52 2001/01/30 22:02:31 gson Exp $ */ #ifndef DNS_CONFVIEW_H #define DNS_CONFVIEW_H 1 @@ -154,7 +154,6 @@ struct dns_c_view { isc_uint32_t *min_refresh_time; isc_uint32_t *max_refresh_time; - dns_c_addata_t *additional_data; dns_transfer_format_t *transfer_format; dns_c_kdeflist_t *keydefs; @@ -555,14 +554,6 @@ isc_result_t dns_c_view_setmaxrefreshtime(dns_c_view_t *view, isc_result_t dns_c_view_unsetmaxrefreshtime(dns_c_view_t *view); -isc_result_t dns_c_view_setadditionaldata(dns_c_view_t *view, - dns_c_addata_t newval); -isc_result_t dns_c_view_getadditionaldata(dns_c_view_t *view, - dns_c_addata_t *retval); -isc_result_t dns_c_view_unsetadditionaldata(dns_c_view_t *cfg); - - - isc_result_t dns_c_view_settransferformat(dns_c_view_t *view, dns_transfer_format_t tformat); isc_result_t dns_c_view_gettransferformat(dns_c_view_t *view,