diff --git a/bin/named/server.c b/bin/named/server.c index f07b070ad5..9c1720a2c5 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.244 2000/11/10 03:05:36 gson Exp $ */ +/* $Id: server.c,v 1.245 2000/11/10 03:41:05 gson Exp $ */ #include @@ -636,6 +636,11 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_c_ctx_getallowrecursion, &view->recursionacl)); + CHECK(configure_view_acl(cview, cctx, actx, ns_g_mctx, + dns_c_view_getsortlist, + dns_c_ctx_getsortlist, + &view->sortlist)); + result = ISC_R_NOTFOUND; if (cview != NULL) result = dns_c_view_getrequestixfr(cview, &view->requestixfr); diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 2dd1c03cfb..8382a9e4c5 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: conf.sh.in,v 1.16 2000/11/10 03:05:50 bwelling Exp $ +# $Id: conf.sh.in,v 1.17 2000/11/10 03:41:08 gson Exp $ # # Common configuration data for system tests, to be sourced into @@ -39,8 +39,8 @@ KEYGEN=$TOP/bin/dnssec/dnssec-keygen SIGNER=$TOP/bin/dnssec/dnssec-signzone KEYSIGNER=$TOP/bin/dnssec/dnssec-signkey KEYSETTOOL=$TOP/bin/dnssec/dnssec-makekeyset -SUBDIRS="dnssec forward glue limits lwresd notify nsupdate resolver stub \ - unknown upforwd views xfer xferquota" +SUBDIRS="dnssec forward glue limits lwresd notify nsupdate resolver \ + sortlist stub unknown upforwd views xfer xferquota" # PERL will be an empty string if no perl interpreter was found. PERL=@PERL@ diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index 6cc5e76221..c54b48bde9 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdataset.h,v 1.36 2000/09/08 21:35:45 gson Exp $ */ +/* $Id: rdataset.h,v 1.37 2000/11/10 03:41:07 gson Exp $ */ #ifndef DNS_RDATASET_H #define DNS_RDATASET_H 1 @@ -338,6 +338,24 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, * dns_name_towire(). */ +isc_result_t +dns_rdataset_towiresorted(dns_rdataset_t *rdataset, + dns_name_t *owner_name, + dns_compress_t *cctx, + isc_buffer_t *target, + dns_rdatasetorderfunc_t order, + void *order_arg, + unsigned int *countp); +/* + * Like dns_rdataset_towire(), but sorting the rdatasets according to + * the integer value returned by 'order' when called witih the rdataset + * and 'order_arg' as arguments. + * + * Requires: + * All the requirements of dns_rdataset_towire(), and + * that order_arg is NULL if and only if order is NULL. + */ + isc_result_t dns_rdataset_additionaldata(dns_rdataset_t *rdataset, dns_additionaldatafunc_t add, void *arg);