From ea80bcc41c933efaf4572a36c961913a6e8a58b0 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 24 Aug 2021 14:01:46 +1000 Subject: [PATCH] More config element are not valid without DOH / DOT --- lib/isccfg/namedconf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index a216cb2c45..98d47af43e 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -219,7 +219,11 @@ static cfg_type_t cfg_type_remoteservers = { "remote-servers", cfg_parse_tuple, static cfg_tuplefielddef_t namesockaddrkey_fields[] = { { "remoteselement", &cfg_type_remoteselement, 0 }, { "key", &cfg_type_optional_keyref, 0 }, +#if HAVE_LIBNGHTTP2 { "tls", &cfg_type_optional_tls, 0 }, +#else + { "tls", &cfg_type_optional_tls, CFG_CLAUSEFLAG_NOTCONFIGURED }, +#endif { NULL, NULL, 0 }, }; @@ -1114,7 +1118,12 @@ static cfg_clausedef_t namedconf_clauses[] = { { "acl", &cfg_type_acl, CFG_CLAUSEFLAG_MULTI }, { "controls", &cfg_type_controls, CFG_CLAUSEFLAG_MULTI }, { "dnssec-policy", &cfg_type_dnssecpolicy, CFG_CLAUSEFLAG_MULTI }, +#if HAVE_LIBNGHTTP2 { "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 }, { "lwres", NULL, CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_ANCIENT }, { "masters", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI }, @@ -1123,7 +1132,12 @@ static cfg_clausedef_t namedconf_clauses[] = { { "primaries", &cfg_type_remoteservers, CFG_CLAUSEFLAG_MULTI }, { "statistics-channels", &cfg_type_statschannels, CFG_CLAUSEFLAG_MULTI }, +#if HAVE_LIBNGHTTP2 { "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 }, { NULL, NULL, 0 } };