More config element are not valid without DOH / DOT

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index a216cb2c45de0c4cb52b8ba4ef899abbf67d0778..98d47af43e55fce5785e85287bb0ff450814c608 100644 (file)
--- 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 }
 };