mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

More config element are not valid without DOH / DOT

Browse Source
This commit is contained in:
Mark Andrews 2021-08-24 14:01:46 +10:00
parent 71b7251009
commit ea80bcc41c
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/isccfg/namedconf.c
View File

@ -219,7 +219,11 @@ static cfg_type_t cfg_type_remoteservers = { "remote-servers", cfg_parse_tuple,
static cfg_tuplefielddef_t namesockaddrkey_fields[] = { static cfg_tuplefielddef_t namesockaddrkey_fields[] = {
{ "remoteselement", &cfg_type_remoteselement, 0 }, { "remoteselement", &cfg_type_remoteselement, 0 },
{ "key", &cfg_type_optional_keyref, 0 }, { "key", &cfg_type_optional_keyref, 0 },
#if HAVE_LIBNGHTTP2
{ "tls", &cfg_type_optional_tls, 0 }, { "tls", &cfg_type_optional_tls, 0 },
#else
{ "tls", &cfg_type_optional_tls, CFG_CLAUSEFLAG_NOTCONFIGURED },
#endif
{ NULL, NULL, 0 }, { NULL, NULL, 0 },
}; };
@ -1114,7 +1118,12 @@ static cfg_clausedef_t namedconf_clauses[] = {
{ "acl", &cfg_type_acl, CFG_CLAUSEFLAG_MULTI }, { "acl", &cfg_type_acl, CFG_CLAUSEFLAG_MULTI },
{ "controls", &cfg_type_controls, CFG_CLAUSEFLAG_MULTI }, { "controls", &cfg_type_controls, CFG_CLAUSEFLAG_MULTI },
{ "dnssec-policy", &cfg_type_dnssecpolicy, CFG_CLAUSEFLAG_MULTI }, { "dnssec-policy", &cfg_type_dnssecpolicy, CFG_CLAUSEFLAG_MULTI },
#if HAVE_LIBNGHTTP2
{ "http", &cfg_type_http_description, CFG_CLAUSEFLAG_MULTI }, { "http", &cfg_type_http_description, CFG_CLAUSEFLAG_MULTI },
#else
{ "http", &cfg_type_http_description,
CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_NOTCONFIGURED },
#endif
{ "logging", &cfg_type_logging, 0 }, { "logging", &cfg_type_logging, 0 },
{ "lwres", NULL, CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_ANCIENT }, { "lwres", NULL, CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_ANCIENT },
{ "masters", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI }, { "masters", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
@ -1123,7 +1132,12 @@ static cfg_clausedef_t namedconf_clauses[] = {
{ "primaries", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI }, { "primaries", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI },
{ "statistics-channels", &cfg_type_statschannels, { "statistics-channels", &cfg_type_statschannels,
CFG_CLAUSEFLAG_MULTI }, CFG_CLAUSEFLAG_MULTI },
#if HAVE_LIBNGHTTP2
{ "tls", &cfg_type_tlsconf, CFG_CLAUSEFLAG_MULTI }, { "tls", &cfg_type_tlsconf, CFG_CLAUSEFLAG_MULTI },
#else
{ "tls", &cfg_type_tlsconf,
CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_NOTCONFIGURED },
#endif
{ "view", &cfg_type_view, CFG_CLAUSEFLAG_MULTI }, { "view", &cfg_type_view, CFG_CLAUSEFLAG_MULTI },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
}; };