- Fix compile of unbound-dnstap-socket without dnstap installed.

diff --git a/Makefile.in b/Makefile.in
index 99943a650d6bc3af3d02d0116c144d35d5839b39..6809881b6a95e71090918d4a50128c0700d2bef6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -248,6 +248,7 @@ DNSTAP_SOCKET_SRC=dnstap/unbound-dnstap-socket.c
 DNSTAP_SOCKET_OBJ=unbound-dnstap-socket.lo
 DNSTAP_SOCKET_OBJ_LINK=$(DNSTAP_SOCKET_OBJ) $(COMMON_OBJ) \
 $(COMPAT_OBJ) $(SLDNS_OBJ)
+DNSTAP_SOCKET_TESTBIN=@DNSTAP_SOCKET_TESTBIN@
 LIBUNBOUND_SRC=libunbound/context.c libunbound/libunbound.c \
 libunbound/libworker.c
 LIBUNBOUND_OBJ=context.lo libunbound.lo libworker.lo ub_event_pluggable.lo
@@ -323,7 +324,7 @@ rsrc_unbound_checkconf.o:   $(srcdir)/winrc/rsrc_unbound_checkconf.rc config.h
 TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \
        lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \
        petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \
-       unbound-dnstap-socket$(EXEEXT) dohclient$(EXEEXT) \
+       $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \
        testbound$(EXEEXT) unittest$(EXEEXT)
 tests: all $(TEST_BIN)
 

diff --git a/configure b/configure
index 7957f0dd6d7ffa35dc6599c02e4924594dffd03b..9d10e6ee742bcc7e41b799806bada8956e55e26d 100755 (executable)
--- a/configure
+++ b/configure
@@ -649,6 +649,7 @@ ENABLE_DNSCRYPT
 ENABLE_DNSCRYPT_XCHACHA20
 DNSTAP_OBJ
 DNSTAP_SRC
+DNSTAP_SOCKET_TESTBIN
 DNSTAP_SOCKET_PATH
 opt_dnstap_socket_path
 ENABLE_DNSTAP
@@ -21191,6 +21192,7 @@ _ACEOF
 
        DNSTAP_SOCKET_PATH="$hdr_dnstap_socket_path"
 
+       DNSTAP_SOCKET_TESTBIN='unbound-dnstap-socket$(EXEEXT)'
 
         DNSTAP_SRC="dnstap/dnstap.c dnstap/dnstap.pb-c.c dnstap/dnstap_fstrm.c dnstap/dtstream.c"
 

diff --git a/configure.ac b/configure.ac
index 3e872bca959265d1ccd39ea697254592652f5f1f..ee9ff169641e79546894ac6643f3ec475cc70888 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1743,7 +1743,7 @@ dt_DNSTAP([$UNBOUND_RUN_DIR/dnstap.sock],
         AC_DEFINE_UNQUOTED(DNSTAP_SOCKET_PATH,
             ["$hdr_dnstap_socket_path"], [default dnstap socket path])
        AC_SUBST(DNSTAP_SOCKET_PATH,["$hdr_dnstap_socket_path"])
-
+       AC_SUBST(DNSTAP_SOCKET_TESTBIN,['unbound-dnstap-socket$(EXEEXT)'])
         AC_SUBST([DNSTAP_SRC], ["dnstap/dnstap.c dnstap/dnstap.pb-c.c dnstap/dnstap_fstrm.c dnstap/dtstream.c"])
         AC_SUBST([DNSTAP_OBJ], ["dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo"])
     ],

diff --git a/doc/Changelog b/doc/Changelog
index af53d783682b99a9974d6ad675502e1bdf45c06e..0ccec087a9e00775fc524ce0c958e329477315fe 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,9 @@
        - Ignore cache blacklisting when trying to reply with expired data from
          cache (#394).
 
+26 January 2022: Wouter
+       - Fix compile of unbound-dnstap-socket without dnstap installed.
+
 22 January 2022: Willem
        - Padding of queries and responses with DNS over TLS as specified in
          RFC7830 and RFC8467.