upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2877-v9-17-cannot-be-compiled-on-a-system-without-libnghttp2-library' into 'main'

Browse source 
Resolve "v9.17 cannot be compiled on a system without libnghttp2 library"

Closes #2877

See merge request isc-projects/bind9!5353
This commit is contained in:
Mark Andrews 2021-08-25 03:36:50 +00:00
commit cd03e790ff
5 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/named/main.c
View file

@ -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.
*/

6
bin/tests/system/Makefile.am
View file

@ -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 \

3
bin/tests/system/checkconf/tests.sh
View file

@ -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

1
doc/misc/format-options.pl
View file

@ -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 = $&;

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[] = {
{ "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 }
};