From 4a43aee99e25a0f5086cdd7950aea6914ac12fe1 Mon Sep 17 00:00:00 2001 From: TCY16 Date: Tue, 16 Nov 2021 11:25:58 +0100 Subject: [PATCH] setup for configurable EDEs for local-zone --- util/config_file.c | 2 +- util/configlexer.lex | 1 + util/configparser.y | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/util/config_file.c b/util/config_file.c index 2bda37359..0d992528b 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -791,7 +791,7 @@ int config_set_option(struct config_file* cfg, const char* opt, } oi[cfg->num_out_ifs++] = d; cfg->out_ifs = oi; - } else S_YNO("local_data_do_ede:", local_data_do_ede) + } else S_YNO("local-data-do-ede:", local_data_do_ede) else { /* unknown or unsupported (from the set_option interface): * interface, outgoing-interface, access-control, diff --git a/util/configlexer.lex b/util/configlexer.lex index 71da92422..27809911a 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -549,6 +549,7 @@ tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } edns-client-string{COLON} { YDVAR(2, VAR_EDNS_CLIENT_STRING) } edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } nsid{COLON} { YDVAR(1, VAR_NSID ) } +local-data-do-ede{COLON} { YDVAR(1, VAR_LOCAL_DATA_DO_EDE) } {NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++; } /* Quoted strings. Strip leading and ending quotes */ diff --git a/util/configparser.y b/util/configparser.y index 1daf853d5..fc2a55f9a 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -187,6 +187,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_STRING %token VAR_EDNS_CLIENT_STRING_OPCODE VAR_NSID %token VAR_ZONEMD_PERMISSIVE_MODE VAR_ZONEMD_CHECK VAR_ZONEMD_REJECT_ABSENCE +%token VAR_LOCAL_DATA_DO_EDE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -3004,6 +3005,14 @@ view_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG } } ; +// view_local_data_do_ede: VAR_LOCAL_DATA_DO_EDE STRING_ARG +// { +// OUTYY(("P(view_local_data_do_ede:%s)\n", $2)); +// if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data_do_ede, $2)) { +// fatal_exit("out of memory adding local-data"); +// } +// } +// ; view_first: VAR_VIEW_FIRST STRING_ARG { OUTYY(("P(view-first:%s)\n", $2)); -- 2.47.2