From ff772255124a291060db558697450d1ca89cbe95 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 4 Aug 2003 04:23:56 +0000 Subject: [PATCH] pullup: Move configuration checking to libbind9. --- bin/check/Makefile.in | 13 +- bin/check/named-checkconf.c | 7 +- bin/dig/Makefile.in | 4 +- bin/dnssec/Makefile.in | 4 +- bin/named/Makefile.in | 14 +- bin/named/controlconf.c | 7 +- bin/named/server.c | 7 +- bin/named/unix/Makefile.in | 4 +- bin/nsupdate/Makefile.in | 4 +- bin/rndc/Makefile.in | 4 +- bin/rndc/unix/Makefile.in | 4 +- bin/tests/Makefile.in | 4 +- bin/tests/db/Makefile.in | 4 +- bin/tests/dst/Makefile.in | 4 +- bin/tests/master/Makefile.in | 4 +- bin/tests/mem/Makefile.in | 4 +- bin/tests/names/Makefile.in | 4 +- bin/tests/net/Makefile.in | 4 +- bin/tests/rbt/Makefile.in | 4 +- bin/tests/sockaddr/Makefile.in | 4 +- bin/tests/system/Makefile.in | 4 +- bin/tests/system/lwresd/Makefile.in | 4 +- bin/tests/system/tkey/Makefile.in | 4 +- bin/tests/tasks/Makefile.in | 4 +- bin/tests/timers/Makefile.in | 4 +- configure.in | 15 +- lib/Makefile.in | 4 +- lib/bind/Makefile.in | 3 +- lib/bind9/Makefile.in | 6 +- lib/bind9/check.c | 505 ++------------------- lib/bind9/include/Makefile.in | 2 +- lib/bind9/include/bind9/Makefile.in | 8 +- lib/bind9/include/bind9/check.h | 4 +- lib/bind9/version.c | 14 +- lib/dns/Makefile.in | 4 +- lib/dns/sec/dst/Makefile.in | 4 +- lib/isccc/Makefile.in | 4 +- lib/isccfg/Makefile.in | 8 +- lib/isccfg/check.c | 652 ---------------------------- lib/isccfg/include/isccfg/check.h | 54 --- lib/lwres/Makefile.in | 4 +- lib/tests/Makefile.in | 4 +- make/includes.in | 5 +- 43 files changed, 161 insertions(+), 1267 deletions(-) delete mode 100644 lib/isccfg/check.c delete mode 100644 lib/isccfg/include/isccfg/check.h diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index e17404054c..b56daf4620 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.15.2.3 2002/02/12 06:05:50 marka Exp $ +# $Id: Makefile.in,v 1.15.2.3.8.1 2003/08/04 04:20:06 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,9 +21,10 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_INCLUDES} ${ISCCFG_INCLUDES} ${ISC_INCLUDES} +CINCLUDES = ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \ + ${ISC_INCLUDES} CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" CWARNINGS = @@ -31,10 +32,12 @@ CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ +BIND9LIBS = ../../lib/bind9/libbind9.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ +BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ LIBS = @LIBS@ @@ -63,9 +66,9 @@ named-checkzone.@O@: named-checkzone.c -c ${srcdir}/named-checkzone.c named-checkconf: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \ - ${ISCCFGDEPLIBS} ${DNSDEPLIBS} + ${ISCCFGDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ \ - check-tool.@O@ ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS} + check-tool.@O@ ${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS} named-checkzone: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ \ diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index 653dc28e1c..6ad5f148f0 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.12.12.1 2003/08/01 07:09:50 marka Exp $ */ +/* $Id: named-checkconf.c,v 1.12.12.2 2003/08/04 04:20:06 marka Exp $ */ #include @@ -32,7 +32,8 @@ #include #include -#include + +#include #include #include @@ -250,7 +251,7 @@ main(int argc, char **argv) { ISC_R_SUCCESS) exit(1); - result = cfg_check_namedconf(config, logc, mctx); + result = bind9_check_namedconf(config, logc, mctx); if (result != ISC_R_SUCCESS) exit_status = 1; diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index ab3cb86dba..be4801f44c 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.25 2001/06/08 17:18:06 gson Exp $ +# $Id: Makefile.in,v 1.25.12.1 2003/08/04 04:20:07 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 876e4022b3..081de8936a 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.19 2001/06/01 00:44:58 bwelling Exp $ +# $Id: Makefile.in,v 1.19.12.1 2003/08/04 04:20:07 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 07769d595a..452992cec0 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.74 2001/06/01 00:45:00 bwelling Exp $ +# $Id: Makefile.in,v 1.74.12.1 2003/08/04 04:20:07 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ # # Add database drivers here. @@ -32,7 +32,7 @@ DBDRIVER_INCLUDES = DBDRIVER_LIBS = CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ - ${LWRES_INCLUDES} ${DNS_INCLUDES} \ + ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DBDRIVER_INCLUDES} @@ -44,17 +44,19 @@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCLIBS = ../../lib/isc/libisc.@A@ LWRESLIBS = ../../lib/lwres/liblwres.@A@ +BIND9LIBS = ../../lib/bind9/libbind9.@A@ DNSDEPLIBS = ../../lib/dns/libdns.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCDEPLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ +BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ -DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} \ +DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS} -LIBS = ${LWRESLIBS} ${DNSLIBS} \ +LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@ SUBDIRS = unix @@ -112,7 +114,7 @@ docclean manclean maintainer-clean:: rm -f ${MANOBJS} clean distclean maintainer-clean:: - rm -f ${TARGETS} + rm -f ${TARGETS} ${OBJS} installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 3fff2699f3..2cb402d786 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.28.2.9 2003/07/22 04:03:33 marka Exp $ */ +/* $Id: controlconf.c,v 1.28.2.9.2.1 2003/08/04 04:20:08 marka Exp $ */ #include @@ -37,7 +37,8 @@ #include #include -#include + +#include #include #include @@ -835,7 +836,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { if (keyid->keyname == NULL) CHECK(ISC_R_NOMEMORY); - CHECK(cfg_check_key(key, ns_g_lctx)); + CHECK(bind9_check_key(key, ns_g_lctx)); (void)cfg_map_get(key, "algorithm", &algobj); (void)cfg_map_get(key, "secret", &secretobj); diff --git a/bin/named/server.c b/bin/named/server.c index 28e10e29a0..76a9ed0746 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.339.2.15.2.2 2003/08/04 02:04:45 marka Exp $ */ +/* $Id: server.c,v 1.339.2.15.2.3 2003/08/04 04:20:08 marka Exp $ */ #include @@ -37,7 +37,8 @@ #include #include -#include + +#include #include #include @@ -1707,7 +1708,7 @@ load_configuration(const char *filename, ns_server_t *server, /* * Check the validity of the configuration. */ - CHECK(cfg_check_namedconf(config, ns_g_lctx, ns_g_mctx)); + CHECK(bind9_check_namedconf(config, ns_g_lctx, ns_g_mctx)); /* * Fill in the maps array, used for resolving defaults. diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in index ad26f16d35..9f7253c667 100644 --- a/bin/named/unix/Makefile.in +++ b/bin/named/unix/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.6 2001/01/09 21:40:37 bwelling Exp $ +# $Id: Makefile.in,v 1.6.12.1 2003/08/04 04:20:09 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 31c09413b4..7475523926 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.15 2001/06/01 00:45:01 bwelling Exp $ +# $Id: Makefile.in,v 1.15.12.1 2003/08/04 04:20:09 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${LWRES_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index 645e44a52c..1f45c0cb39 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.32.2.3 2002/02/12 12:02:03 marka Exp $ +# $Id: Makefile.in,v 1.32.2.3.8.1 2003/08/04 04:20:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \ ${ISCCFG_INCLUDES} ${DNS_INCLUDES} diff --git a/bin/rndc/unix/Makefile.in b/bin/rndc/unix/Makefile.in index e8583fe475..78c1974540 100644 --- a/bin/rndc/unix/Makefile.in +++ b/bin/rndc/unix/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.1 2001/08/03 05:56:22 marka Exp $ +# $Id: Makefile.in,v 1.1.12.1 2003/08/04 04:20:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 53a70361d8..8272c12206 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.113.2.1 2002/02/12 12:02:05 marka Exp $ +# $Id: Makefile.in,v 1.113.2.1.8.1 2003/08/04 04:20:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ ${LWRES_INCLUDES} ${OMAPI_INCLUDES} diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in index 9323bad2b8..25a0147e50 100644 --- a/bin/tests/db/Makefile.in +++ b/bin/tests/db/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.21 2001/08/01 22:06:09 gson Exp $ +# $Id: Makefile.in,v 1.21.12.1 2003/08/04 04:20:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in index 3edbf3c712..e61da43c62 100644 --- a/bin/tests/dst/Makefile.in +++ b/bin/tests/dst/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.30 2001/08/01 22:06:10 gson Exp $ +# $Id: Makefile.in,v 1.30.12.1 2003/08/04 04:20:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in index ad95472e47..875855efb7 100644 --- a/bin/tests/master/Makefile.in +++ b/bin/tests/master/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.20 2001/08/01 22:06:12 gson Exp $ +# $Id: Makefile.in,v 1.20.12.1 2003/08/04 04:20:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in index 349c8fbb35..1487dd121a 100644 --- a/bin/tests/mem/Makefile.in +++ b/bin/tests/mem/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.25 2001/08/01 22:06:13 gson Exp $ +# $Id: Makefile.in,v 1.25.12.1 2003/08/04 04:20:12 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in index 6778f24faf..43ac626f43 100644 --- a/bin/tests/names/Makefile.in +++ b/bin/tests/names/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.20 2001/08/01 22:06:14 gson Exp $ +# $Id: Makefile.in,v 1.20.12.1 2003/08/04 04:20:13 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in index f15588127f..96e295294a 100644 --- a/bin/tests/net/Makefile.in +++ b/bin/tests/net/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.9 2001/08/01 22:06:16 gson Exp $ +# $Id: Makefile.in,v 1.9.12.1 2003/08/04 04:20:13 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in index b53815bba1..59024eb513 100644 --- a/bin/tests/rbt/Makefile.in +++ b/bin/tests/rbt/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.20 2001/08/01 22:06:17 gson Exp $ +# $Id: Makefile.in,v 1.20.12.1 2003/08/04 04:20:14 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in index fea6ecc71d..73d4186ebe 100644 --- a/bin/tests/sockaddr/Makefile.in +++ b/bin/tests/sockaddr/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.14 2001/08/01 22:06:18 gson Exp $ +# $Id: Makefile.in,v 1.14.12.1 2003/08/04 04:20:14 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 6e90332063..71f15337d6 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.24 2001/01/11 20:45:49 bwelling Exp $ +# $Id: Makefile.in,v 1.24.12.1 2003/08/04 04:20:14 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ SUBDIRS = lwresd tkey TARGETS = diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in index 77771c41a7..7425ffcaae 100644 --- a/bin/tests/system/lwresd/Makefile.in +++ b/bin/tests/system/lwresd/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12 2001/08/01 22:16:06 gson Exp $ +# $Id: Makefile.in,v 1.12.12.1 2003/08/04 04:20:15 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${LWRES_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in index a43fc4fdee..6c25424bf7 100644 --- a/bin/tests/system/tkey/Makefile.in +++ b/bin/tests/system/tkey/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.3 2001/02/02 01:01:22 sjacob Exp $ +# $Id: Makefile.in,v 1.3.12.1 2003/08/04 04:20:15 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in index e6d3301ca6..2c80c07002 100644 --- a/bin/tests/tasks/Makefile.in +++ b/bin/tests/tasks/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.23 2001/08/01 22:06:20 gson Exp $ +# $Id: Makefile.in,v 1.23.12.1 2003/08/04 04:20:16 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${ISC_INCLUDES} diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in index 97b2c8b8c5..caf29cf9ca 100644 --- a/bin/tests/timers/Makefile.in +++ b/bin/tests/timers/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.21 2001/08/01 22:06:22 gson Exp $ +# $Id: Makefile.in,v 1.21.12.1 2003/08/04 04:20:16 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${TEST_INCLUDES} ${ISC_INCLUDES} diff --git a/configure.in b/configure.in index 3312df846d..e1c44fdfd4 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.294.2.23.2.1 $) +AC_REVISION($Revision: 1.294.2.23.2.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -1740,22 +1740,25 @@ AC_SUBST(BIND9_ISCCC_BUILDINCLUDE) AC_SUBST(BIND9_ISCCFG_BUILDINCLUDE) AC_SUBST(BIND9_DNS_BUILDINCLUDE) AC_SUBST(BIND9_LWRES_BUILDINCLUDE) +AC_SUBST(BIND9_BIND9_BUILDINCLUDE) if test "X$srcdir" != "X"; then BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include" BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include" BIND9_ISCCFG_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccfg/include" BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include" BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include" + BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include" else BIND9_ISC_BUILDINCLUDE="" BIND9_ISCCC_BUILDINCLUDE="" BIND9_ISCCFG_BUILDINCLUDE="" BIND9_DNS_BUILDINCLUDE="" BIND9_LWRES_BUILDINCLUDE="" + BIND9_BIND9_BUILDINCLUDE="" fi -AC_SUBST_FILE(BIND9_INCLUDES) -BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes +AC_SUBST_FILE(BIND9_MAKE_INCLUDES) +BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes AC_SUBST_FILE(BIND9_MAKE_RULES) BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules @@ -1776,6 +1779,9 @@ LIBISCCFG_API=$srcdir/lib/isccfg/api AC_SUBST_FILE(LIBDNS_API) LIBDNS_API=$srcdir/lib/dns/api +AC_SUBST_FILE(LIBBIND9_API) +LIBBIND9_API=$srcdir/lib/bind9/api + AC_SUBST_FILE(LIBLWRES_API) LIBLWRES_API=$srcdir/lib/lwres/api @@ -1810,6 +1816,9 @@ AC_OUTPUT( lib/dns/sec/dst/Makefile lib/dns/sec/dst/include/Makefile lib/dns/sec/dst/include/dst/Makefile + lib/bind9/Makefile + lib/bind9/include/Makefile + lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile diff --git a/lib/Makefile.in b/lib/Makefile.in index 6ff499d8bb..736abbb1cd 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.15.2.2 2002/02/12 06:05:52 marka Exp $ +# $Id: Makefile.in,v 1.15.2.2.8.1 2003/08/04 04:20:16 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ # Attempt to disable parallel processing. .NOTPARALLEL: .NO_PARALLEL: -SUBDIRS = isc isccc dns isccfg lwres tests +SUBDIRS = isc isccc dns bind9 isccfg lwres tests TARGETS = @BIND9_MAKE_RULES@ diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in index 2e1278b043..4cecf09585 100644 --- a/lib/bind/Makefile.in +++ b/lib/bind/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12.2.5 2003/07/22 04:03:40 marka Exp $ +# $Id: Makefile.in,v 1.12.2.5.2.1 2003/08/04 04:20:17 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -111,7 +111,6 @@ installdirs: install:: timestamp installdirs ${LIBTOOL} ${INSTALL_DATA} libbind.@A@ ${DESTDIR}${libdir} - clean distclean:: rm -f libbind.@SA@ libbind.la diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in index e255795e2d..f04b04a9b7 100644 --- a/lib/bind9/Makefile.in +++ b/lib/bind9/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2001/11/14 22:08:35 bwelling Exp $ +# $Id: Makefile.in,v 1.2.200.1 2003/08/04 04:23:55 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -36,10 +36,10 @@ LIBS = @LIBS@ SUBDIRS = include # Alphabetically -OBJS = check.@O@ getaddresses.@O@ version.@O@ +OBJS = check.@O@ version.@O@ # Alphabetically -SRCS = check.c getaddresses.c version.c +SRCS = check.c version.c TARGETS = timestamp diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 9e273e5096..92eecb8750 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002 Internet Software Consortium. + * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.c,v 1.37 2003/07/18 06:00:41 marka Exp $ */ +/* $Id: check.c,v 1.37.6.1 2003/08/04 04:23:55 marka Exp $ */ #include @@ -26,183 +26,19 @@ #include #include #include -#include #include #include #include #include +#include #include #include -#include #include #include -static isc_result_t -check_orderent(cfg_obj_t *ent, isc_log_t *logctx) { - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - isc_textregion_t r; - dns_fixedname_t fixed; - cfg_obj_t *obj; - dns_rdataclass_t rdclass; - dns_rdatatype_t rdtype; - isc_buffer_t b; - const char *str; - - dns_fixedname_init(&fixed); - obj = cfg_tuple_get(ent, "class"); - if (cfg_obj_isstring(obj)) { - - DE_CONST(cfg_obj_asstring(obj), r.base); - r.length = strlen(r.base); - tresult = dns_rdataclass_fromtext(&rdclass, &r); - if (tresult != ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "rrset-order: invalid class '%s'", - r.base); - result = ISC_R_FAILURE; - } - } - - obj = cfg_tuple_get(ent, "type"); - if (cfg_obj_isstring(obj)) { - - DE_CONST(cfg_obj_asstring(obj), r.base); - r.length = strlen(r.base); - tresult = dns_rdatatype_fromtext(&rdtype, &r); - if (tresult != ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "rrset-order: invalid type '%s'", - r.base); - result = ISC_R_FAILURE; - } - } - - obj = cfg_tuple_get(ent, "name"); - if (cfg_obj_isstring(obj)) { - str = cfg_obj_asstring(obj); - isc_buffer_init(&b, str, strlen(str)); - isc_buffer_add(&b, strlen(str)); - tresult = dns_name_fromtext(dns_fixedname_name(&fixed), &b, - dns_rootname, ISC_FALSE, NULL); - if (tresult != ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "rrset-order: invalid name '%s'", str); - result = ISC_R_FAILURE; - } - } - - obj = cfg_tuple_get(ent, "order"); - if (!cfg_obj_isstring(obj) || - strcasecmp("order", cfg_obj_asstring(obj)) != 0) { - cfg_obj_log(ent, logctx, ISC_LOG_ERROR, - "rrset-order: keyword 'order' missing"); - result = ISC_R_FAILURE; - } - - obj = cfg_tuple_get(ent, "ordering"); - if (!cfg_obj_isstring(obj)) { - cfg_obj_log(ent, logctx, ISC_LOG_ERROR, - "rrset-order: missing ordering"); - result = ISC_R_FAILURE; - } else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) { - cfg_obj_log(obj, logctx, ISC_LOG_WARNING, - "rrset-order: order 'fixed' not implemented"); - } else if (/* strcasecmp(cfg_obj_asstring(obj), "fixed") != 0 && */ - strcasecmp(cfg_obj_asstring(obj), "random") != 0 && - strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "rrset-order: invalid order '%s'", - cfg_obj_asstring(obj)); - result = ISC_R_FAILURE; - } - return (result); -} - -static isc_result_t -check_order(cfg_obj_t *options, isc_log_t *logctx) { - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - cfg_listelt_t *element; - cfg_obj_t *obj = NULL; - - if (cfg_map_get(options, "rrset-order", &obj) != ISC_R_SUCCESS) - return (result); - - for (element = cfg_list_first(obj); - element != NULL; - element = cfg_list_next(element)) - { - tresult = check_orderent(cfg_listelt_value(element), logctx); - if (tresult != ISC_R_SUCCESS) - result = tresult; - } - return (result); -} - -static isc_result_t -check_dual_stack(cfg_obj_t *options, isc_log_t *logctx) { - cfg_listelt_t *element; - cfg_obj_t *alternates = NULL; - cfg_obj_t *value; - cfg_obj_t *obj; - char *str; - dns_fixedname_t fixed; - dns_name_t *name; - isc_buffer_t buffer; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - - (void)cfg_map_get(options, "dual-stack-servers", &alternates); - - if (alternates == NULL) - return (ISC_R_SUCCESS); - - obj = cfg_tuple_get(alternates, "port"); - if (cfg_obj_isuint32(obj)) { - isc_uint32_t val = cfg_obj_asuint32(obj); - if (val > ISC_UINT16_MAX) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "port '%u' out of range", val); - result = ISC_R_FAILURE; - } - } - obj = cfg_tuple_get(alternates, "addresses"); - for (element = cfg_list_first(obj); - element != NULL; - element = cfg_list_next(element)) { - value = cfg_listelt_value(element); - if (cfg_obj_issockaddr(value)) - continue; - obj = cfg_tuple_get(value, "name"); - str = cfg_obj_asstring(obj); - isc_buffer_init(&buffer, str, strlen(str)); - isc_buffer_add(&buffer, strlen(str)); - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); - tresult = dns_name_fromtext(name, &buffer, dns_rootname, - ISC_FALSE, NULL); - if (tresult != ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "bad name '%s'", str); - result = ISC_R_FAILURE; - } - obj = cfg_tuple_get(value, "port"); - if (cfg_obj_isuint32(obj)) { - isc_uint32_t val = cfg_obj_asuint32(obj); - if (val > ISC_UINT16_MAX) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "port '%u' out of range", val); - result = ISC_R_FAILURE; - } - } - } - return (result); -} - static isc_result_t check_forward(cfg_obj_t *options, isc_log_t *logctx) { cfg_obj_t *forward = NULL; @@ -222,25 +58,24 @@ check_forward(cfg_obj_t *options, isc_log_t *logctx) { typedef struct { const char *name; unsigned int scale; - unsigned int max; } intervaltable; static isc_result_t check_options(cfg_obj_t *options, isc_log_t *logctx) { isc_result_t result = ISC_R_SUCCESS; unsigned int i; - cfg_obj_t *obj = NULL; + dns_rdataclass_t zclass; static intervaltable intervals[] = { - { "cleaning-interval", 60, 28 * 24 * 60 }, /* 28 days */ - { "heartbeat-interval", 60, 28 * 24 * 60 }, /* 28 days */ - { "interface-interval", 60, 28 * 24 * 60 }, /* 28 days */ - { "max-transfer-idle-in", 60, 28 * 24 * 60 }, /* 28 days */ - { "max-transfer-idle-out", 60, 28 * 24 * 60 }, /* 28 days */ - { "max-transfer-time-in", 60, 28 * 24 * 60 }, /* 28 days */ - { "max-transfer-time-out", 60, 28 * 24 * 60 }, /* 28 days */ - { "sig-validity-interval", 86400, 10 * 366 }, /* 10 years */ - { "statistics-interval", 60, 28 * 24 * 60 }, /* 28 days */ + { "cleaning-interval", 60 }, + { "heartbeat-interval", 60 }, + { "interface-interval", 60 }, + { "max-transfer-idle-in", 60 }, + { "max-transfer-idle-out", 60 }, + { "max-transfer-time-in", 60 }, + { "max-transfer-time-out", 60 }, + { "sig-validity-interval", 86400}, + { "statistics-interval", 60 }, }; /* @@ -249,156 +84,18 @@ check_options(cfg_obj_t *options, isc_log_t *logctx) { */ for (i = 0; i < sizeof(intervals) / sizeof(intervals[0]); i++) { isc_uint32_t val; - obj = NULL; + cfg_obj_t *obj = NULL; (void)cfg_map_get(options, intervals[i].name, &obj); if (obj == NULL) continue; val = cfg_obj_asuint32(obj); - if (val > intervals[i].max) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "%s '%u' is out of range (0..%u)", - intervals[i].name, val, - intervals[i].max); - result = ISC_R_RANGE; - } else if (val > (ISC_UINT32_MAX / intervals[i].scale)) { + if (val > (ISC_UINT32_MAX / intervals[i].scale)) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "%s '%d' is out of range", intervals[i].name, val); result = ISC_R_RANGE; } } - obj = NULL; - (void)cfg_map_get(options, "preferred-glue", &obj); - if (obj != NULL) { - const char *str; - str = cfg_obj_asstring(obj); - if (strcasecmp(str, "a") != 0 && - strcasecmp(str, "aaaa") != 0 && - strcasecmp(str, "none") != 0) - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "preferred-glue unexpected value '%s'", - str); - } - return (result); -} - -static isc_result_t -get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) { - isc_result_t result; - cfg_obj_t *masters = NULL; - cfg_listelt_t *elt; - - result = cfg_map_get(cctx, "masters", &masters); - if (result != ISC_R_SUCCESS) - return (result); - for (elt = cfg_list_first(masters); - elt != NULL; - elt = cfg_list_next(elt)) { - cfg_obj_t *list; - const char *listname; - - list = cfg_listelt_value(elt); - listname = cfg_obj_asstring(cfg_tuple_get(list, "name")); - - if (strcasecmp(listname, name) == 0) { - *ret = list; - return (ISC_R_SUCCESS); - } - } - return (ISC_R_NOTFOUND); -} - -static isc_result_t -validate_masters(cfg_obj_t *obj, cfg_obj_t *config, isc_uint32_t *countp, - isc_log_t *logctx, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - isc_uint32_t count = 0; - isc_symtab_t *symtab = NULL; - isc_symvalue_t symvalue; - cfg_listelt_t *element; - cfg_listelt_t **stack = NULL; - isc_uint32_t stackcount = 0, pushed = 0; - cfg_obj_t *list; - - REQUIRE(countp != NULL); - result = isc_symtab_create(mctx, 100, NULL, NULL, ISC_FALSE, &symtab); - if (result != ISC_R_SUCCESS) - return (result); - - newlist: - list = cfg_tuple_get(obj, "addresses"); - element = cfg_list_first(list); - resume: - for ( ; - element != NULL; - element = cfg_list_next(element)) - { - char *listname; - cfg_obj_t *addr; - cfg_obj_t *key; - - addr = cfg_tuple_get(cfg_listelt_value(element), - "masterselement"); - key = cfg_tuple_get(cfg_listelt_value(element), "key"); - - if (cfg_obj_issockaddr(addr)) { - count++; - continue; - } - if (!cfg_obj_isvoid(key)) { - cfg_obj_log(key, logctx, ISC_LOG_ERROR, - "unexpected token '%s'", - cfg_obj_asstring(key)); - if (result == ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - listname = cfg_obj_asstring(addr); - symvalue.as_pointer = addr; - tresult = isc_symtab_define(symtab, listname, 1, symvalue, - isc_symexists_reject); - if (tresult == ISC_R_EXISTS) - continue; - tresult = get_masters_def(config, listname, &obj); - if (tresult != ISC_R_SUCCESS) { - if (result == ISC_R_SUCCESS) - result = tresult; - cfg_obj_log(addr, logctx, ISC_LOG_ERROR, - "unable to find masters list '%s'", - listname); - continue; - } - /* Grow stack? */ - if (stackcount == pushed) { - void * new; - isc_uint32_t newlen = stackcount + 16; - size_t newsize, oldsize; - - newsize = newlen * sizeof(*stack); - oldsize = stackcount * sizeof(*stack); - new = isc_mem_get(mctx, newsize); - if (new == NULL) - goto cleanup; - if (stackcount != 0) { - memcpy(new, stack, oldsize); - isc_mem_put(mctx, stack, oldsize); - } - stack = new; - stackcount = newlen; - } - stack[pushed++] = cfg_list_next(element); - goto newlist; - } - if (pushed != 0) { - element = stack[--pushed]; - goto resume; - } - cleanup: - if (stack != NULL) - isc_mem_put(mctx, stack, stackcount * sizeof(*stack)); - isc_symtab_destroy(&symtab); - *countp = count; return (result); } @@ -414,7 +111,7 @@ typedef struct { } optionstable; static isc_result_t -check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, +check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, dns_rdataclass_t defclass, isc_log_t *logctx, isc_mem_t *mctx) { const char *zname; @@ -422,13 +119,13 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, unsigned int ztype; cfg_obj_t *zoptions; cfg_obj_t *obj = NULL; + cfg_obj_t *addrlist = NULL; isc_symvalue_t symvalue; isc_result_t result = ISC_R_SUCCESS; isc_result_t tresult; unsigned int i; - dns_rdataclass_t zclass; - dns_fixedname_t fixedname; - isc_buffer_t b; + dns_fixedname_t fixedname; + isc_buffer_t b; static optionstable options[] = { { "allow-query", MASTERZONE | SLAVEZONE | STUBZONE }, @@ -464,7 +161,6 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, { "pubkey", MASTERZONE | SLAVEZONE | STUBZONE }, { "update-policy", MASTERZONE }, { "database", MASTERZONE | SLAVEZONE | STUBZONE }, - { "key-directory", MASTERZONE }, }; static optionstable dialups[] = { @@ -549,27 +245,14 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, key = isc_mem_strdup(mctx, namebuf); if (key == NULL) return (ISC_R_NOMEMORY); - symvalue.as_pointer = zconfig; + symvalue.as_pointer = NULL; tresult = isc_symtab_define(symtab, key, ztype == HINTZONE ? 1 : 2, symvalue, isc_symexists_reject); if (tresult == ISC_R_EXISTS) { - const char *file; - unsigned int line; - - RUNTIME_CHECK(isc_symtab_lookup(symtab, key, - ztype == HINTZONE ? 1 : 2, - &symvalue) == ISC_R_SUCCESS); isc_mem_free(mctx, key); - file = cfg_obj_file(symvalue.as_pointer); - line = cfg_obj_line(symvalue.as_pointer); - - if (file == NULL) - file = ""; cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, - "zone '%s': already exists " - "previous definition: %s:%u", - zname, file, line); + "zone '%s': already exists ", zname); result = ISC_R_FAILURE; } else if (tresult != ISC_R_SUCCESS) { isc_mem_strdup(mctx, key); @@ -612,12 +295,8 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, zname); result = ISC_R_FAILURE; } else { - isc_uint32_t count; - tresult = validate_masters(obj, config, &count, - logctx, mctx); - if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS) - result = tresult; - if (tresult == ISC_R_SUCCESS && count == 0) { + addrlist = cfg_tuple_get(obj, "addresses"); + if (cfg_list_first(addrlist) == NULL) { cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR, "zone '%s': empty 'masters' entry", zname); @@ -649,7 +328,7 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab, */ if (ztype == MASTERZONE || ztype == SLAVEZONE || ztype == STUBZONE) { cfg_obj_t *dialup = NULL; - (void)cfg_map_get(zoptions, "dialup", &dialup); + cfg_map_get(zoptions, "dialup", &dialup); if (dialup != NULL && cfg_obj_isstring(dialup)) { char *str = cfg_obj_asstring(dialup); for (i = 0; @@ -700,18 +379,18 @@ bind9_check_key(cfg_obj_t *key, isc_log_t *logctx) { cfg_obj_t *secretobj = NULL; const char *keyname = cfg_obj_asstring(cfg_map_getname(key)); - (void)cfg_map_get(key, "algorithm", &algobj); - (void)cfg_map_get(key, "secret", &secretobj); + cfg_map_get(key, "algorithm", &algobj); + cfg_map_get(key, "secret", &secretobj); if (secretobj == NULL || algobj == NULL) { cfg_obj_log(key, logctx, ISC_LOG_ERROR, "key '%s' must have both 'secret' and " "'algorithm' defined", keyname); - return (ISC_R_FAILURE); + return ISC_R_FAILURE; } - return (ISC_R_SUCCESS); + return ISC_R_SUCCESS; } - + static isc_result_t check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) { isc_result_t result = ISC_R_SUCCESS; @@ -726,24 +405,12 @@ check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) { const char *keyname = cfg_obj_asstring(cfg_map_getname(key)); isc_symvalue_t symvalue; - symvalue.as_pointer = key; + symvalue.as_pointer = NULL; tresult = isc_symtab_define(symtab, keyname, 1, symvalue, isc_symexists_reject); if (tresult == ISC_R_EXISTS) { - const char *file; - unsigned int line; - - RUNTIME_CHECK(isc_symtab_lookup(symtab, keyname, - 1, &symvalue) == ISC_R_SUCCESS); - file = cfg_obj_file(symvalue.as_pointer); - line = cfg_obj_line(symvalue.as_pointer); - - if (file == NULL) - file = ""; cfg_obj_log(key, logctx, ISC_LOG_ERROR, - "key '%s': already exists " - "previous definition: %s:%u", - keyname, file, line); + "key '%s': already exists ", keyname); result = tresult; } else if (tresult != ISC_R_SUCCESS) return (tresult); @@ -778,34 +445,27 @@ check_servers(cfg_obj_t *servers, isc_log_t *logctx) { v2 = cfg_listelt_value(e2); s2 = cfg_obj_assockaddr(cfg_map_getname(v2)); if (isc_sockaddr_eqaddr(s1, s2)) { - const char *file = cfg_obj_file(v1); - unsigned int line = cfg_obj_line(v1); isc_buffer_t target; char buf[128]; - if (file == NULL) - file = ""; - isc_netaddr_fromsockaddr(&na, s2); isc_buffer_init(&target, buf, sizeof(buf) - 1); - RUNTIME_CHECK(isc_netaddr_totext(&na, &target) - == ISC_R_SUCCESS); + INSIST(isc_netaddr_totext(&na, &target) + == ISC_R_SUCCESS); buf[isc_buffer_usedlength(&target)] = '\0'; cfg_obj_log(v2, logctx, ISC_LOG_ERROR, - "server '%s': already exists " - "previous definition: %s:%u", - buf, file, line); + "server '%s': already exists", + buf); result = ISC_R_FAILURE; } } } return (result); } - + static isc_result_t -check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass, - isc_log_t *logctx, isc_mem_t *mctx) +check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, isc_log_t *logctx, isc_mem_t *mctx) { cfg_obj_t *servers = NULL; cfg_obj_t *zones = NULL; @@ -833,11 +493,9 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass, element != NULL; element = cfg_list_next(element)) { - isc_result_t tresult; cfg_obj_t *zone = cfg_listelt_value(element); - tresult = check_zoneconf(zone, config, symtab, vclass, - logctx, mctx); + tresult = check_zoneconf(zone, symtab, vclass, logctx, mctx); if (tresult != ISC_R_SUCCESS) result = ISC_R_FAILURE; } @@ -852,7 +510,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass, if (tresult != ISC_R_SUCCESS) return (ISC_R_NOMEMORY); - (void)cfg_map_get(config, "key", &keys); + cfg_map_get(config, "key", &keys); tresult = check_keylist(keys, symtab, logctx); if (tresult == ISC_R_EXISTS) result = ISC_R_FAILURE; @@ -880,7 +538,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass, */ if (vconfig == NULL) { cfg_obj_t *options = NULL; - (void)cfg_map_get(config, "options", &options); + cfg_map_get(config, "options", &options); if (options != NULL) if (check_forward(options, logctx) != ISC_R_SUCCESS) result = ISC_R_FAILURE; @@ -888,27 +546,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass, if (check_forward(vconfig, logctx) != ISC_R_SUCCESS) result = ISC_R_FAILURE; } - /* - * Check that dual-stack-servers is reasonable. - */ - if (vconfig == NULL) { - cfg_obj_t *options = NULL; - (void)cfg_map_get(config, "options", &options); - if (options != NULL) - if (check_dual_stack(options, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } else { - if (check_dual_stack(vconfig, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - /* - * Check that rrset-order is reasonable. - */ - if (vconfig != NULL) { - if (check_order(vconfig, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } if (vconfig != NULL) { (void)cfg_map_get(vconfig, "server", &servers); @@ -934,14 +572,13 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { cfg_obj_t *servers = NULL; cfg_obj_t *views = NULL; cfg_obj_t *acls = NULL; - cfg_obj_t *kals = NULL; cfg_obj_t *obj; cfg_listelt_t *velement; isc_result_t result = ISC_R_SUCCESS; isc_result_t tresult; static const char *builtin[] = { "localhost", "localnets", - "any", "none"}; + "any", "none" }; (void)cfg_map_get(config, "options", &options); @@ -954,16 +591,8 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { check_servers(servers, logctx) != ISC_R_SUCCESS) result = ISC_R_FAILURE; - if (options != NULL && - check_order(options, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - (void)cfg_map_get(config, "view", &views); - if (views != NULL && options != NULL) - if (check_dual_stack(options, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - if (views == NULL) { if (check_viewconf(config, NULL, dns_rdataclass_in, logctx, mctx) != ISC_R_SUCCESS) @@ -985,7 +614,6 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { velement = cfg_list_next(velement)) { cfg_obj_t *view = cfg_listelt_value(velement); - cfg_obj_t *vname = cfg_tuple_get(view, "name"); cfg_obj_t *voptions = cfg_tuple_get(view, "options"); cfg_obj_t *vclassobj = cfg_tuple_get(view, "class"); dns_rdataclass_t vclass = dns_rdataclass_in; @@ -998,7 +626,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { r.length = strlen(r.base); tresult = dns_rdataclass_fromtext(&vclass, &r); if (tresult != ISC_R_SUCCESS) - cfg_obj_log(vclassobj, logctx, ISC_LOG_ERROR, + cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "view '%s': invalid class %s", cfg_obj_asstring(vname), r.base); } @@ -1053,56 +681,11 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { name = cfg_obj_asstring(cfg_tuple_get(acl2, "name")); if (strcasecmp(aclname, name) == 0) { - const char *file = cfg_obj_file(acl); - unsigned int line = cfg_obj_line(acl); - - if (file == NULL) - file = ""; - cfg_obj_log(acl2, logctx, ISC_LOG_ERROR, "attempt to redefine " - "acl '%s' previous " - "definition: %s:%u", - name, file, line); - result = ISC_R_FAILURE; - } - } - } - } - - tresult = cfg_map_get(config, "kal", &kals); - if (tresult == ISC_R_SUCCESS) { - cfg_listelt_t *elt; - cfg_listelt_t *elt2; - const char *aclname; - - for (elt = cfg_list_first(kals); - elt != NULL; - elt = cfg_list_next(elt)) { - cfg_obj_t *acl = cfg_listelt_value(elt); - - aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name")); - - for (elt2 = cfg_list_next(elt); - elt2 != NULL; - elt2 = cfg_list_next(elt2)) { - cfg_obj_t *acl2 = cfg_listelt_value(elt2); - const char *name; - name = cfg_obj_asstring(cfg_tuple_get(acl2, - "name")); - if (strcasecmp(aclname, name) == 0) { - const char *file = cfg_obj_file(acl); - unsigned int line = cfg_obj_line(acl); - - if (file == NULL) - file = ""; - - cfg_obj_log(acl2, logctx, ISC_LOG_ERROR, - "attempt to redefine " - "kal '%s' previous " - "definition: %s:%u", - name, file, line); + "acl '%s'", name); result = ISC_R_FAILURE; + break; } } } diff --git a/lib/bind9/include/Makefile.in b/lib/bind9/include/Makefile.in index 3c72373996..975fab4a2c 100644 --- a/lib/bind9/include/Makefile.in +++ b/lib/bind9/include/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.1 2001/09/20 15:17:06 marka Exp $ +# $Id: Makefile.in,v 1.1.200.1 2003/08/04 04:23:56 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in index 5f92298d81..f33eda2cdb 100644 --- a/lib/bind9/include/bind9/Makefile.in +++ b/lib/bind9/include/bind9/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.5 2001/11/14 22:08:37 bwelling Exp $ +# $Id: Makefile.in,v 1.5.200.1 2003/08/04 04:23:56 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -26,7 +26,7 @@ top_srcdir = @top_srcdir@ # machine generated. The latter are handled specially in the # install target below. # -HEADERS = check.h getaddresses.h version.h +HEADERS = cfg.h check.h log.h SUBDIRS = TARGETS = @@ -34,9 +34,9 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/bind9 + $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/isccfg install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind9 ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isccfg ; \ done diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h index a1c80e4645..f23c3d3a84 100644 --- a/lib/bind9/include/bind9/check.h +++ b/lib/bind9/include/bind9/check.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.h,v 1.1 2001/09/20 15:17:07 marka Exp $ */ +/* $Id: check.h,v 1.1.200.1 2003/08/04 04:23:56 marka Exp $ */ #ifndef BIND9_CHECK_H #define BIND9_CHECK_H 1 @@ -51,4 +51,4 @@ bind9_check_key(cfg_obj_t *config, isc_log_t *logctx); ISC_LANG_ENDDECLS -#endif /* BIND9_CHECK_H */ +#endif /* ISCCFG_CHECK_H */ diff --git a/lib/bind9/version.c b/lib/bind9/version.c index 8264355020..751070d9c3 100644 --- a/lib/bind9/version.c +++ b/lib/bind9/version.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Internet Software Consortium. + * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,12 +15,10 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.c,v 1.3 2001/11/14 22:01:40 bwelling Exp $ */ +/* $Id: version.c,v 1.3.200.1 2003/08/04 04:23:55 marka Exp $ */ -#include +char bind9_version[] = VERSION; -const char bind9_version[] = VERSION; - -const unsigned int bind9_libinterface = LIBINTERFACE; -const unsigned int bind9_librevision = LIBREVISION; -const unsigned int bind9_libage = LIBAGE; +unsigned int bind9_libinterface = LIBINTERFACE; +unsigned int bind9_librevision = LIBREVISION; +unsigned int bind9_libage = LIBAGE; diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 0e1e6b2fe1..8357c48d5b 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.126.2.3 2003/07/22 04:03:40 marka Exp $ +# $Id: Makefile.in,v 1.126.2.3.2.1 2003/08/04 04:20:18 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ @LIBDNS_API@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} diff --git a/lib/dns/sec/dst/Makefile.in b/lib/dns/sec/dst/Makefile.in index f34ada34ed..48b68a31a8 100644 --- a/lib/dns/sec/dst/Makefile.in +++ b/lib/dns/sec/dst/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.25.2.2 2002/08/05 06:57:14 marka Exp $ +# $Id: Makefile.in,v 1.25.2.2.8.1 2003/08/04 04:20:18 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir} ${DNS_INCLUDES} \ ${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@ diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 948b6bd976..d313c4149a 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2001/07/09 22:25:26 gson Exp $ +# $Id: Makefile.in,v 1.2.12.1 2003/08/04 04:20:18 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ @LIBISCCC_API@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES} diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index fd858b2c41..741618079a 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.6 2001/07/09 22:25:27 gson Exp $ +# $Id: Makefile.in,v 1.6.12.1 2003/08/04 04:20:19 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ @LIBISCCFG_API@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @@ -41,10 +41,10 @@ LIBS = @LIBS@ SUBDIRS = include # Alphabetically -OBJS = check.@O@ log.@O@ parser.@O@ version.@O@ +OBJS = log.@O@ parser.@O@ version.@O@ # Alphabetically -SRCS = check.c log.c parser.c version.c +SRCS = log.c parser.c version.c TARGETS = timestamp diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c deleted file mode 100644 index 179c17d1af..0000000000 --- a/lib/isccfg/check.c +++ /dev/null @@ -1,652 +0,0 @@ -/* - * Copyright (C) 2001-2003 Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM - * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: check.c,v 1.14.2.18 2003/07/22 04:03:53 marka Exp $ */ - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -static isc_result_t -check_forward(cfg_obj_t *options, isc_log_t *logctx) { - cfg_obj_t *forward = NULL; - cfg_obj_t *forwarders = NULL; - - (void)cfg_map_get(options, "forward", &forward); - (void)cfg_map_get(options, "forwarders", &forwarders); - - if (forward != NULL && forwarders == NULL) { - cfg_obj_log(forward, logctx, ISC_LOG_ERROR, - "no matching 'forwarders' statement"); - return (ISC_R_FAILURE); - } - return (ISC_R_SUCCESS); -} - -typedef struct { - const char *name; - unsigned int scale; -} intervaltable; - -static isc_result_t -check_options(cfg_obj_t *options, isc_log_t *logctx) { - isc_result_t result = ISC_R_SUCCESS; - unsigned int i; - - static intervaltable intervals[] = { - { "cleaning-interval", 60 }, - { "heartbeat-interval", 60 }, - { "interface-interval", 60 }, - { "max-transfer-idle-in", 60 }, - { "max-transfer-idle-out", 60 }, - { "max-transfer-time-in", 60 }, - { "max-transfer-time-out", 60 }, - { "sig-validity-interval", 86400}, - { "statistics-interval", 60 }, - }; - - /* - * Check that fields specified in units of time other than seconds - * have reasonable values. - */ - for (i = 0; i < sizeof(intervals) / sizeof(intervals[0]); i++) { - isc_uint32_t val; - cfg_obj_t *obj = NULL; - (void)cfg_map_get(options, intervals[i].name, &obj); - if (obj == NULL) - continue; - val = cfg_obj_asuint32(obj); - if (val > (ISC_UINT32_MAX / intervals[i].scale)) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "%s '%d' is out of range", - intervals[i].name, val); - result = ISC_R_RANGE; - } - } - return (result); -} - -#define MASTERZONE 1 -#define SLAVEZONE 2 -#define STUBZONE 4 -#define HINTZONE 8 -#define FORWARDZONE 16 - -typedef struct { - const char *name; - int allowed; -} optionstable; - -static isc_result_t -check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx, - isc_mem_t *mctx) -{ - const char *zname; - const char *typestr; - unsigned int ztype; - cfg_obj_t *zoptions; - cfg_obj_t *obj = NULL; - cfg_obj_t *addrlist = NULL; - isc_symvalue_t symvalue; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - unsigned int i; - dns_fixedname_t fixedname; - isc_buffer_t b; - - static optionstable options[] = { - { "allow-query", MASTERZONE | SLAVEZONE | STUBZONE }, - { "allow-notify", SLAVEZONE }, - { "allow-transfer", MASTERZONE | SLAVEZONE }, - { "notify", MASTERZONE | SLAVEZONE }, - { "also-notify", MASTERZONE | SLAVEZONE }, - { "dialup", MASTERZONE | SLAVEZONE | STUBZONE }, - { "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE}, - { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE}, - { "maintain-ixfr-base", MASTERZONE | SLAVEZONE }, - { "max-ixfr-log-size", MASTERZONE | SLAVEZONE }, - { "notify-source", MASTERZONE | SLAVEZONE }, - { "notify-source-v6", MASTERZONE | SLAVEZONE }, - { "transfer-source", SLAVEZONE | STUBZONE }, - { "transfer-source-v6", SLAVEZONE | STUBZONE }, - { "max-transfer-time-in", SLAVEZONE | STUBZONE }, - { "max-transfer-time-out", MASTERZONE | SLAVEZONE }, - { "max-transfer-idle-in", SLAVEZONE | STUBZONE }, - { "max-transfer-idle-out", MASTERZONE | SLAVEZONE }, - { "max-retry-time", SLAVEZONE | STUBZONE }, - { "min-retry-time", SLAVEZONE | STUBZONE }, - { "max-refresh-time", SLAVEZONE | STUBZONE }, - { "min-refresh-time", SLAVEZONE | STUBZONE }, - { "sig-validity-interval", MASTERZONE }, - { "zone-statistics", MASTERZONE | SLAVEZONE | STUBZONE }, - { "allow-update", MASTERZONE }, - { "allow-update-forwarding", SLAVEZONE }, - { "file", MASTERZONE | SLAVEZONE | STUBZONE | HINTZONE}, - { "ixfr-base", MASTERZONE | SLAVEZONE }, - { "ixfr-tmp-file", MASTERZONE | SLAVEZONE }, - { "masters", SLAVEZONE | STUBZONE }, - { "pubkey", MASTERZONE | SLAVEZONE | STUBZONE }, - { "update-policy", MASTERZONE }, - { "database", MASTERZONE | SLAVEZONE | STUBZONE }, - }; - - static optionstable dialups[] = { - { "notify", MASTERZONE | SLAVEZONE }, - { "notify-passive", SLAVEZONE }, - { "refresh", SLAVEZONE | STUBZONE }, - { "passive", SLAVEZONE | STUBZONE }, - }; - - zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); - - zoptions = cfg_tuple_get(zconfig, "options"); - - obj = NULL; - (void)cfg_map_get(zoptions, "type", &obj); - if (obj == NULL) { - cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, - "zone '%s': type not present", zname); - return (ISC_R_FAILURE); - } - - typestr = cfg_obj_asstring(obj); - if (strcasecmp(typestr, "master") == 0) - ztype = MASTERZONE; - else if (strcasecmp(typestr, "slave") == 0) - ztype = SLAVEZONE; - else if (strcasecmp(typestr, "stub") == 0) - ztype = STUBZONE; - else if (strcasecmp(typestr, "forward") == 0) - ztype = FORWARDZONE; - else if (strcasecmp(typestr, "hint") == 0) - ztype = HINTZONE; - else { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "zone '%s': invalid type %s", - zname, typestr); - return (ISC_R_FAILURE); - } - - /* - * Look for an already existing zone. - * We need to make this cannonical as isc_symtab_define() - * deals with strings. - */ - dns_fixedname_init(&fixedname); - isc_buffer_init(&b, zname, strlen(zname)); - isc_buffer_add(&b, strlen(zname)); - result = dns_name_fromtext(dns_fixedname_name(&fixedname), &b, - dns_rootname, ISC_TRUE, NULL); - if (result != ISC_R_SUCCESS) { - cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, - "zone '%s': is not a valid name", zname); - result = ISC_R_FAILURE; - } else { - char namebuf[DNS_NAME_FORMATSIZE]; - char *key; - - dns_name_format(dns_fixedname_name(&fixedname), - namebuf, sizeof(namebuf)); - key = isc_mem_strdup(mctx, namebuf); - if (key == NULL) - return (ISC_R_NOMEMORY); - symvalue.as_pointer = NULL; - tresult = isc_symtab_define(symtab, key, - ztype == HINTZONE ? 1 : 2, - symvalue, isc_symexists_reject); - if (tresult == ISC_R_EXISTS) { - isc_mem_free(mctx, key); - cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, - "zone '%s': already exists ", zname); - result = ISC_R_FAILURE; - } else if (tresult != ISC_R_SUCCESS) { - isc_mem_strdup(mctx, key); - return (tresult); - } - } - - /* - * Look for inappropriate options for the given zone type. - */ - for (i = 0; i < sizeof(options) / sizeof(options[0]); i++) { - obj = NULL; - if ((options[i].allowed & ztype) == 0 && - cfg_map_get(zoptions, options[i].name, &obj) == - ISC_R_SUCCESS) - { - if (strcmp(options[i].name, "allow-update") != 0 || - ztype != SLAVEZONE) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "option '%s' is not allowed " - "in '%s' zone '%s'", - options[i].name, typestr, zname); - result = ISC_R_FAILURE; - } else - cfg_obj_log(obj, logctx, ISC_LOG_WARNING, - "option '%s' is not allowed " - "in '%s' zone '%s'", - options[i].name, typestr, zname); - } - } - - /* - * Slave & stub zones must have a "masters" field. - */ - if (ztype == SLAVEZONE || ztype == STUBZONE) { - obj = NULL; - if (cfg_map_get(zoptions, "masters", &obj) != ISC_R_SUCCESS) { - cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR, - "zone '%s': missing 'masters' entry", - zname); - result = ISC_R_FAILURE; - } else { - addrlist = cfg_tuple_get(obj, "addresses"); - if (cfg_list_first(addrlist) == NULL) { - cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR, - "zone '%s': empty 'masters' entry", - zname); - result = ISC_R_FAILURE; - } - } - } - - /* - * Master zones can't have both "allow-update" and "update-policy". - */ - if (ztype == MASTERZONE) { - isc_result_t res1, res2; - obj = NULL; - res1 = cfg_map_get(zoptions, "allow-update", &obj); - obj = NULL; - res2 = cfg_map_get(zoptions, "update-policy", &obj); - if (res1 == ISC_R_SUCCESS && res2 == ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "zone '%s': 'allow-update' is ignored " - "when 'update-policy' is present", - zname); - result = ISC_R_FAILURE; - } - } - - /* - * Check the excessively complicated "dialup" option. - */ - if (ztype == MASTERZONE || ztype == SLAVEZONE || ztype == STUBZONE) { - cfg_obj_t *dialup = NULL; - cfg_map_get(zoptions, "dialup", &dialup); - if (dialup != NULL && cfg_obj_isstring(dialup)) { - char *str = cfg_obj_asstring(dialup); - for (i = 0; - i < sizeof(dialups) / sizeof(dialups[0]); - i++) - { - if (strcasecmp(dialups[i].name, str) != 0) - continue; - if ((dialups[i].allowed & ztype) == 0) { - cfg_obj_log(obj, logctx, - ISC_LOG_ERROR, - "dialup type '%s' is not " - "allowed in '%s' " - "zone '%s'", - str, typestr, zname); - result = ISC_R_FAILURE; - } - break; - } - if (i == sizeof(dialups) / sizeof(dialups[0])) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "invalid dialup type '%s' in zone " - "'%s'", str, zname); - result = ISC_R_FAILURE; - } - } - } - - /* - * Check that forwarding is reasonable. - */ - if (check_forward(zoptions, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - - /* - * Check various options. - */ - tresult = check_options(zoptions, logctx); - if (tresult != ISC_R_SUCCESS) - result = tresult; - - return (result); -} - -isc_result_t -cfg_check_key(cfg_obj_t *key, isc_log_t *logctx) { - cfg_obj_t *algobj = NULL; - cfg_obj_t *secretobj = NULL; - const char *keyname = cfg_obj_asstring(cfg_map_getname(key)); - - cfg_map_get(key, "algorithm", &algobj); - cfg_map_get(key, "secret", &secretobj); - if (secretobj == NULL || algobj == NULL) { - cfg_obj_log(key, logctx, ISC_LOG_ERROR, - "key '%s' must have both 'secret' and " - "'algorithm' defined", - keyname); - return ISC_R_FAILURE; - } - return ISC_R_SUCCESS; -} - -static isc_result_t -check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) { - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - cfg_listelt_t *element; - - for (element = cfg_list_first(keys); - element != NULL; - element = cfg_list_next(element)) - { - cfg_obj_t *key = cfg_listelt_value(element); - const char *keyname = cfg_obj_asstring(cfg_map_getname(key)); - isc_symvalue_t symvalue; - - symvalue.as_pointer = NULL; - tresult = isc_symtab_define(symtab, keyname, 1, - symvalue, isc_symexists_reject); - if (tresult == ISC_R_EXISTS) { - cfg_obj_log(key, logctx, ISC_LOG_ERROR, - "key '%s': already exists ", keyname); - result = tresult; - } else if (tresult != ISC_R_SUCCESS) - return (tresult); - - tresult = cfg_check_key(key, logctx); - if (tresult != ISC_R_SUCCESS) - return (tresult); - } - return (result); -} - -static void -freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) { - UNUSED(type); - UNUSED(value); - isc_mem_free(userarg, key); -} - -static isc_result_t -check_servers(cfg_obj_t *servers, isc_log_t *logctx) { - isc_result_t result = ISC_R_SUCCESS; - cfg_listelt_t *e1, *e2; - cfg_obj_t *v1, *v2; - isc_sockaddr_t *s1, *s2; - isc_netaddr_t na; - - for (e1 = cfg_list_first(servers); e1 != NULL; e1 = cfg_list_next(e1)) { - v1 = cfg_listelt_value(e1); - s1 = cfg_obj_assockaddr(cfg_map_getname(v1)); - e2 = e1; - while ((e2 = cfg_list_next(e2)) != NULL) { - v2 = cfg_listelt_value(e2); - s2 = cfg_obj_assockaddr(cfg_map_getname(v2)); - if (isc_sockaddr_eqaddr(s1, s2)) { - isc_buffer_t target; - char buf[128]; - - isc_netaddr_fromsockaddr(&na, s2); - isc_buffer_init(&target, buf, sizeof(buf) - 1); - INSIST(isc_netaddr_totext(&na, &target) - == ISC_R_SUCCESS); - buf[isc_buffer_usedlength(&target)] = '\0'; - - cfg_obj_log(v2, logctx, ISC_LOG_ERROR, - "server '%s': already exists", - buf); - result = ISC_R_FAILURE; - } - } - } - return (result); -} - -static isc_result_t -check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, isc_log_t *logctx, isc_mem_t *mctx) -{ - cfg_obj_t *servers = NULL; - cfg_obj_t *zones = NULL; - cfg_obj_t *keys = NULL; - cfg_listelt_t *element; - isc_symtab_t *symtab = NULL; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult = ISC_R_SUCCESS; - - /* - * Check that all zone statements are syntactically correct and - * there are no duplicate zones. - */ - tresult = isc_symtab_create(mctx, 100, freekey, mctx, - ISC_TRUE, &symtab); - if (tresult != ISC_R_SUCCESS) - return (ISC_R_NOMEMORY); - - if (vconfig != NULL) - (void)cfg_map_get(vconfig, "zone", &zones); - else - (void)cfg_map_get(config, "zone", &zones); - - for (element = cfg_list_first(zones); - element != NULL; - element = cfg_list_next(element)) - { - cfg_obj_t *zone = cfg_listelt_value(element); - - if (check_zoneconf(zone, symtab, logctx, mctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - - isc_symtab_destroy(&symtab); - - /* - * Check that all key statements are syntactically correct and - * there are no duplicate keys. - */ - tresult = isc_symtab_create(mctx, 100, NULL, NULL, ISC_TRUE, &symtab); - if (tresult != ISC_R_SUCCESS) - return (ISC_R_NOMEMORY); - - cfg_map_get(config, "key", &keys); - tresult = check_keylist(keys, symtab, logctx); - if (tresult == ISC_R_EXISTS) - result = ISC_R_FAILURE; - else if (tresult != ISC_R_SUCCESS) { - isc_symtab_destroy(&symtab); - return (tresult); - } - - if (vconfig != NULL) { - keys = NULL; - (void)cfg_map_get(vconfig, "key", &keys); - tresult = check_keylist(keys, symtab, logctx); - if (tresult == ISC_R_EXISTS) - result = ISC_R_FAILURE; - else if (tresult != ISC_R_SUCCESS) { - isc_symtab_destroy(&symtab); - return (tresult); - } - } - - isc_symtab_destroy(&symtab); - - /* - * Check that forwarding is reasonable. - */ - if (vconfig == NULL) { - cfg_obj_t *options = NULL; - cfg_map_get(config, "options", &options); - if (options != NULL) - if (check_forward(options, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } else { - if (check_forward(vconfig, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - - - if (vconfig != NULL) { - (void)cfg_map_get(vconfig, "server", &servers); - if (servers != NULL && - check_servers(servers, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - - if (vconfig != NULL) - tresult = check_options(vconfig, logctx); - else - tresult = check_options(config, logctx); - if (tresult != ISC_R_SUCCESS) - result = tresult; - - return (result); -} - - -isc_result_t -cfg_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { - cfg_obj_t *options = NULL; - cfg_obj_t *servers = NULL; - cfg_obj_t *views = NULL; - cfg_obj_t *acls = NULL; - cfg_obj_t *obj; - cfg_listelt_t *velement; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - - static const char *builtin[] = { "localhost", "localnets", - "any", "none" }; - - (void)cfg_map_get(config, "options", &options); - - if (options != NULL && - check_options(options, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - - (void)cfg_map_get(config, "server", &servers); - if (servers != NULL && - check_servers(servers, logctx) != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - - (void)cfg_map_get(config, "view", &views); - - if (views == NULL) { - if (check_viewconf(config, NULL, logctx, mctx) - != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } else { - cfg_obj_t *zones = NULL; - - (void)cfg_map_get(config, "zone", &zones); - if (zones != NULL) { - cfg_obj_log(zones, logctx, ISC_LOG_ERROR, - "when using 'view' statements, " - "all zones must be in views"); - result = ISC_R_FAILURE; - } - } - - for (velement = cfg_list_first(views); - velement != NULL; - velement = cfg_list_next(velement)) - { - cfg_obj_t *view = cfg_listelt_value(velement); - cfg_obj_t *voptions = cfg_tuple_get(view, "options"); - - if (check_viewconf(config, voptions, logctx, mctx) - != ISC_R_SUCCESS) - result = ISC_R_FAILURE; - } - - if (views != NULL && options != NULL) { - obj = NULL; - tresult = cfg_map_get(options, "cache-file", &obj); - if (tresult == ISC_R_SUCCESS) { - cfg_obj_log(obj, logctx, ISC_LOG_ERROR, - "'cache-file' cannot be a global " - "option if views are present"); - result = ISC_R_FAILURE; - } - } - - tresult = cfg_map_get(config, "acl", &acls); - if (tresult == ISC_R_SUCCESS) { - cfg_listelt_t *elt; - cfg_listelt_t *elt2; - const char *aclname; - - for (elt = cfg_list_first(acls); - elt != NULL; - elt = cfg_list_next(elt)) { - cfg_obj_t *acl = cfg_listelt_value(elt); - unsigned int i; - - aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name")); - for (i = 0; - i < sizeof(builtin) / sizeof(builtin[0]); - i++) - if (strcasecmp(aclname, builtin[i]) == 0) { - cfg_obj_log(acl, logctx, ISC_LOG_ERROR, - "attempt to redefine " - "builtin acl '%s'", - aclname); - result = ISC_R_FAILURE; - break; - } - - for (elt2 = cfg_list_next(elt); - elt2 != NULL; - elt2 = cfg_list_next(elt2)) { - cfg_obj_t *acl2 = cfg_listelt_value(elt2); - const char *name; - name = cfg_obj_asstring(cfg_tuple_get(acl2, - "name")); - if (strcasecmp(aclname, name) == 0) { - cfg_obj_log(acl2, logctx, ISC_LOG_ERROR, - "attempt to redefine " - "acl '%s'", name); - result = ISC_R_FAILURE; - break; - } - } - } - } - - return (result); -} diff --git a/lib/isccfg/include/isccfg/check.h b/lib/isccfg/include/isccfg/check.h deleted file mode 100644 index 737c628754..0000000000 --- a/lib/isccfg/include/isccfg/check.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2001 Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM - * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: check.h,v 1.4 2001/08/03 17:24:11 gson Exp $ */ - -#ifndef ISCCFG_CHECK_H -#define ISCCFG_CHECK_H 1 - -#include -#include - -#include - -ISC_LANG_BEGINDECLS - -isc_result_t -cfg_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx); -/* - * Check the syntactic validity of a configuration parse tree generated from - * a named.conf file. - * - * Requires: - * config is a valid parse tree - * - * logctx is a valid logging context. - * - * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - */ - -isc_result_t -cfg_check_key(cfg_obj_t *config, isc_log_t *logctx); -/* - * As above, but for a single 'key' statement. - */ - -ISC_LANG_ENDDECLS - -#endif /* ISCCFG_CHECK_H */ diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in index 223925e8a2..dd2397f3ee 100644 --- a/lib/lwres/Makefile.in +++ b/lib/lwres/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.25 2001/07/10 18:25:37 gson Exp $ +# $Id: Makefile.in,v 1.25.12.1 2003/08/04 04:20:20 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ @LIBLWRES_API@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = -I${srcdir}/unix/include \ -I. -I./include -I${srcdir}/include ${ISC_INCLUDES} diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 7a6da88a53..ebb6c6d3f0 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -13,13 +13,13 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.14 2001/01/09 22:00:34 bwelling Exp $ +# $Id: Makefile.in,v 1.14.12.1 2003/08/04 04:20:20 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@BIND9_INCLUDES@ +@BIND9_MAKE_INCLUDES@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${TEST_INCLUDES} CDEFINES = diff --git a/make/includes.in b/make/includes.in index b422ac059e..64f64a75cd 100644 --- a/make/includes.in +++ b/make/includes.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: includes.in,v 1.15 2001/07/10 19:59:03 gson Exp $ +# $Id: includes.in,v 1.15.12.1 2003/08/04 04:20:20 marka Exp $ # Search for machine-generated header files in the build tree, # and for normal headers in the source tree (${top_srcdir}). @@ -41,5 +41,8 @@ LWRES_INCLUDES = @BIND9_LWRES_BUILDINCLUDE@ \ -I${top_srcdir}/lib/lwres/unix/include \ -I${top_srcdir}/lib/lwres/include +BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/bind9/include + TEST_INCLUDES = \ -I${top_srcdir}/lib/tests/include