From 850d70818503ca1b0f98c9c70b16b51e789fd705 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Wed, 15 Nov 2000 00:36:42 +0000 Subject: [PATCH] 562. [cleanup] Moved lib/dns/*conf.c to bin/named where they belong. --- CHANGES | 3 + bin/named/Makefile.in | 12 +- lib/dns/Makefile.in | 18 +- lib/dns/aclconf.c | 201 ---------------- lib/dns/tkeyconf.c | 111 --------- lib/dns/tsigconf.c | 150 ------------ lib/dns/zoneconf.c | 520 ------------------------------------------ util/copyrights | 8 +- 8 files changed, 23 insertions(+), 1000 deletions(-) delete mode 100644 lib/dns/aclconf.c delete mode 100644 lib/dns/tkeyconf.c delete mode 100644 lib/dns/tsigconf.c delete mode 100644 lib/dns/zoneconf.c diff --git a/CHANGES b/CHANGES index 3b7d15e99d..1b7afcfa77 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ + + 562. [cleanup] Moved lib/dns/*conf.c to bin/named where they belong. + 561. [func] The 'datasize', 'stacksize', 'coresize' and 'files' clauses of the options{} statement are now implemented. diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 671ce0aac4..da12b88192 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.58 2000/11/14 03:22:52 gson Exp $ +# $Id: Makefile.in,v 1.59 2000/11/15 00:36:41 gson Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -48,19 +48,21 @@ SUBDIRS = unix TARGETS = named lwresd -OBJS = client.@O@ interfacemgr.@O@ listenlist.@O@ \ +OBJS = aclconf.@O@ client.@O@ interfacemgr.@O@ listenlist.@O@ \ log.@O@ logconf.@O@ main.@O@ notify.@O@ omapi.@O@ \ omapiconf.@O@ query.@O@ server.@O@ sortlist.@O@ \ - update.@O@ xfrout.@O@ \ + tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ + zoneconf.@O@ \ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ UOBJS = unix/os.@O@ -SRCS = client.c interfacemgr.c listenlist.c \ +SRCS = aclconf.c client.c interfacemgr.c listenlist.c \ log.c logconf.c main.c notify.c omapi.c \ omapiconf.c query.c server.c sortlist.c \ - update.c xfrout.c \ + tkeyconf.c tsigconf.c update.c xfrout.c \ + zoneconf.c \ lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index b25425ffef..e2a78451f9 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.109 2000/10/17 01:57:40 bwelling Exp $ +# $Id: Makefile.in,v 1.110 2000/11/15 00:36:35 gson Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -93,7 +93,7 @@ OTHEROBJS = sdb.@O@ #endif /* NOMINUM_PUBLIC */ # Alphabetically -OBJS = a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \ +OBJS = a6.@O@ acl.@O@ adb.@O@ byaddr.@O@ \ cache.@O@ callbacks.@O@ compress.@O@ \ db.@O@ dbiterator.@O@ dbtable.@O@ dispatch.@O@ dnssec.@O@ \ forward.@O@ journal.@O@ keytable.@O@ lib.@O@ log.@O@ \ @@ -102,9 +102,9 @@ OBJS = a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \ rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rdata.@O@ rdatalist.@O@ \ rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ request.@O@ \ resolver.@O@ result.@O@ rootns.@O@ ssu.@O@ \ - tcpmsg.@O@ time.@O@ tkey.@O@ tkeyconf.@O@ \ - tsig.@O@ tsigconf.@O@ ttl.@O@ validator.@O@ \ - version.@O@ view.@O@ xfrin.@O@ zone.@O@ zoneconf.@O@ zt.@O@ \ + tcpmsg.@O@ time.@O@ tkey.@O@ \ + tsig.@O@ ttl.@O@ validator.@O@ \ + version.@O@ view.@O@ xfrin.@O@ zone.@O@ zt.@O@ \ ${OTHEROBJS} ${DSTOBJS} @DST_OPENSSL_OBJS@ ${CONFOBJS} OTHERSRCS = @@ -114,7 +114,7 @@ OTHERSRCS = sdb.c # Alphabetically -SRCS = a6.c acl.c aclconf.c adb.c byaddr.c \ +SRCS = a6.c acl.c adb.c byaddr.c \ cache.c callbacks.c compress.c \ db.c dbiterator.c dbtable.c dispatch.c dnssec.c \ forward.c journal.c keytable.c lib.c log.c \ @@ -123,9 +123,9 @@ SRCS = a6.c acl.c aclconf.c adb.c byaddr.c \ rbt.c rbtdb.c rbtdb64.c rdata.c rdatalist.c \ rdataset.c rdatasetiter.c rdataslab.c request.c \ resolver.c result.c rootns.c ssu.c \ - tcpmsg.c time.c tkey.c tkeyconf.c \ - tsig.c tsigconf.c ttl.c validator.c \ - version.c view.c xfrin.c zone.c zoneconf.c zt.c \ + tcpmsg.c time.c tkey.c \ + tsig.c ttl.c validator.c \ + version.c view.c xfrin.c zone.c zt.c \ ${OTHERSRCS} SUBDIRS = include sec config diff --git a/lib/dns/aclconf.c b/lib/dns/aclconf.c deleted file mode 100644 index 2370da9c23..0000000000 --- a/lib/dns/aclconf.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (C) 1999, 2000 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: aclconf.c,v 1.23 2000/08/11 02:34:45 bwelling Exp $ */ - -#include - -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include -#include - -void -dns_aclconfctx_init(dns_aclconfctx_t *ctx) { - ISC_LIST_INIT(ctx->named_acl_cache); -} - -void -dns_aclconfctx_destroy(dns_aclconfctx_t *ctx) { - dns_acl_t *dacl, *next; - for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache); - dacl != NULL; - dacl = next) - { - next = ISC_LIST_NEXT(dacl, nextincache); - dns_acl_detach(&dacl); - } -} - -static isc_result_t -convert_named_acl(char *aclname, dns_c_ctx_t *cctx, - dns_aclconfctx_t *ctx, isc_mem_t *mctx, - dns_acl_t **target) -{ - isc_result_t result; - dns_c_acl_t *cacl; - dns_acl_t *dacl; - - /* Look for an already-converted version. */ - for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache); - dacl != NULL; - dacl = ISC_LIST_NEXT(dacl, nextincache)) - { - if (strcmp(aclname, dacl->name) == 0) { - dns_acl_attach(dacl, target); - return (ISC_R_SUCCESS); - } - } - /* Not yet converted. Convert now. */ - result = dns_c_acltable_getacl(cctx->acls, aclname, &cacl); - if (result != ISC_R_SUCCESS) { - isc_log_write(dns_lctx, DNS_LOGCATEGORY_SECURITY, - DNS_LOGMODULE_ACL, ISC_LOG_WARNING, - "undefined ACL '%s'", aclname); - return (result); - } - result = dns_acl_fromconfig(cacl->ipml, cctx, ctx, mctx, &dacl); - if (result != ISC_R_SUCCESS) - return (result); - dacl->name = isc_mem_strdup(dacl->mctx, aclname); - if (dacl->name == NULL) - return (ISC_R_NOMEMORY); - ISC_LIST_APPEND(ctx->named_acl_cache, dacl, nextincache); - dns_acl_attach(dacl, target); - return (ISC_R_SUCCESS); -} - -static isc_result_t -convert_keyname(char *txtname, isc_mem_t *mctx, dns_name_t *dnsname) { - isc_result_t result; - isc_buffer_t buf; - dns_fixedname_t fixname; - unsigned int keylen; - - keylen = strlen(txtname); - isc_buffer_init(&buf, txtname, keylen); - isc_buffer_add(&buf, keylen); - dns_fixedname_init(&fixname); - result = dns_name_fromtext(dns_fixedname_name(&fixname), &buf, - dns_rootname, ISC_FALSE, NULL); - if (result != ISC_R_SUCCESS) { - isc_log_write(dns_lctx, DNS_LOGCATEGORY_SECURITY, - DNS_LOGMODULE_ACL, ISC_LOG_WARNING, - "key name \"%s\" is not a valid domain name", - txtname); - return (result); - } - return (dns_name_dup(dns_fixedname_name(&fixname), mctx, dnsname)); -} - -isc_result_t -dns_acl_fromconfig(dns_c_ipmatchlist_t *caml, - dns_c_ctx_t *cctx, - dns_aclconfctx_t *ctx, - isc_mem_t *mctx, - dns_acl_t **target) -{ - isc_result_t result; - unsigned int count; - dns_acl_t *dacl = NULL; - dns_aclelement_t *de; - dns_c_ipmatchelement_t *ce; - - REQUIRE(target != NULL && *target == NULL); - - count = 0; - for (ce = ISC_LIST_HEAD(caml->elements); - ce != NULL; - ce = ISC_LIST_NEXT(ce, next)) - count++; - - result = dns_acl_create(mctx, count, &dacl); - if (result != ISC_R_SUCCESS) - return (result); - - de = dacl->elements; - for (ce = ISC_LIST_HEAD(caml->elements); - ce != NULL; - ce = ISC_LIST_NEXT(ce, next)) - { - de->negative = dns_c_ipmatchelement_isneg(ce); - switch (ce->type) { - case dns_c_ipmatch_pattern: - de->type = dns_aclelementtype_ipprefix; - isc_netaddr_fromsockaddr(&de->u.ip_prefix.address, - &ce->u.direct.address); - /* XXX "mask" is a misnomer */ - de->u.ip_prefix.prefixlen = ce->u.direct.mask; - break; - case dns_c_ipmatch_key: - de->type = dns_aclelementtype_keyname; - dns_name_init(&de->u.keyname, NULL); - result = convert_keyname(ce->u.key, mctx, - &de->u.keyname); - if (result != ISC_R_SUCCESS) - goto cleanup; - break; - case dns_c_ipmatch_indirect: - de->type = dns_aclelementtype_nestedacl; - result = dns_acl_fromconfig(ce->u.indirect.list, - cctx, ctx, mctx, - &de->u.nestedacl); - if (result != ISC_R_SUCCESS) - goto cleanup; - break; - case dns_c_ipmatch_localhost: - de->type = dns_aclelementtype_localhost; - break; - - case dns_c_ipmatch_any: - de->type = dns_aclelementtype_any; - break; - - case dns_c_ipmatch_localnets: - de->type = dns_aclelementtype_localnets; - break; - case dns_c_ipmatch_acl: - de->type = dns_aclelementtype_nestedacl; - result = convert_named_acl(ce->u.aclname, - cctx, ctx, mctx, - &de->u.nestedacl); - if (result != ISC_R_SUCCESS) - goto cleanup; - break; - default: - isc_log_write(dns_lctx, DNS_LOGCATEGORY_SECURITY, - DNS_LOGMODULE_ACL, ISC_LOG_WARNING, - "address match list contains " - "unsupported element type"); - result = ISC_R_FAILURE; - goto cleanup; - } - de++; - dacl->length++; - } - - *target = dacl; - return (ISC_R_SUCCESS); - - cleanup: - dns_acl_detach(&dacl); - return (result); -} diff --git a/lib/dns/tkeyconf.c b/lib/dns/tkeyconf.c deleted file mode 100644 index 44b3fd84d1..0000000000 --- a/lib/dns/tkeyconf.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 1999, 2000 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: tkeyconf.c,v 1.15 2000/10/12 01:08:32 bwelling Exp $ */ - -#include - -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include -#include -#include - -#include - -#define RETERR(x) do { \ - result = (x); \ - if (result != ISC_R_SUCCESS) \ - goto failure; \ - } while (0) - - -isc_result_t -dns_tkeyctx_fromconfig(dns_c_ctx_t *cfg, isc_mem_t *mctx, isc_entropy_t *ectx, - dns_tkeyctx_t **tctxp) -{ - isc_result_t result; - dns_tkeyctx_t *tctx = NULL; - char *s; - isc_uint32_t n; - dns_fixedname_t fname; - dns_name_t *name; - isc_buffer_t b; - - result = dns_tkeyctx_create(mctx, ectx, &tctx); - if (result != ISC_R_SUCCESS) - return (result); - - s = NULL; - result = dns_c_ctx_gettkeydhkey(cfg, &s, &n); - if (result == ISC_R_SUCCESS) { - isc_buffer_init(&b, s, strlen(s)); - isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - RETERR(dns_name_fromtext(name, &b, dns_rootname, - ISC_FALSE, NULL)); - RETERR(dst_key_fromfile(name, n, DNS_KEYALG_DH, - DST_TYPE_PUBLIC|DST_TYPE_PRIVATE, - NULL, mctx, &tctx->dhkey)); - } else if (result != ISC_R_NOTFOUND) - goto failure; - - s = NULL; - result = dns_c_ctx_gettkeydomain(cfg, &s); - if (result == ISC_R_SUCCESS) { - isc_buffer_init(&b, s, strlen(s)); - isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - RETERR(dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, - NULL)); - tctx->domain = isc_mem_get(mctx, sizeof(dns_name_t)); - if (tctx->domain == NULL) { - result = ISC_R_NOMEMORY; - goto failure; - } - dns_name_init(tctx->domain, NULL); - RETERR(dns_name_dup(name, mctx, tctx->domain)); - } else if (result != ISC_R_NOTFOUND) - goto failure; - - result = dns_c_ctx_gettkeygsscred(cfg, &s); - if (result == ISC_R_SUCCESS) { - isc_buffer_init(&b, s, strlen(s)); - isc_buffer_add(&b, strlen(s)); - dns_fixedname_init(&fname); - name = dns_fixedname_name(&fname); - RETERR(dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, - NULL)); - RETERR(dst_gssapi_acquirecred(name, ISC_FALSE, - &tctx->gsscred)); - } else if (result != ISC_R_NOTFOUND) - goto failure; - - *tctxp = tctx; - return (ISC_R_SUCCESS); - - failure: - dns_tkeyctx_destroy(&tctx); - return (result); -} - diff --git a/lib/dns/tsigconf.c b/lib/dns/tsigconf.c deleted file mode 100644 index 0f48b08a5c..0000000000 --- a/lib/dns/tsigconf.c +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright (C) 1999, 2000 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: tsigconf.c,v 1.12 2000/10/25 19:24:18 bwelling Exp $ */ - -#include - -#include -#include -#include -#include - -#include -#include - -static isc_result_t -add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring, - isc_mem_t *mctx) -{ - dns_c_kdef_t *key; - unsigned char *secret = NULL; - int secretalloc = 0; - int secretlen = 0; - isc_result_t ret; - isc_stdtime_t now; - - key = ISC_LIST_HEAD(list->keydefs); - while (key != NULL) { - dns_name_t keyname; - dns_name_t *alg, tempalg; - char keynamedata[1024], algdata[1024]; - isc_buffer_t keynamesrc, keynamebuf, algsrc, algbuf; - isc_buffer_t secretbuf; - - dns_name_init(&keyname, NULL); - - /* - * Create the key name. - */ - isc_buffer_init(&keynamesrc, key->keyid, strlen(key->keyid)); - isc_buffer_add(&keynamesrc, strlen(key->keyid)); - isc_buffer_init(&keynamebuf, keynamedata, sizeof(keynamedata)); - ret = dns_name_fromtext(&keyname, &keynamesrc, dns_rootname, - ISC_TRUE, &keynamebuf); - if (ret != ISC_R_SUCCESS) - goto failure; - - /* - * Create the algorithm. - */ - if (strcasecmp(key->algorithm, "hmac-md5") == 0) - alg = dns_tsig_hmacmd5_name; - else { - dns_name_init(&tempalg, NULL); - isc_buffer_init(&algsrc, key->algorithm, - strlen(key->algorithm)); - isc_buffer_add(&algsrc, strlen(key->algorithm)); - isc_buffer_init(&algbuf, algdata, sizeof(algdata)); - ret = dns_name_fromtext(&tempalg, &algsrc, - dns_rootname, - ISC_TRUE, &algbuf); - if (ret != ISC_R_SUCCESS) - goto failure; - alg = &tempalg; - } - - secretalloc = secretlen = strlen(key->secret) * 3 / 4; - secret = isc_mem_get(mctx, secretlen); - if (secret == NULL) { - ret = ISC_R_NOMEMORY; - goto failure; - } - isc_buffer_init(&secretbuf, secret, secretlen); - ret = isc_base64_decodestring(mctx, key->secret, &secretbuf); - if (ret != ISC_R_SUCCESS) - goto failure; - secretlen = isc_buffer_usedlength(&secretbuf); - - isc_stdtime_get(&now); - ret = dns_tsigkey_create(&keyname, alg, secret, secretlen, - ISC_FALSE, NULL, now, now, - mctx, ring, NULL); - isc_mem_put(mctx, secret, secretalloc); - secret = NULL; - if (ret != ISC_R_SUCCESS) - goto failure; - key = ISC_LIST_NEXT(key, next); - } - return (ISC_R_SUCCESS); - - failure: - if (secret != NULL) - isc_mem_put(mctx, secret, secretalloc); - return (ret); - -} - -isc_result_t -dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx, - isc_mem_t *mctx, dns_tsig_keyring_t **ringp) -{ - dns_c_kdeflist_t *keylist; - dns_tsig_keyring_t *ring = NULL; - isc_result_t result; - - result = dns_tsigkeyring_create(mctx, &ring); - if (result != ISC_R_SUCCESS) - return (result); - - keylist = NULL; - result = dns_c_ctx_getkdeflist(confctx, &keylist); - if (result == ISC_R_SUCCESS) - result = add_initial_keys(keylist, ring, mctx); - else if (result == ISC_R_NOTFOUND) - result = ISC_R_SUCCESS; - if (result != ISC_R_SUCCESS) - goto failure; - - if (confview != NULL) { - keylist = NULL; - result = dns_c_view_getkeydefs(confview, &keylist); - if (result == ISC_R_SUCCESS) - result = add_initial_keys(keylist, ring, mctx); - else if (result == ISC_R_NOTFOUND) - result = ISC_R_SUCCESS; - if (result != ISC_R_SUCCESS) - goto failure; - } - - *ringp = ring; - return (ISC_R_SUCCESS); - - failure: - dns_tsigkeyring_destroy(&ring); - return (result); -} diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c deleted file mode 100644 index 934be8fdf2..0000000000 --- a/lib/dns/zoneconf.c +++ /dev/null @@ -1,520 +0,0 @@ -/* - * Copyright (C) 1999, 2000 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: zoneconf.c,v 1.68 2000/11/11 01:05:43 gson Exp $ */ - -#include - -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include -#include - -/* - * These are BIND9 server defaults, not necessarily identical to the - * library defaults defined in zone.c. - */ -#define MAX_XFER_TIME (2*3600) /* Documented default is 2 hours. */ -#define DNS_DEFAULT_IDLEIN 3600 /* 1 hour */ -#define DNS_DEFAULT_IDLEOUT 3600 /* 1 hour */ - -#define RETERR(x) do { \ - isc_result_t _r = (x); \ - if (_r != ISC_R_SUCCESS) \ - return (_r); \ - } while (0) - -/* - * Convenience function for configuring a single zone ACL. - */ -static isc_result_t -configure_zone_acl(dns_c_zone_t *czone, dns_c_ctx_t *cctx, dns_c_view_t *cview, - dns_aclconfctx_t *aclconfctx, dns_zone_t *zone, - isc_result_t (*getcacl)(dns_c_zone_t *, - dns_c_ipmatchlist_t **), - isc_result_t (*getviewcacl)(dns_c_view_t * - , dns_c_ipmatchlist_t **), - isc_result_t (*getglobalcacl)(dns_c_ctx_t *, - dns_c_ipmatchlist_t **), - void (*setzacl)(dns_zone_t *, dns_acl_t *), - void (*clearzacl)(dns_zone_t *)) -{ - isc_result_t result; - dns_c_ipmatchlist_t *cacl; - dns_acl_t *dacl = NULL; - result = (*getcacl)(czone, &cacl); - if (result == ISC_R_NOTFOUND && getviewcacl != NULL && cview != NULL) { - result = (*getviewcacl)(cview, &cacl); - } - if (result == ISC_R_NOTFOUND && getglobalcacl != NULL) { - result = (*getglobalcacl)(cctx, &cacl); - } - if (result == ISC_R_SUCCESS) { - result = dns_acl_fromconfig(cacl, cctx, aclconfctx, - dns_zone_getmctx(zone), &dacl); - dns_c_ipmatchlist_detach(&cacl); - if (result != ISC_R_SUCCESS) - return (result); - (*setzacl)(zone, dacl); - dns_acl_detach(&dacl); - return (ISC_R_SUCCESS); - } else if (result == ISC_R_NOTFOUND) { - (*clearzacl)(zone); - return (ISC_R_SUCCESS); - } else { - return (result); - } -} - -/* - * Conver a config file zone type into a server zone type. - */ -static dns_zonetype_t -dns_zonetype_fromconf(dns_c_zonetype_t cztype) { - switch (cztype) { - case dns_c_zone_master: - return dns_zone_master; - case dns_c_zone_slave: - return dns_zone_slave; - case dns_c_zone_stub: - return dns_zone_stub; - default: - /* - * Hint and forward zones are not really zones; - * they should never get this far. - */ - INSIST(0); - return (dns_zone_none); /*NOTREACHED*/ - } -} - -/* - * Helper function for strtoargv(). Pardon the gratuitous recursion. - */ -static isc_result_t -strtoargvsub(isc_mem_t *mctx, char *s, unsigned int *argcp, - char ***argvp, unsigned int n) -{ - isc_result_t result; - - /* Discard leading whitespace. */ - while (*s == ' ' || *s == '\t') - s++; - - if (*s == '\0') { - /* We have reached the end of the string. */ - *argcp = n; - *argvp = isc_mem_get(mctx, n * sizeof(char *)); - if (*argvp == NULL) - return (ISC_R_NOMEMORY); - } else { - char *p = s; - while (*p != ' ' && *p != '\t' && *p != '\0') - p++; - if (*p != '\0') - *p++ = '\0'; - - result = strtoargvsub(mctx, p, argcp, argvp, n + 1); - if (result != ISC_R_SUCCESS) - return (result); - (*argvp)[n] = s; - } - return (ISC_R_SUCCESS); -} - -/* - * Tokenize the string "s" into whitespace-separated words, - * return the number of words in '*argcp' and an array - * of pointers to the words in '*argvp'. The caller - * must free the array using isc_mem_put(). The string - * is modified in-place. - */ -static isc_result_t -strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) { - return (strtoargvsub(mctx, s, argcp, argvp, 0)); -} - -isc_result_t -dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, - dns_c_zone_t *czone, dns_aclconfctx_t *ac, - dns_zone_t *zone) -{ - isc_result_t result; - isc_boolean_t boolean; - const char *filename = NULL; - dns_notifytype_t notifytype; -#ifdef notyet - dns_c_severity_t severity; -#endif - dns_c_iplist_t *iplist; - isc_sockaddr_t sockaddr; - isc_uint32_t uintval; - isc_sockaddr_t sockaddr_any4, sockaddr_any6; - dns_ssutable_t *ssutable = NULL; - char *cpval; - unsigned int dbargc; - char **dbargv; - static char default_dbtype[] = "rbt"; - isc_mem_t *mctx = dns_zone_getmctx(zone); - dns_dialuptype_t dialup; - isc_boolean_t statistics; - - isc_sockaddr_any(&sockaddr_any4); - isc_sockaddr_any6(&sockaddr_any6); - - /* - * Configure values common to all zone types. - */ - - dns_zone_setclass(zone, czone->zclass); - - dns_zone_settype(zone, dns_zonetype_fromconf(czone->ztype)); - - cpval = NULL; - result = dns_c_zone_getdatabase(czone, &cpval); -#ifdef notyet - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getdatabase(cview, &cpval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getdatabase(cview, &cpval); -#endif - if (result != ISC_R_SUCCESS) - cpval = default_dbtype; - RETERR(strtoargv(mctx, cpval, &dbargc, &dbargv)); - /* - * ANSI C is strange here. There is no logical reason why (char **) - * cannot be promoted automatically to (const char * const *) by the - * compiler w/o generating a warning. - */ - RETERR(dns_zone_setdbtype(zone, dbargc, (const char * const *)dbargv)); - isc_mem_put(mctx, dbargv, dbargc * sizeof(*dbargv)); - - result = dns_c_zone_getfile(czone, &filename); - if (result == ISC_R_SUCCESS) - RETERR(dns_zone_setdatabase(zone, filename)); - else if (czone->ztype != dns_c_zone_slave && - czone->ztype != dns_c_zone_stub) - return (result); - -#ifdef notyet - result = dns_c_zone_getchecknames(czone, &severity); - if (result == ISC_R_SUCCESS) - dns_zone_setchecknames(zone, severity); - else - dns_zone_setchecknames(zone, dns_c_severity_warn); -#endif - -#ifndef NOMINUM_PUBLIC - if (czone->ztype == dns_c_zone_slave) - RETERR(configure_zone_acl(czone, cctx, cview, ac, zone, - dns_c_zone_getallownotify, - dns_c_view_getallownotify, - dns_c_ctx_getallownotify, - dns_zone_setnotifyacl, - dns_zone_clearnotifyacl)); -#endif /* NOMINUM_PUBLIC */ - /* - * XXXAG This probably does not make sense for stubs. - */ - RETERR(configure_zone_acl(czone, cctx, cview, ac, zone, - dns_c_zone_getallowquery, - dns_c_view_getallowquery, - dns_c_ctx_getallowquery, - dns_zone_setqueryacl, - dns_zone_clearqueryacl)); - - result = dns_c_zone_getdialup(czone, &dialup); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getdialup(cview, &dialup); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getdialup(cctx, &dialup); - if (result != ISC_R_SUCCESS) - dialup = dns_dialuptype_no; - dns_zone_setdialup(zone, dialup); - - result = dns_c_zone_getstatistics(czone, &statistics); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getstatistics(cview, &statistics); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getstatistics(cctx, &statistics); - if (result != ISC_R_SUCCESS) - statistics = ISC_FALSE; - if (statistics) - dns_zone_startcounting(zone); - else - dns_zone_stopcounting(zone); - -#ifndef NOMINUM_PUBLIC - if (czone->ztype != dns_c_zone_stub) { - result = dns_c_zone_getmaxnames(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getmaxnames(cview, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxnames(cctx, &uintval); - if (result != ISC_R_SUCCESS) - uintval = 0; - dns_zone_setmaxnames(zone, uintval); - } - - if (czone->ztype == dns_c_zone_slave) { - result = dns_c_zone_getnotifyforward(czone, &boolean); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getnotifyforward(cview, &boolean); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getnotifyforward(cctx, &boolean); - if (result != ISC_R_SUCCESS) - boolean = ISC_FALSE; - dns_zone_setoption(zone, DNS_ZONEOPT_NOTIFYFORWARD, boolean); - } -#endif /* NOMINUM_PUBLIC */ - - /* - * Configure master functionality. This applies - * to primary masters (type "master") and slaves - * acting as masters (type "slave"), but not to stubs. - */ - if (czone->ztype != dns_c_zone_stub) { - result = dns_c_zone_getnotify(czone, ¬ifytype); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getnotify(cview, ¬ifytype); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getnotify(cctx, ¬ifytype); - if (result != ISC_R_SUCCESS) - notifytype = dns_notifytype_yes; - dns_zone_setnotifytype(zone, notifytype); - - iplist = NULL; - result = dns_c_zone_getalsonotify(czone, &iplist); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getalsonotify(cview, &iplist); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getalsonotify(cctx, &iplist); - if (result == ISC_R_SUCCESS) { - result = dns_zone_setalsonotify(zone, iplist->ips, - iplist->nextidx); - dns_c_iplist_detach(&iplist); - if (result != ISC_R_SUCCESS) - return (result); - - } else - RETERR(dns_zone_setalsonotify(zone, NULL, 0)); - - RETERR(configure_zone_acl(czone, cctx, cview, ac, zone, - dns_c_zone_getallowtransfer, - dns_c_view_gettransferacl, - dns_c_ctx_getallowtransfer, - dns_zone_setxfracl, - dns_zone_clearxfracl)); - - result = dns_c_zone_getmaxtranstimeout(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getmaxtransfertimeout(cview, - &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransfertimeout(cctx, - &uintval); - if (result != ISC_R_SUCCESS) - uintval = MAX_XFER_TIME; - dns_zone_setmaxxfrout(zone, uintval); - - result = dns_c_zone_getmaxtransidleout(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getmaxtransferidleout(cview, - &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidleout(cctx, - &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_DEFAULT_IDLEOUT; - dns_zone_setidleout(zone, uintval); - } - - /* - * Configure update-related options. These apply to - * primary masters only. - */ - if (czone->ztype == dns_c_zone_master) { - RETERR(configure_zone_acl(czone, cctx, NULL, ac, zone, - dns_c_zone_getallowupd, - NULL, NULL, - dns_zone_setupdateacl, - dns_zone_clearupdateacl)); - - result = dns_c_zone_getssuauth(czone, &ssutable); - if (result == ISC_R_SUCCESS) - dns_zone_setssutable(zone, ssutable); - - result = dns_c_zone_getsigvalidityinterval(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getsigvalidityinterval(cview, - &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getsigvalidityinterval(cctx, - &uintval); - if (result != ISC_R_SUCCESS) - uintval = 30 * 24 * 3600; - dns_zone_setsigvalidityinterval(zone, uintval); - } else if (czone->ztype == dns_c_zone_slave) { - RETERR(configure_zone_acl(czone, cctx, NULL, ac, zone, - dns_c_zone_getallowupdateforwarding, - dns_c_view_getallowupdateforwarding, - dns_c_ctx_getallowupdateforwarding, - dns_zone_setforwardacl, - dns_zone_clearforwardacl)); - } - - result = dns_c_zone_gettransfersource(czone, &sockaddr); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_gettransfersource(cview, &sockaddr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_gettransfersource(cctx, &sockaddr); - if (result != ISC_R_SUCCESS) - sockaddr = sockaddr_any4; - dns_zone_setxfrsource4(zone, &sockaddr); - - result = dns_c_zone_gettransfersourcev6(czone, &sockaddr); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_gettransfersourcev6(cview, &sockaddr); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_gettransfersourcev6(cctx, &sockaddr); - if (result != ISC_R_SUCCESS) - sockaddr = sockaddr_any6; - dns_zone_setxfrsource6(zone, &sockaddr); - - /* - * Configure slave functionality. - */ - switch (czone->ztype) { - case dns_c_zone_slave: - case dns_c_zone_stub: - iplist = NULL; - result = dns_c_zone_getmasterips(czone, &iplist); - if (result == ISC_R_SUCCESS) -#ifndef NOMINUM_PUBLIC - result = dns_zone_setmasterswithkeys(zone, - iplist->ips, - iplist->keys, - iplist->nextidx); -#else /* NOMINUM_PUBLIC */ - result = dns_zone_setmasters(zone, iplist->ips, - iplist->nextidx); -#endif /* NOMINUM_PUBLIC */ - else - result = dns_zone_setmasters(zone, NULL, 0); - RETERR(result); - - result = dns_c_zone_getmaxtranstimein(czone, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransfertimein(cctx, - &uintval); - if (result != ISC_R_SUCCESS) - uintval = MAX_XFER_TIME; - dns_zone_setmaxxfrin(zone, uintval); - - result = dns_c_zone_getmaxtransidlein(czone, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxtransferidlein(cctx, - &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_DEFAULT_IDLEIN; - dns_zone_setidlein(zone, uintval); - - result = dns_c_zone_getmaxrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getmaxrefreshtime(cview, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxrefreshtime(cctx, &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_ZONE_MAXREFRESH; - dns_zone_setmaxrefreshtime(zone, uintval); - - result = dns_c_zone_getminrefreshtime(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getminrefreshtime(cview, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getminrefreshtime(cctx, &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_ZONE_MINREFRESH; - dns_zone_setminrefreshtime(zone, uintval); - - result = dns_c_zone_getmaxretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getmaxretrytime(cview, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getmaxretrytime(cctx, &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_ZONE_MAXRETRY; - dns_zone_setmaxretrytime(zone, uintval); - - result = dns_c_zone_getminretrytime(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) - result = dns_c_view_getminretrytime(cview, &uintval); - if (result != ISC_R_SUCCESS) - result = dns_c_ctx_getminretrytime(cctx, &uintval); - if (result != ISC_R_SUCCESS) - uintval = DNS_ZONE_MINRETRY; - dns_zone_setminretrytime(zone, uintval); - - break; - - default: - break; - } - - return (ISC_R_SUCCESS); -} - -isc_boolean_t -dns_zone_reusable(dns_zone_t *zone, dns_c_zone_t *czone) { - const char *cfilename; - const char *zfilename; - - if (dns_zonetype_fromconf(czone->ztype) != dns_zone_gettype(zone)) - return (ISC_FALSE); - - cfilename = NULL; - (void) dns_c_zone_getfile(czone, &cfilename); - zfilename = dns_zone_getdatabase(zone); - if (cfilename == NULL || zfilename == NULL || - strcmp(cfilename, zfilename) != 0) - return (ISC_FALSE); - - return (ISC_TRUE); -} - -isc_result_t -dns_zonemgr_configure(dns_c_ctx_t *cctx, dns_zonemgr_t *zmgr) { - isc_uint32_t val; - isc_result_t result; - - result = dns_c_ctx_gettransfersin(cctx, &val); - if (result != ISC_R_SUCCESS) - val = 10; - dns_zonemgr_settransfersin(zmgr, val); - - result = dns_c_ctx_gettransfersperns(cctx, &val); - if (result != ISC_R_SUCCESS) - val = 2; - dns_zonemgr_settransfersperns(zmgr, val); - - return (ISC_R_SUCCESS); -} - diff --git a/util/copyrights b/util/copyrights index 349d0cd185..8a2eb10248 100644 --- a/util/copyrights +++ b/util/copyrights @@ -33,6 +33,7 @@ ./bin/lwresd/process_noop.c C 2000 ./bin/named/.cvsignore X 1999,2000 ./bin/named/Makefile.in MAKE 1998,1999,2000 +./bin/named/aclconf.c C 1999,2000 ./bin/named/client.c C 1999,2000 ./bin/named/include/named/client.h C 1999,2000 ./bin/named/include/named/globals.h C 1999,2000 @@ -71,12 +72,15 @@ ./bin/named/query.c C 1999,2000 ./bin/named/server.c C 1999,2000 ./bin/named/sortlist.c C 2000 +./bin/named/tkeyconf.c C 1999,2000 +./bin/named/tsigconf.c C 1999,2000 ./bin/named/unix/.cvsignore X 1999,2000 ./bin/named/unix/Makefile.in MAKE 1999,2000 ./bin/named/unix/include/named/os.h C 1999,2000 ./bin/named/unix/os.c C 1999,2000 ./bin/named/update.c C 1999,2000 ./bin/named/xfrout.c C 1999,2000 +./bin/named/zoneconf.c C 1999,2000 ./bin/nsupdate/.cvsignore X 2000 ./bin/nsupdate/Makefile.in MAKE 2000 ./bin/nsupdate/nsupdate.c C 2000 @@ -817,7 +821,6 @@ ./lib/dns/Makefile.in MAKE 1998,1999,2000 ./lib/dns/a6.c C 1999,2000 ./lib/dns/acl.c C 1999,2000 -./lib/dns/aclconf.c C 1999,2000 ./lib/dns/adb.c C 1999,2000 ./lib/dns/api X 1999,2000 ./lib/dns/byaddr.c C 2000 @@ -1084,16 +1087,13 @@ ./lib/dns/tcpmsg.c C 1999,2000 ./lib/dns/time.c C 1998,1999,2000 ./lib/dns/tkey.c C 1999,2000 -./lib/dns/tkeyconf.c C 1999,2000 ./lib/dns/tsig.c C 1999,2000 -./lib/dns/tsigconf.c C 1999,2000 ./lib/dns/ttl.c C 1999,2000 ./lib/dns/validator.c C 2000 ./lib/dns/version.c C 1998,1999,2000 ./lib/dns/view.c C 1999,2000 ./lib/dns/xfrin.c C 1999,2000 ./lib/dns/zone.c C 1999,2000 -./lib/dns/zoneconf.c C 1999,2000 ./lib/dns/zt.c C 1999,2000 ./lib/isc/.cvsignore X 1999,2000 ./lib/isc/Makefile.in MAKE 1998,1999,2000