From d8644930b4c173951b8f5487684a1fe80fcd996c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 7 Sep 2022 12:50:08 +0200 Subject: [PATCH 1/2] Test the --disable-doh switch in GitLab CI Use the --disable-doh switch for all Ubuntu 22.04 builds in GitLab CI to immediately flag any code changes that would break such builds. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b206caefc..6ab49f9b24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -945,7 +945,7 @@ gcc:jammy:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2" + EXTRA_CONFIGURE: "--with-libidn2 --disable-doh" <<: *ubuntu_jammy_amd64_image <<: *build_job From 4c490685319fc8d1fc34e1b10e42ee2b84867b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 7 Sep 2022 12:50:08 +0200 Subject: [PATCH 2/2] Fix building with --disable-doh Commit b69e783164cd50e3306364668558e460617ee8fc inadvertently caused builds using the --disable-doh switch to fail, by putting the declaration of the isc__nm_async_settlsctx() function inside an #ifdef block that is only evaluated when DNS-over-HTTPS support is enabled. This results in the following compilation errors being triggered: netmgr/netmgr.c:2657:1: error: no previous prototype for 'isc__nm_async_settlsctx' [-Werror=missing-prototypes] 2657 | isc__nm_async_settlsctx(isc__networker_t *worker, isc__netievent_t *ev0) { | ^~~~~~~~~~~~~~~~~~~~~~~ Fix by making the declaration of the isc__nm_async_settlsctx() function in lib/isc/netmgr/netmgr-int.h visible regardless of whether DNS-over-HTTPS support is enabled or not. --- lib/isc/netmgr/netmgr-int.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index 9f2d76ded6..20eba5adb8 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -1727,11 +1727,11 @@ void isc__nm_http_set_max_streams(isc_nmsocket_t *listener, const uint32_t max_concurrent_streams); +#endif + void isc__nm_async_settlsctx(isc__networker_t *worker, isc__netievent_t *ev0); -#endif - void isc__nm_incstats(isc_nmsocket_t *sock, isc__nm_statid_t id); /*%<