setup for configurable EDEs for local-zone

diff --git a/util/config_file.c b/util/config_file.c
index 2bda373596a890e655e218e5d308acb92ee79766..0d992528b87da008b40959bbb14db3352e236d23 100644 (file)
--- 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 71da92422f30d60746580d2ae69915c4035af9bc..27809911a80f4c959fb80ee1ad1d47197f220975 100644 (file)
--- 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) }
 <INITIAL,val>{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 1daf853d5749bf13a3093a537588c56d48da800d..fc2a55f9a4914b5119212d95670e5789c29a4635 100644 (file)
--- 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));