From c5ef2cc650e23d21c6fa48b855221dabdf100d51 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Aug 2021 13:24:56 +1000
Subject: [PATCH 1/5] Protect #include <nghttp2/nghttp2.h> with #ifdef
 HAVE_LIBNGHTTP2

---
 bin/named/main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/named/main.c b/bin/named/main.c
index 565246d772..acc2e1310e 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -101,7 +101,9 @@
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif /* ifdef HAVE_ZLIB */
+#ifdef HAVE_LIBNGHTTP2
 #include <nghttp2/nghttp2.h>
+#endif
 /*
  * Include header files for database drivers here.
  */

From 71b7251009c038803cb6cb0710476717b0e69cc3 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Aug 2021 14:00:06 +1000
Subject: [PATCH 2/5] Make doth system test conditional

---
 bin/tests/system/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 03214a8788..2b32330dac 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -84,6 +84,11 @@ TESTS +=		\
 	rpzrecurse
 endif HAVE_PERLMOD_NET_DNS
 
+if HAVE_LIBNGHTTP2
+TESTS +=		\
+	doth
+endif
+
 TESTS +=			\
 	acl			\
 	additional		\
@@ -103,7 +108,6 @@ TESTS +=			\
 	dlz			\
 	dlzexternal		\
 	dns64			\
-	doth			\
 	dscp			\
 	dsdigest		\
 	dyndb			\

From ea80bcc41c933efaf4572a36c961913a6e8a58b0 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Aug 2021 14:01:46 +1000
Subject: [PATCH 3/5] 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 }
 };

From d425ee809788824a9766fe0ed78262877f79a43b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Aug 2021 14:06:48 +1000
Subject: [PATCH 4/5] Skip good-dot-*.conf when libnghttp2 is not available

---
 bin/tests/system/checkconf/tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 10e829ac17..afb4a34688 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -78,7 +78,8 @@ do
 	if ! $FEATURETEST --with-libnghttp2
 	then
 		case $good in
-		good-doh-*.conf) continue;
+		good-doh-*.conf) continue;;
+		good-dot-*.conf) continue;;
 		esac
 	fi
 	$CHECKCONF $good > checkconf.out$n 2>&1

From aae53e215678690df2fc857f05c9d409b6276104 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Aug 2021 14:08:10 +1000
Subject: [PATCH 5/5] handle not configured with trailing flags

---
 doc/misc/format-options.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index fa1727b22f..af21225bf3 100644
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -30,6 +30,7 @@ while (<>) {
 	m!^( *)!;
 	my $indent = $1;
 	my $comment = "";
+	$line =~ s! // not configured,! //! if $strip_not_configured;
 	$line =~ s! // not configured!! if $strip_not_configured;
 	if ( $line =~ m!//.*! ) {
 		$comment = $&;