From e3e6888946c27eab95418f2bb69305c38f814974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Jun 2019 12:21:47 +0200 Subject: [PATCH] Make the usage of json-c objects opaque to the caller The json-c have previously leaked into the global namespace leading to forced -I for every compilation unit using isc/xml.h header. This MR fixes the usage making the caller object opaque. --- .dir-locals.el | 1 + bin/check/Makefile.in | 10 +++--- bin/confgen/Makefile.in | 10 +++--- bin/delv/Makefile.in | 10 +++--- bin/dig/Makefile.in | 10 +++--- bin/dnssec/Makefile.in | 10 +++--- bin/named/Makefile.in | 11 +++--- bin/named/main.c | 3 ++ bin/named/statschannel.c | 6 +++- bin/named/unix/Makefile.in | 2 +- bin/nsupdate/Makefile.in | 10 +++--- bin/pkcs11/Makefile.in | 6 ++-- bin/plugins/Makefile.in | 4 +-- bin/rndc/Makefile.in | 10 +++--- bin/tests/Makefile.in | 8 ++--- bin/tests/optional/Makefile.in | 8 ++--- bin/tests/pkcs11/Makefile.in | 2 +- bin/tests/pkcs11/benchmarks/Makefile.in | 2 +- bin/tests/system/Makefile.in | 2 +- bin/tests/system/dyndb/driver/Makefile.in | 4 +-- bin/tests/system/pipelined/Makefile.in | 6 ++-- bin/tests/system/rndc/Makefile.in | 2 +- bin/tests/system/rpz/Makefile.in | 2 +- bin/tests/system/rsabigexponent/Makefile.in | 6 ++-- bin/tests/system/tkey/Makefile.in | 6 ++-- bin/tools/Makefile.in | 10 +++--- contrib/dlz/bin/dlzbdb/Makefile.in | 2 +- doc/arm/Bv9ARM.pdf | Bin 1083159 -> 1083158 bytes fuzz/Makefile.in | 6 ++-- lib/bind9/Makefile.in | 4 +-- lib/dns/Makefile.in | 5 +-- lib/dns/cache.c | 8 +++-- lib/dns/include/dns/cache.h | 3 +- lib/dns/tests/Makefile.in | 6 ++-- lib/irs/Makefile.in | 2 +- lib/irs/tests/Makefile.in | 6 ++-- lib/isc/Makefile.in | 5 +-- lib/isc/include/isc/Makefile.in | 2 +- lib/isc/include/isc/json.h | 35 -------------------- lib/isc/include/isc/mem.h | 3 +- lib/isc/include/isc/socket.h | 3 +- lib/isc/include/isc/task.h | 3 +- lib/isc/mem.c | 8 +++-- lib/isc/task.c | 8 +++-- lib/isc/tests/Makefile.in | 6 ++-- lib/isc/unix/Makefile.in | 3 +- lib/isc/unix/socket.c | 8 +++-- lib/isc/win32/socket.c | 7 +++- lib/isccc/Makefile.in | 4 +-- lib/isccc/tests/Makefile.in | 4 +-- lib/isccfg/Makefile.in | 4 +-- lib/isccfg/tests/Makefile.in | 6 ++-- lib/ns/Makefile.in | 4 +-- lib/ns/tests/Makefile.in | 6 ++-- lib/samples/Makefile.in | 6 ++-- make/rules.in | 3 ++ util/copyrights | 1 - 57 files changed, 164 insertions(+), 168 deletions(-) delete mode 100644 lib/isc/include/isc/json.h diff --git a/.dir-locals.el b/.dir-locals.el index c68180fee7..dcfce209ac 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -53,6 +53,7 @@ (expand-file-name "/usr/local/opt/openssl@1.1/include") (expand-file-name "/usr/local/opt/libxml2/include/libxml2") + (expand-file-name "/usr/local/opt/json-c/include/json-c/") (expand-file-name "/usr/local/include") ) ) diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 7f9e95c2fe..2f8e5b8d87 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \ - ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} BIND9LIBS = ../../lib/bind9/libbind9.@A@ NSLIBS = ../../lib/ns/libns.@A@ @@ -34,8 +34,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ NSDEPENDLIBS = ../../lib/ns/libns.@A@ -LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ -NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${ISCLIBS} @LIBS@ +NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@ SUBDIRS = diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in index da8c4effde..f32a2083f4 100644 --- a/bin/confgen/Makefile.in +++ b/bin/confgen/Makefile.in @@ -20,15 +20,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@ + ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} CDEFINES = CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ @@ -41,9 +41,9 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ RNDCLIBS = ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ -NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@ CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in index ec34e5d952..958b160e05 100644 --- a/bin/delv/Makefile.in +++ b/bin/delv/Makefile.in @@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" \ -DSYSCONFDIR=\"${sysconfdir}\" @@ -24,8 +24,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} IRSLIBS = ../../lib/irs/libirs.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ @@ -35,8 +35,8 @@ IRSDEPLIBS = ../../lib/irs/libirs.@A@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ -NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ +NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ SUBDIRS = diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index 9c0a473374..f878302d85 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -19,7 +19,7 @@ READLINE_LIB = @READLINE_LIB@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \ ${BIND9_INCLUDES} ${ISC_INCLUDES} \ - ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = @@ -27,8 +27,8 @@ CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} IRSLIBS = ../../lib/irs/libirs.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ @@ -41,10 +41,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ - ${ISCLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@ + ${ISCLIBS} @LIBIDN2_LIBS@ @LIBS@ NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ - ${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@ + ${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @LIBS@ SUBDIRS = diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 3559b717d7..65bff2aafa 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -15,23 +15,23 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ -NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@ # Alphabetically TARGETS = dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \ diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index d870e450c7..1ddcf35893 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -46,7 +46,8 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ${NS_INCLUDES} ${DNS_INCLUDES} \ ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \ - ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ \ + ${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ \ + ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} CDEFINES = @CONTRIB_DLZ@ @@ -56,8 +57,8 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} BIND9LIBS = ../../lib/bind9/libbind9.@A@ NSLIBS = ../../lib/ns/libns.@A@ @@ -74,12 +75,12 @@ DEPLIBS = ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ LIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \ - @JSON_C_LIBS@ @LIBS@ + @LIBS@ NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \ ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \ - @JSON_C_LIBS@ @LIBS@ + @LIBS@ SUBDIRS = unix diff --git a/bin/named/main.c b/bin/named/main.c index 83af0e13e8..7c1c13933b 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -54,6 +54,9 @@ #include #endif +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ /* * Defining NAMED_MAIN provides storage declarations (rather than extern) diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 3e99c62552..2d512fa1d4 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -43,6 +42,11 @@ #include #include +#if HAVE_JSON_C +#include +#include +#endif /* HAVE_JSON_C */ + #if HAVE_LIBXML2 #include #define ISC_XMLCHAR (const xmlChar *) diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in index 5ce33e97f6..01c60e790b 100644 --- a/bin/named/unix/Makefile.in +++ b/bin/named/unix/Makefile.in @@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ - ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 9d4c4fd1e0..47823502ad 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -21,15 +21,15 @@ DST_GSSAPI_INC = @DST_GSSAPI_INC@ CINCLUDES = ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \ ${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \ - @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" @USE_GSSAPI@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ IRSLIBS = ../../lib/irs/libirs.@A@ @@ -43,10 +43,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \ - ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ + ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \ - ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ + ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ SUBDIRS = diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in index 060ae4d6e9..99fedb9fbb 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -13,18 +13,18 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${ISC_INCLUDES} @JSON_C_CFLAGS@ +CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ DEPLIBS = ${ISCDEPLIBS} # if FORCE_STATIC_PROVIDER: LIBS += ${PROVIDER} -LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${ISCLIBS} @LIBS@ SUBDIRS = benchmarks diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in index f9d10f281b..045f582935 100644 --- a/bin/plugins/Makefile.in +++ b/bin/plugins/Makefile.in @@ -15,11 +15,11 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ${NS_INCLUDES} ${DNS_INCLUDES} \ - ${ISCCFG_INCLUDES} ${ISC_INCLUDES} @JSON_C_CFLAGS@ + ${ISCCFG_INCLUDES} ${ISC_INCLUDES} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} NSLIBS = ../../lib/ns/libns.@A@ LIBS = diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index 60d162eeb5..d88698bca2 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@ + ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} CDEFINES = CWARNINGS = ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ @@ -34,8 +34,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ -LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ -NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${ISCLIBS} @LIBS@ +NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@ RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS} diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 5a88c0a453..7be8fcc947 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -14,15 +14,15 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = BACKTRACECFLAGS = @BACKTRACECFLAGS@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ @@ -30,7 +30,7 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ -LIBS = @JSON_C_LIBS@ @LIBS@ +LIBS = @LIBS@ SUBDIRS = system @PKCS11_TOOLS@ TESTDIRS = system diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in index 0ea2850588..fc07abafb6 100644 --- a/bin/tests/optional/Makefile.in +++ b/bin/tests/optional/Makefile.in @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ CDEFINES = @USE_GSSAPI@ @@ -23,8 +23,8 @@ BACKTRACECFLAGS = @BACKTRACECFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../../lib/dns/libdns.@A@ @@ -32,7 +32,7 @@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@ ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@ -LIBS = @JSON_C_LIBS@ @LIBS@ +LIBS = @LIBS@ SUBDIRS = diff --git a/bin/tests/pkcs11/Makefile.in b/bin/tests/pkcs11/Makefile.in index 012d1f52b9..9569cc1951 100644 --- a/bin/tests/pkcs11/Makefile.in +++ b/bin/tests/pkcs11/Makefile.in @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} LIBS = ${ISCLIBS} @LIBS@ diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in index 99617ffe56..46a57ff104 100644 --- a/bin/tests/pkcs11/benchmarks/Makefile.in +++ b/bin/tests/pkcs11/benchmarks/Makefile.in @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} LIBS = ${ISCLIBS} @LIBS@ diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 73be90eb82..40a3ffcc60 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -23,7 +23,7 @@ CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@ CWARNINGS = DNSLIBS = -ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in index 510bceaf18..ebcf3c659e 100644 --- a/bin/tests/system/dyndb/driver/Makefile.in +++ b/bin/tests/system/dyndb/driver/Makefile.in @@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in index 296e0ef624..db7f290bfd 100644 --- a/bin/tests/system/pipelined/Makefile.in +++ b/bin/tests/system/pipelined/Makefile.in @@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ TARGETS = pipequeries@EXEEXT@ diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in index dc85d978b7..e911bbebec 100644 --- a/bin/tests/system/rndc/Makefile.in +++ b/bin/tests/system/rndc/Makefile.in @@ -20,7 +20,7 @@ CINCLUDES = ${ISC_INCLUDES} CDEFINES = CWARNINGS = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in index 17460169dc..81783af0e2 100644 --- a/bin/tests/system/rpz/Makefile.in +++ b/bin/tests/system/rpz/Makefile.in @@ -21,7 +21,7 @@ CDEFINES = CWARNINGS = DNSLIBS = -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in index 251b3c55ef..5244d67a56 100644 --- a/bin/tests/system/rsabigexponent/Makefile.in +++ b/bin/tests/system/rsabigexponent/Makefile.in @@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ TARGETS = bigkey@EXEEXT@ diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in index e95da42895..ac47a60165 100644 --- a/bin/tests/system/tkey/Makefile.in +++ b/bin/tests/system/tkey/Makefile.in @@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ +CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSDEPLIBS = ../../../../lib/dns/libdns.@A@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ TARGETS = keycreate@EXEEXT@ keydelete@EXEEXT@ diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in index f3127ed754..292156b521 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - ${BIND9_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${BIND9_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} -ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ @@ -32,8 +32,8 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ -LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@ -NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@ +LIBS = ${ISCLIBS} @LIBS@ +NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@ SUBDIRS = diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in index f6de035197..8be4497b98 100644 --- a/contrib/dlz/bin/dlzbdb/Makefile.in +++ b/contrib/dlz/bin/dlzbdb/Makefile.in @@ -21,7 +21,7 @@ CDEFINES = @CONTRIB_DLZ@ CWARNINGS = DLZLIBS = @DLZ_DRIVER_LIBS@ -ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DEPLIBS = ${ISCDEPLIBS} diff --git a/doc/arm/Bv9ARM.pdf b/doc/arm/Bv9ARM.pdf index 9a6f0b66fd8647127a8169744ba79ea5649b8623..bd8ded2f0591cac8e244590d9b25633ac6cc0493 100644 GIT binary patch delta 74 zcmbQ<=QOR)X~VMJ&C7SUFW=1w#7scU48$xz%nHP8K+F!r96-zo#9Tnk4a7V^%nQVP L+n4X=FE|YVh+id6 delta 76 zcmbQ%=QO>~X~VMJj0(-mcDDm*AZ7w$W*}w(Vpbq#17da{<^W<&Am##MZXo6XVqPHT L+rDf!f5B-0m~JIs diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in index 0ce63817eb..e81539393d 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in @@ -6,15 +6,15 @@ abs_srcdir = @abs_srcdir@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ CDEFINES = -DFUZZDIR=\"$(abs_srcdir)\" -ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../lib/isc/libisc.@A@ DNSLIBS = ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../lib/dns/libdns.@A@ -LIBS = @JSON_C_LIBS@ @LIBS@ +LIBS = @LIBS@ OBJS = main.@O@ SRCS = main.c dns_name_fromtext_target.c dns_rdata_fromwire_text.c diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in index 759417df9a..a4e95950c5 100644 --- a/lib/bind9/Makefile.in +++ b/lib/bind9/Makefile.in @@ -18,12 +18,12 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ NSLIBS = ../../lib/ns/libns.@A@ diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 0142658cc0..72af41e68f 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -27,14 +27,15 @@ VERSION=@BIND9_VERSION@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ CINCLUDES = -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \ - ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@ \ + ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ \ + ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} CDEFINES = @USE_GSSAPI@ ${USE_ISC_SPNEGO} CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 034cbe72bd..3fddd9c830 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -39,6 +38,10 @@ #include #include +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ + #ifdef HAVE_LIBXML2 #include #define ISC_XMLCHAR (const xmlChar *) @@ -1406,11 +1409,12 @@ error: } while(0) isc_result_t -dns_cache_renderjson(dns_cache_t *cache, json_object *cstats) { +dns_cache_renderjson(dns_cache_t *cache, void *cstats0) { isc_result_t result = ISC_R_SUCCESS; int indices[dns_cachestatscounter_max]; uint64_t values[dns_cachestatscounter_max]; json_object *obj; + json_object *cstats = (json_object *)cstats0; REQUIRE(VALID_CACHE(cache)); diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index dfcbabbff9..f8f25d16a3 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -44,7 +44,6 @@ #include -#include #include #include #include @@ -329,7 +328,7 @@ dns_cache_renderxml(dns_cache_t *cache, void *writer0); #ifdef HAVE_JSON_C isc_result_t -dns_cache_renderjson(dns_cache_t *cache, json_object *cstats); +dns_cache_renderjson(dns_cache_t *cache, void *cstats0); /* * Render cache statistics and status in JSON */ diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in index f2c0a115c4..6ff55d8f2c 100644 --- a/lib/dns/tests/Makefile.in +++ b/lib/dns/tests/Makefile.in @@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../libdns.@A@ -LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@ +LIBS = @LIBS@ @CMOCKA_LIBS@ OBJS = dnstest.@O@ SRCS = acl_test.c \ diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index e19ab69f36..f23a78e1a5 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -I./include -I${srcdir}/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in index c800afebd3..4bb7988762 100644 --- a/lib/irs/tests/Makefile.in +++ b/lib/irs/tests/Makefile.in @@ -15,19 +15,19 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ +CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\"" CFGLIBS = ../../isccfg/libisccfg.@A@ CFGDEPLIBS = ../../isccfg/libisccfg.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ IRSLIBS = ../libirs.@A@ IRSDEPLIBS = ../libirs.@A@ -LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@ +LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ OBJS = SRCS = resconf_test.c diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index 49e0854e1a..81bfc612b0 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -20,7 +20,8 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I${srcdir}/unix/include \ -I${srcdir}/pthreads/include \ -I./include \ - -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ \ + -I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ \ + ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} CDEFINES = CWARNINGS = @@ -77,7 +78,7 @@ SRCS = pk11.c pk11_result.c \ symtab.c task.c taskpool.c timer.c \ tm.c version.c -LIBS = @OPENSSL_LIBS@ @JSON_C_LIBS@ @LIBS@ +LIBS = @OPENSSL_LIBS@ @LIBS@ # Note: the order of SUBDIRS is important. # Attempt to disable parallel processing. diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index b431437742..a78f2c6d0b 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -25,7 +25,7 @@ HEADERS = aes.h app.h assertions.h atomic.h backtrace.h \ file.h formatcheck.h fsaccess.h fuzz.h \ hash.h heap.h hex.h hmac.h ht.h httpd.h \ interfaceiter.h iterated_hash.h \ - json.h lang.h lex.h lfsr.h lib.h likely.h list.h log.h \ + lang.h lex.h lfsr.h lib.h likely.h list.h log.h \ magic.h md.h mem.h meminfo.h mutexblock.h \ netaddr.h netscope.h nonce.h os.h parseint.h \ pool.h portset.h print.h queue.h quota.h \ diff --git a/lib/isc/include/isc/json.h b/lib/isc/include/isc/json.h deleted file mode 100644 index ee965d1722..0000000000 --- a/lib/isc/include/isc/json.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#ifndef ISC_JSON_H -#define ISC_JSON_H 1 - -#ifdef HAVE_JSON_C -/* - * This file is here mostly to make it easy to add additional json-c header - * files as needed across all the users of this file. Rather than place - * these json-c includes in each file, one include makes it easy to handle - * the ifdef as well as adding the ability to add additional functions - * which may be useful. - */ -#include -#include -#include -#include -#include -#include -#endif - -#define ISC_JSON_RENDERCONFIG 0x00000001 /* render config data */ -#define ISC_JSON_RENDERSTATS 0x00000002 /* render stats */ -#define ISC_JSON_RENDERALL 0x000000ff /* render everything */ - -#endif /* ISC_JSON_H */ diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 0fdd0f267f..75ba5a6505 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -474,7 +473,7 @@ isc_mem_renderxml(void *writer0); #ifdef HAVE_JSON_C isc_result_t -isc_mem_renderjson(json_object *memobj); +isc_mem_renderjson(void *memobj0); /*%< * Render all contexts' statistics and status in JSON. */ diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index b09a757f7a..a69222d253 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -1024,7 +1023,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0); #ifdef HAVE_JSON_C isc_result_t -isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats); +isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0); /*%< * Render internal statistics and other state into JSON format. */ diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h index 9e75638948..10e8948268 100644 --- a/lib/isc/include/isc/task.h +++ b/lib/isc/include/isc/task.h @@ -76,7 +76,6 @@ #include #include -#include #include #include #include @@ -767,7 +766,7 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr, void *writer0); #ifdef HAVE_JSON_C isc_result_t -isc_taskmgr_renderjson(isc_taskmgr_t *mgr, json_object *tasksobj); +isc_taskmgr_renderjson(isc_taskmgr_t *mgr, void *tasksobj0); #endif /* HAVE_JSON_C */ ISC_LANG_ENDDECLS diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 962ef4a4bc..214dab1f3a 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -37,6 +36,10 @@ #define ISC_XMLCHAR (const xmlChar *) #endif /* HAVE_LIBXML2 */ +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ + #include "mem_p.h" #define MCTXLOCK(m, l) if (((m)->flags & ISC_MEMFLAG_NOLOCK) == 0) LOCK(l) @@ -2317,12 +2320,13 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) { } isc_result_t -isc_mem_renderjson(json_object *memobj) { +isc_mem_renderjson(void *memobj0) { isc_result_t result = ISC_R_SUCCESS; isc__mem_t *ctx; summarystat_t summary; uint64_t lost; json_object *ctxarray, *obj; + json_object *memobj = (json_object *)memobj0; memset(&summary, 0, sizeof(summary)); RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); diff --git a/lib/isc/task.c b/lib/isc/task.c index da391e67af..000721fc16 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,10 @@ #define ISC_XMLCHAR (const xmlChar *) #endif /* HAVE_LIBXML2 */ +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ + #ifdef OPENSSL_LEAKS #include #endif @@ -1777,11 +1780,12 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, void *writer0) { } while(0) isc_result_t -isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, json_object *tasks) { +isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, void *tasks0) { isc_result_t result = ISC_R_SUCCESS; isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0; isc__task_t *task = NULL; json_object *obj = NULL, *array = NULL, *taskobj = NULL; + json_object *tasks = (json_object *)tasks0; LOCK(&mgr->lock); diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in index 83f5a40a16..2eaac11d2d 100644 --- a/lib/isc/tests/Makefile.in +++ b/lib/isc/tests/Makefile.in @@ -15,13 +15,13 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ +CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\"" -ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../libisc.@A@ -LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@ +LIBS = @LIBS@ @CMOCKA_LIBS@ OBJS = isctest.@O@ diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index f02a0109f7..905099b51b 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -15,7 +15,8 @@ CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../pthreads/include \ -I../include \ -I${srcdir}/../include \ - -I${srcdir}/.. @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ \ + -I${srcdir}/.. @OPENSSL_INCLUDES@ \ + ${JSON_C_CFLAGS} \ ${LIBXML2_CFLAGS} CDEFINES = diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 3befd28724..6eda418b9f 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -86,6 +85,10 @@ #include #endif +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ + #ifdef HAVE_LIBXML2 #include #define ISC_XMLCHAR (const xmlChar *) @@ -5516,7 +5519,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) { } while(0) isc_result_t -isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) { +isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) { isc_result_t result = ISC_R_SUCCESS; isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0; isc__socket_t *sock = NULL; @@ -5524,6 +5527,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) { isc_sockaddr_t addr; socklen_t len; json_object *obj, *array = json_object_new_array(); + json_object *stats = (json_object *)stats0; CHECKMEM(array); diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index b1e26c33d3..7cf2e0426f 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -68,6 +68,10 @@ #include +#ifdef HAVE_JSON_C +#include +#endif /* HAVE_JSON_C */ + #ifdef HAVE_LIBXML2 #include #define ISC_XMLCHAR (const xmlChar *) @@ -3747,13 +3751,14 @@ error: } while(0) isc_result_t -isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats) { +isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) { isc_result_t result = ISC_R_SUCCESS; isc_socket_t *sock = NULL; char peerbuf[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t addr; socklen_t len; json_object *obj, *array = json_object_new_array(); + json_object *stats = (json_object *)stats; CHECKMEM(array); diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 3ce1a2d26b..2419fdfca0 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -18,12 +18,12 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \ - ${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + ${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/isccc/tests/Makefile.in b/lib/isccc/tests/Makefile.in index 4519652cc8..582f298b82 100644 --- a/lib/isccc/tests/Makefile.in +++ b/lib/isccc/tests/Makefile.in @@ -19,10 +19,10 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ +CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ CDEFINES = -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ ISCCCLIBS = ../libisccc.@A@ ISCCCDEPLIBS = ../libisccc.@A@ diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index 8e573840ed..96e05e5b7d 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -17,12 +17,12 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @JSON_C_CFLAGS@ +CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} CDEFINES = CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/cfg/libisccfg.@A@ diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in index c8a55a5969..0628e25f23 100644 --- a/lib/isccfg/tests/Makefile.in +++ b/lib/isccfg/tests/Makefile.in @@ -17,17 +17,17 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -Iinclude \ ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ ISCCFGLIBS = ../libisccfg.@A@ ISCCFGDEPLIBS = ../libisccfg.@A@ -LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@ +LIBS = @LIBS@ @CMOCKA_LIBS@ OBJS = SRCS = parser_test.c diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in index 8230b9ffd1..c9af0ed2e1 100644 --- a/lib/ns/Makefile.in +++ b/lib/ns/Makefile.in @@ -26,13 +26,13 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \ ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ CDEFINES = -DNAMED_PLUGINDIR=\"${plugindir}\" CWARNINGS = -ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../lib/isc/libisc.@A@ diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in index f48414d28e..476db578e9 100644 --- a/lib/ns/tests/Makefile.in +++ b/lib/ns/tests/Makefile.in @@ -16,17 +16,17 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ - @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@ + @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\" -ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../../dns/libdns.@A@ NSLIBS = ../libns.@A@ NSDEPLIBS = ../libns.@A@ -LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@ +LIBS = @LIBS@ @CMOCKA_LIBS@ OBJS = nstest.@O@ diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in index f39bfedb63..e6e2b216e1 100644 --- a/lib/samples/Makefile.in +++ b/lib/samples/Makefile.in @@ -18,13 +18,13 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I${srcdir}/include -I../dns/include \ ${DNS_INCLUDES} ${ISC_INCLUDES} \ -I${top_srcdir}/lib/irs/include \ - -I../../lib/irs/include @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@ + -I../../lib/irs/include @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" \ -DSYSCONFDIR=\"${sysconfdir}\" CWARNINGS = -ISCLIBS = ../isc/libisc.@A@ @OPENSSL_LIBS@ ${LIBXML2_LIBS} +ISCLIBS = ../isc/libisc.@A@ @OPENSSL_LIBS@ ${JSON_C_LIBS} ${LIBXML2_LIBS} DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../isccfg/libisccfg.@A@ IRSLIBS = ../irs/libirs.@A@ @@ -36,7 +36,7 @@ IRSDEPLIBS = ../irs/libirs.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS} -LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @JSON_C_LIBS@ +LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ SUBDIRS = diff --git a/make/rules.in b/make/rules.in index 2347c86089..4469a34633 100644 --- a/make/rules.in +++ b/make/rules.in @@ -120,6 +120,9 @@ LFS_CFLAGS = @LFS_CFLAGS@ LFS_LDFLAGS = @LFS_LDFLAGS@ LFS_LIBS = @LFS_LIBS@ +JSON_C_CFLAGS = @JSON_C_CFLAGS@ +JSON_C_LIBS = @JSON_C_LIBS@ + LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ LIBXML2_LIBS = @LIBXML2_LIBS@ diff --git a/util/copyrights b/util/copyrights index 6b46406881..efab14d0a6 100644 --- a/util/copyrights +++ b/util/copyrights @@ -2181,7 +2181,6 @@ ./lib/isc/include/isc/httpd.h C 2006,2007,2008,2014,2016,2018,2019 ./lib/isc/include/isc/interfaceiter.h C 1999,2000,2001,2004,2005,2006,2007,2016,2018,2019 ./lib/isc/include/isc/iterated_hash.h C 2008,2014,2016,2018,2019 -./lib/isc/include/isc/json.h C 2013,2015,2016,2018,2019 ./lib/isc/include/isc/lang.h C 1999,2000,2001,2004,2005,2006,2007,2016,2018,2019 ./lib/isc/include/isc/lex.h C 1998,1999,2000,2001,2002,2004,2005,2007,2008,2015,2016,2017,2018,2019 ./lib/isc/include/isc/lfsr.h C 1999,2000,2001,2004,2005,2006,2007,2016,2018,2019