diff --git a/CHANGES b/CHANGES index 28d75d62e6..33b2de8bb9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6111. [cleanup] Move irs_resconf into libdns, and remove the + now empty libirs. [GL !7463] + 6110. [cleanup] Refactor the dns_xfrin module to use dns_dispatch to set up TCP connections and send and receive messages. [GL #3886] diff --git a/Makefile.top b/Makefile.top index 93047dc313..ffb63289a7 100644 --- a/Makefile.top +++ b/Makefile.top @@ -40,12 +40,6 @@ LIBNS_CFLAGS = \ LIBNS_LIBS = \ $(top_builddir)/lib/ns/libns.la -LIBIRS_CFLAGS = \ - -I$(top_srcdir)/lib/irs/include - -LIBIRS_LIBS = \ - $(top_builddir)/lib/irs/libirs.la - LIBISCCFG_CFLAGS = \ -I$(top_srcdir)/lib/isccfg/include diff --git a/bin/delv/Makefile.am b/bin/delv/Makefile.am index 54050232bf..df4661f6e9 100644 --- a/bin/delv/Makefile.am +++ b/bin/delv/Makefile.am @@ -4,8 +4,7 @@ AM_CPPFLAGS += \ -I$(top_builddir)/include \ $(LIBISC_CFLAGS) \ $(LIBDNS_CFLAGS) \ - $(LIBISCCFG_CFLAGS) \ - $(LIBIRS_CFLAGS) + $(LIBISCCFG_CFLAGS) AM_CPPFLAGS += \ -DSYSCONFDIR=\"${sysconfdir}\" @@ -14,8 +13,8 @@ bin_PROGRAMS = delv delv_SOURCES = \ delv.c + delv_LDADD = \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ - $(LIBISCCFG_LIBS) \ - $(LIBIRS_LIBS) + $(LIBISCCFG_LIBS) diff --git a/bin/dig/Makefile.am b/bin/dig/Makefile.am index a14e418e45..685829f75c 100644 --- a/bin/dig/Makefile.am +++ b/bin/dig/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ $(LIBDNS_CFLAGS) \ $(LIBISCCFG_CFLAGS) \ - $(LIBIRS_CFLAGS) \ $(LIBIDN2_CFLAGS) \ $(LIBUV_CFLAGS) @@ -13,7 +12,6 @@ LDADD += \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ $(LIBISCCFG_LIBS) \ - $(LIBIRS_LIBS) \ $(LIBIDN2_LIBS) noinst_LTLIBRARIES = libdighost.la diff --git a/bin/nsupdate/Makefile.am b/bin/nsupdate/Makefile.am index f76efed6f6..4ef15ed799 100644 --- a/bin/nsupdate/Makefile.am +++ b/bin/nsupdate/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ $(LIBDNS_CFLAGS) \ $(LIBISCCFG_CFLAGS) \ - $(LIBIRS_CFLAGS) \ $(GSSAPI_CFLAGS) \ $(KRB5_CFLAGS) \ $(READLINE_CFLAGS) @@ -16,7 +15,6 @@ LDADD += \ $(LIBISC_LIBS) \ $(LIBDNS_LIBS) \ $(LIBISCCFG_LIBS) \ - $(LIBIRS_LIBS) \ $(GSSAPI_LIBS) \ $(KRB5_LIBS) diff --git a/configure.ac b/configure.ac index 2fb9541514..ca6c6974b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1558,7 +1558,6 @@ AC_CONFIG_FILES([lib/Makefile lib/isc/Makefile lib/dns/Makefile lib/ns/Makefile - lib/irs/Makefile lib/isccfg/Makefile lib/isccc/Makefile]) diff --git a/doc/dev/dev.md b/doc/dev/dev.md index a6f5aefedc..adbb40dcd0 100644 --- a/doc/dev/dev.md +++ b/doc/dev/dev.md @@ -272,8 +272,6 @@ libraries. configuration parser and checker. * `bind9/lib/isccc`: library implementing the control channel used by `rndc` - * `bind9/lib/irs`: provides mechanisms for reading `/etc/resolv.conf` - and other configuration files. #### Namespace diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index b504c3aa78..af1d4162d2 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -33,6 +33,10 @@ Removed Features moved to the ``libisc`` and ``libisccfg`` libraries, and the now-empty ``libbind9`` has been removed and is no longer installed. +- The ``irs_resconf`` module has been moved to the ``libdns`` shared + library and the now-empty ``libirs`` library has been removed and is + no longer installed. + Feature Changes ~~~~~~~~~~~~~~~ diff --git a/lib/Makefile.am b/lib/Makefile.am index 3f3b451d1d..62caeeefec 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,3 +1,3 @@ include $(top_srcdir)/Makefile.top -SUBDIRS = isc dns isccc ns isccfg irs +SUBDIRS = isc dns isccc ns isccfg diff --git a/lib/dns/Makefile.am b/lib/dns/Makefile.am index 41ba474af5..2539ad5517 100644 --- a/lib/dns/Makefile.am +++ b/lib/dns/Makefile.am @@ -142,9 +142,14 @@ dst_HEADERS = \ include/dst/dst.h \ include/dst/gssapi.h +irsdir = $(includedir)/irs +irs_HEADERS = \ + include/irs/resconf.h + libdns_la_SOURCES = \ $(libdns_la_HEADERS) \ $(dst_HEADERS) \ + $(irs_HEADERS) \ acl.c \ adb.c \ badcache.c \ @@ -212,6 +217,7 @@ libdns_la_SOURCES = \ rdataslab.c \ remote.c \ request.c \ + resconf.c \ resolver.c \ result.c \ rootns.c \ diff --git a/lib/irs/include/irs/resconf.h b/lib/dns/include/irs/resconf.h similarity index 100% rename from lib/irs/include/irs/resconf.h rename to lib/dns/include/irs/resconf.h diff --git a/lib/irs/resconf.c b/lib/dns/resconf.c similarity index 99% rename from lib/irs/resconf.c rename to lib/dns/resconf.c index 915abfee44..17163405e0 100644 --- a/lib/irs/resconf.c +++ b/lib/dns/resconf.c @@ -96,13 +96,11 @@ struct irs_resconf { isc_mem_t *mctx; isc_sockaddrlist_t nameservers; - unsigned int numns; /*%< number of configured servers - * */ + unsigned int numns; /*%< number of configured servers */ char *domainname; char *search[RESCONFMAXSEARCH]; - uint8_t searchnxt; /*%< index for next free slot - * */ + uint8_t searchnxt; /*%< index for next free slot */ irs_resconf_searchlist_t searchlist; diff --git a/lib/irs/Makefile.am b/lib/irs/Makefile.am deleted file mode 100644 index 85c4065af3..0000000000 --- a/lib/irs/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -include $(top_srcdir)/Makefile.top - -lib_LTLIBRARIES = libirs.la - -libirs_ladir = $(includedir)/irs -libirs_la_HEADERS = \ - include/irs/resconf.h - -libirs_la_SOURCES = \ - $(libirs_la_HEADERS) \ - resconf.c - -libirs_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(LIBISC_CFLAGS) \ - $(LIBDNS_CFLAGS) \ - $(LIBISCCFG_CFLAGS) \ - $(LIBIRS_CFLAGS) - -libirs_la_LIBADD = \ - $(LIBISC_LIBS) \ - $(LIBDNS_LIBS) \ - $(LIBISCCFG_LIBS) - -libirs_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -release "$(PACKAGE_VERSION)" diff --git a/lib/irs/include/.clang-format b/lib/irs/include/.clang-format deleted file mode 120000 index 0e62f72bcf..0000000000 --- a/lib/irs/include/.clang-format +++ /dev/null @@ -1 +0,0 @@ -../../../.clang-format.headers \ No newline at end of file diff --git a/lib/irs/tests b/lib/irs/tests deleted file mode 120000 index 247a63e1e5..0000000000 --- a/lib/irs/tests +++ /dev/null @@ -1 +0,0 @@ -../../tests/irs \ No newline at end of file diff --git a/tests/irs/Makefile.am b/tests/irs/Makefile.am index 8e6e52f6fb..5bf08463df 100644 --- a/tests/irs/Makefile.am +++ b/tests/irs/Makefile.am @@ -2,11 +2,11 @@ include $(top_srcdir)/Makefile.top AM_CPPFLAGS += \ $(LIBISC_CFLAGS) \ - $(LIBIRS_CFLAGS) + $(LIBDNS_CFLAGS) LDADD += \ $(LIBISC_LIBS) \ - $(LIBIRS_LIBS) + $(LIBDNS_LIBS) check_PROGRAMS = \ resconf_test