From fb827ed6df9a473770fb69a75a455b4ad0d14f52 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 18 Jul 2005 06:03:01 +0000 Subject: [PATCH] 9.4/HEAD sync --- CHANGES | 4 +- bin/dnssec/dnssec-signzone.c | 4 +- bin/named/include/named/client.h | 4 +- bin/named/include/named/interfacemgr.h | 7 +- bin/named/interfacemgr.c | 16 +- bin/named/update.c | 4 +- lib/bind/configure | 5 +- lib/bind/configure.in | 5 +- lib/bind/include/resolv.h | 4 +- lib/dns/Makefile.in | 6 +- lib/dns/include/dns/db.h | 508 ++++++++++++------------- lib/dns/include/dns/forward.h | 6 +- lib/dns/include/dns/rdataset.h | 57 ++- lib/dns/include/dns/resolver.h | 4 +- lib/dns/include/dns/view.h | 6 +- lib/dns/include/dns/zt.h | 48 +-- lib/dns/rbtdb.c | 4 +- lib/isc/include/isc/sockaddr.h | 39 +- lib/isc/include/isc/socket.h | 12 +- lib/isc/unix/include/isc/net.h | 8 +- lib/isccfg/namedconf.c | 4 +- win32utils/readme1st.txt | 6 +- 22 files changed, 377 insertions(+), 384 deletions(-) diff --git a/CHANGES b/CHANGES index e76acc47eb..cd4458586a 100644 --- a/CHANGES +++ b/CHANGES @@ -498,7 +498,7 @@ 1727. [bug] named-checkzone: check-names support didn't match documentation. -1726. [port] aix5: add support for aix5 +1726. [port] aix5: add support for aix5. 1725. [port] linux: update error message on interaction of threads, capabilities and setuid support (named -u). [RT #12541] @@ -853,7 +853,7 @@ 1604. [bug] A xfrout_ctx_create() failure would result in xfrout_ctx_destroy() being called with a - partially initaliased structure. + partially initialized structure. 1603. [bug] nsupdate: set interactive based on isatty(). [RT# 10929] diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 7c1eabfe17..126c7056f6 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signzone.c,v 1.189 2005/06/28 02:55:09 marka Exp $ */ +/* $Id: dnssec-signzone.c,v 1.190 2005/07/18 05:58:55 marka Exp $ */ /*! \file */ @@ -939,7 +939,7 @@ active_node(dns_dbnode_t *node) { isc_result_totext(result)); if (!active) { - /* + /*% * The node is empty of everything but NSEC / RRSIG records. */ for (result = dns_rdatasetiter_first(rdsiter); diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h index 6cec4d63cd..9b3c130a63 100644 --- a/bin/named/include/named/client.h +++ b/bin/named/include/named/client.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.h,v 1.74 2005/06/07 00:16:00 marka Exp $ */ +/* $Id: client.h,v 1.75 2005/07/18 05:58:57 marka Exp $ */ #ifndef NAMED_CLIENT_H #define NAMED_CLIENT_H 1 @@ -342,7 +342,7 @@ isc_boolean_t ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey, isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, dns_rdataclass_t rdclass, void *arg); -/* +/*% * Isself callback. */ diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h index 55904308f1..20ff60f21c 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/bin/named/include/named/interfacemgr.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.h,v 1.30 2005/04/27 04:55:57 sra Exp $ */ +/* $Id: interfacemgr.h,v 1.31 2005/07/18 05:58:57 marka Exp $ */ #ifndef NAMED_INTERFACEMGR_H #define NAMED_INTERFACEMGR_H 1 @@ -64,7 +64,7 @@ #define IFACE_MAGIC ISC_MAGIC('I',':','-',')') #define NS_INTERFACE_VALID(t) ISC_MAGIC_VALID(t, IFACE_MAGIC) -#define NS_INTERFACEFLAG_ANYADDR 0x01U /* bound to "any" address */ +#define NS_INTERFACEFLAG_ANYADDR 0x01U /*%< bound to "any" address */ /*% The nameserver interface structure */ struct ns_interface { @@ -78,7 +78,8 @@ struct ns_interface { char name[32]; /*%< Null terminated. */ dns_dispatch_t * udpdispatch; /*%< UDP dispatcher. */ isc_socket_t * tcpsocket; /*%< TCP socket. */ - int ntcptarget; /*%< Desired number of concurrent TCP accepts */ + int ntcptarget; /*%< Desired number of concurrent + TCP accepts */ int ntcpcurrent; /*%< Current ditto, locked */ ns_clientmgr_t * clientmgr; /*%< Client manager. */ ISC_LINK(ns_interface_t) link; diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index 60072df2e6..3322f541c9 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.81 2005/04/27 04:55:50 sra Exp $ */ +/* $Id: interfacemgr.c,v 1.82 2005/07/18 05:58:56 marka Exp $ */ /*! \file */ @@ -41,18 +41,18 @@ /*% nameserver interface manager structure */ struct ns_interfacemgr { - unsigned int magic; /*% Magic number. */ + unsigned int magic; /*%< Magic number. */ int references; isc_mutex_t lock; - isc_mem_t * mctx; /*% Memory context. */ - isc_taskmgr_t * taskmgr; /*% Task manager. */ - isc_socketmgr_t * socketmgr; /*% Socket manager. */ + isc_mem_t * mctx; /*%< Memory context. */ + isc_taskmgr_t * taskmgr; /*%< Task manager. */ + isc_socketmgr_t * socketmgr; /*%< Socket manager. */ dns_dispatchmgr_t * dispatchmgr; - unsigned int generation; /*% Current generation no. */ + unsigned int generation; /*%< Current generation no. */ ns_listenlist_t * listenon4; ns_listenlist_t * listenon6; - dns_aclenv_t aclenv; /*% Localhost/localnets ACLs */ - ISC_LIST(ns_interface_t) interfaces; /*% List of interfaces. */ + dns_aclenv_t aclenv; /*%< Localhost/localnets ACLs */ + ISC_LIST(ns_interface_t) interfaces; /*%< List of interfaces. */ ISC_LIST(isc_sockaddr_t) listenon; }; diff --git a/bin/named/update.c b/bin/named/update.c index a2c0794084..04661de01e 100644 --- a/bin/named/update.c +++ b/bin/named/update.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.122 2005/05/19 04:59:00 marka Exp $ */ +/* $Id: update.c,v 1.123 2005/07/18 05:58:56 marka Exp $ */ #include @@ -980,7 +980,7 @@ type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { ISC_TRUE : ISC_FALSE); } -/* +/*% * Return true iff 'db_rr' is neither a RRSIG nor a NSEC. */ static isc_boolean_t diff --git a/lib/bind/configure b/lib/bind/configure index 04affc1526..8c956e83bf 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.106 . +# From configure.in Revision: 1.107 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -30638,9 +30638,6 @@ case "$host" in *-osf5.1|*-osf5.1b) hack_shutup_in6addr_init_macros=yes ;; - *-osf5.1) - hack_shutup_in6addr_init_macros=yes - ;; *-solaris2.8) hack_shutup_in6addr_init_macros=yes ;; diff --git a/lib/bind/configure.in b/lib/bind/configure.in index dc498f7081..91208ac918 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.106 $) +AC_REVISION($Revision: 1.107 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -2255,9 +2255,6 @@ case "$host" in *-osf5.1|*-osf5.1b) hack_shutup_in6addr_init_macros=yes ;; - *-osf5.1) - hack_shutup_in6addr_init_macros=yes - ;; *-solaris2.8) hack_shutup_in6addr_init_macros=yes ;; diff --git a/lib/bind/include/resolv.h b/lib/bind/include/resolv.h index 483fe10ca2..fd8aa374de 100644 --- a/lib/bind/include/resolv.h +++ b/lib/bind/include/resolv.h @@ -50,7 +50,7 @@ /*% * @(#)resolv.h 8.1 (Berkeley) 6/2/93 - * $Id: resolv.h,v 1.21 2005/04/27 04:56:16 sra Exp $ + * $Id: resolv.h,v 1.22 2005/07/18 05:58:57 marka Exp $ */ #ifndef _RESOLV_H_ @@ -229,7 +229,7 @@ union res_sockaddr_union { #define RES_IPV4ONLY 0x00000002 /*%< IPv4 only */ #define RES_IPV6ONLY 0x00000004 /*%< IPv6 only */ -/* +/*% * Resolver options (keep these in synch with res_debug.c, please) */ #define RES_INIT 0x00000001 /*%< address initialized */ diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 248f874649..872307d4a1 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.149 2004/12/21 10:45:16 jinmei Exp $ +# $Id: Makefile.in,v 1.150 2005/07/18 05:58:58 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -43,8 +43,8 @@ LIBS = @LIBS@ # Alphabetically -DSTOBJS = dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \ - gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ \ +DSTOBJS = dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \ + gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ \ openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \ opensslrsa_link.@O@ diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index b11cb2d93e..cefa8a7501 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: db.h,v 1.82 2005/06/28 02:55:09 marka Exp $ */ +/* $Id: db.h,v 1.83 2005/07/18 05:58:58 marka Exp $ */ #ifndef DNS_DB_H #define DNS_DB_H 1 @@ -34,20 +34,20 @@ * XXX more XXX * * MP: - *\li The module ensures appropriate synchronization of data structures it + * \li The module ensures appropriate synchronization of data structures it * creates and manipulates. * * Reliability: - *\li No anticipated impact. + * \li No anticipated impact. * * Resources: - *\li TBS + * \li TBS * * Security: - *\li No anticipated impact. + * \li No anticipated impact. * * Standards: - *\li None. + * \li None. */ /***** @@ -227,34 +227,34 @@ dns_db_create(isc_mem_t *mctx, const char *db_type, dns_name_t *origin, * Create a new database using implementation 'db_type'. * * Notes: - *\li All names in the database must be subdomains of 'origin' and in class + * \li All names in the database must be subdomains of 'origin' and in class * 'rdclass'. The database makes its own copy of the origin, so the * caller may do whatever they like with 'origin' and its storage once the * call returns. * - *\li DB implementation-specific parameters are passed using argc and argv. + * \li DB implementation-specific parameters are passed using argc and argv. * * Requires: * - *\li dbp != NULL and *dbp == NULL + * \li dbp != NULL and *dbp == NULL * - *\li 'origin' is a valid absolute domain name. + * \li 'origin' is a valid absolute domain name. * - *\li mctx is a valid memory context + * \li mctx is a valid memory context * * Ensures: * - *\li A copy of 'origin' has been made for the databases use, and the + * \li A copy of 'origin' has been made for the databases use, and the * caller is free to do whatever they want with the name and storage * associated with 'origin'. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY - *\li #ISC_R_NOTFOUND db_type not found + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY + * \li #ISC_R_NOTFOUND db_type not found * - *\li Many other errors are possible, depending on what db_type was + * \li Many other errors are possible, depending on what db_type was * specified. */ @@ -265,13 +265,13 @@ dns_db_attach(dns_db_t *source, dns_db_t **targetp); * * Requires: * - *\li 'source' is a valid database. + * \li 'source' is a valid database. * - *\li 'targetp' points to a NULL dns_db_t *. + * \li 'targetp' points to a NULL dns_db_t *. * * Ensures: * - *\li *targetp is attached to source. + * \li *targetp is attached to source. */ void @@ -281,13 +281,13 @@ dns_db_detach(dns_db_t **dbp); * * Requires: * - *\li 'dbp' points to a valid database. + * \li 'dbp' points to a valid database. * * Ensures: * - *\li *dbp is NULL. + * \li *dbp is NULL. * - *\li If '*dbp' is the last reference to the database, + * \li If '*dbp' is the last reference to the database, * all resources used by the database will be freed */ @@ -309,11 +309,11 @@ dns_db_iscache(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: - *\li #ISC_TRUE 'db' has cache semantics - *\li #ISC_FALSE otherwise + * \li #ISC_TRUE 'db' has cache semantics + * \li #ISC_FALSE otherwise */ isc_boolean_t @@ -323,11 +323,11 @@ dns_db_iszone(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: - *\li #ISC_TRUE 'db' has zone semantics - *\li #ISC_FALSE otherwise + * \li #ISC_TRUE 'db' has zone semantics + * \li #ISC_FALSE otherwise */ isc_boolean_t @@ -337,11 +337,11 @@ dns_db_isstub(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: - *\li #ISC_TRUE 'db' has zone semantics - *\li #ISC_FALSE otherwise + * \li #ISC_TRUE 'db' has zone semantics + * \li #ISC_FALSE otherwise */ isc_boolean_t @@ -351,11 +351,11 @@ dns_db_issecure(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database with zone semantics. + * \li 'db' is a valid database with zone semantics. * * Returns: - *\li #ISC_TRUE 'db' is secure. - *\li #ISC_FALSE 'db' is not secure. + * \li #ISC_TRUE 'db' is secure. + * \li #ISC_FALSE 'db' is not secure. */ dns_name_t * @@ -367,11 +367,11 @@ dns_db_origin(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: * - *\li The origin of the database. + * \li The origin of the database. */ dns_rdataclass_t @@ -381,11 +381,11 @@ dns_db_class(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: * - *\li The class of the database. + * \li The class of the database. */ isc_result_t @@ -396,26 +396,26 @@ dns_db_beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li This is the first attempt to load 'db'. + * \li This is the first attempt to load 'db'. * - *\li addp != NULL && *addp == NULL + * \li addp != NULL && *addp == NULL * - *\li dbloadp != NULL && *dbloadp == NULL + * \li dbloadp != NULL && *dbloadp == NULL * * Ensures: * - *\li On success, *addp will be a valid dns_addrdatasetfunc_t suitable + * \li On success, *addp will be a valid dns_addrdatasetfunc_t suitable * for loading 'db'. *dbloadp will be a valid DB load context which * should be used as 'arg' when *addp is called. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used, syntax errors in the master file, etc. */ @@ -426,20 +426,20 @@ dns_db_endload(dns_db_t *db, dns_dbload_t **dbloadp); * * Requires: * - *\li 'db' is a valid database that is being loaded. + * \li 'db' is a valid database that is being loaded. * - *\li dbloadp != NULL and *dbloadp is a valid database load context. + * \li dbloadp != NULL and *dbloadp is a valid database load context. * * Ensures: * - *\li *dbloadp == NULL + * \li *dbloadp == NULL * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used, syntax errors in the master file, etc. */ @@ -452,7 +452,7 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format); * Load master file 'filename' into 'db'. * * Notes: - *\li This routine is equivalent to calling + * \li This routine is equivalent to calling * *\code * dns_db_beginload(); @@ -462,16 +462,16 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li This is the first attempt to load 'db'. + * \li This is the first attempt to load 'db'. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used, syntax errors in the master file, etc. */ @@ -486,16 +486,16 @@ dns_db_dump2(dns_db_t *db, dns_dbversion_t *version, const char *filename, * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'version' is a valid version. + * \li 'version' is a valid version. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used, OS file errors, etc. */ @@ -510,13 +510,13 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp); * * Requires: * - *\li 'db' is a valid database with zone semantics. + * \li 'db' is a valid database with zone semantics. * - *\li versionp != NULL && *verisonp == NULL + * \li versionp != NULL && *verisonp == NULL * * Ensures: * - *\li On success, '*versionp' is attached to the current version. + * \li On success, '*versionp' is attached to the current version. * */ @@ -527,20 +527,20 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp); * * Requires: * - *\li 'db' is a valid database with zone semantics. + * \li 'db' is a valid database with zone semantics. * - *\li versionp != NULL && *verisonp == NULL + * \li versionp != NULL && *verisonp == NULL * * Ensures: * - *\li On success, '*versionp' is attached to the current version. + * \li On success, '*versionp' is attached to the current version. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -552,15 +552,15 @@ dns_db_attachversion(dns_db_t *db, dns_dbversion_t *source, * * Requires: * - *\li 'db' is a valid database with zone semantics. + * \li 'db' is a valid database with zone semantics. * - *\li source is a valid open version + * \li source is a valid open version * - *\li targetp != NULL && *targetp == NULL + * \li targetp != NULL && *targetp == NULL * * Ensures: * - *\li '*targetp' is attached to source. + * \li '*targetp' is attached to source. */ void @@ -576,25 +576,25 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, * * Requires: * - *\li 'db' is a valid database with zone semantics. + * \li 'db' is a valid database with zone semantics. * - *\li '*versionp' refers to a valid version. + * \li '*versionp' refers to a valid version. * - *\li If committing a writable version, then there must be no other + * \li If committing a writable version, then there must be no other * outstanding references to the version (e.g. an active rdataset * iterator). * * Ensures: * - *\li *versionp == NULL + * \li *versionp == NULL * - *\li If *versionp is a read-write version, and commit is ISC_TRUE, then + * \li If *versionp is a read-write version, and commit is ISC_TRUE, then * the version will become the current version. If !commit, then all * changes made in the version will be undone, and the version will * not become the current version. */ -/*%<** +/*** *** Node Methods ***/ @@ -605,33 +605,33 @@ dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, * Find the node with name 'name'. * * Notes: - *\li If 'create' is ISC_TRUE and no node with name 'name' exists, then + * \li If 'create' is ISC_TRUE and no node with name 'name' exists, then * such a node will be created. * - *\li This routine is for finding or creating a node with the specified + * \li This routine is for finding or creating a node with the specified * name. There are no partial matches. It is not suitable for use * in building responses to ordinary DNS queries; clients which wish * to do that should use dns_db_find() instead. * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'name' is a valid, non-empty, absolute name. + * \li 'name' is a valid, non-empty, absolute name. * - *\li nodep != NULL && *nodep == NULL + * \li nodep != NULL && *nodep == NULL * * Ensures: * - *\li On success, *nodep is attached to the node with name 'name'. + * \li On success, *nodep is attached to the node with name 'name'. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOTFOUND If !create and name not found. - *\li #ISC_R_NOMEMORY Can only happen if create is ISC_TRUE. + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOTFOUND If !create and name not found. + * \li #ISC_R_NOMEMORY Can only happen if create is ISC_TRUE. * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -645,39 +645,39 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * * Notes: * - *\li If type == dns_rdataset_any, then rdataset will not be bound. + * \li If type == dns_rdataset_any, then rdataset will not be bound. * - *\li If 'options' does not have #DNS_DBFIND_GLUEOK set, then no glue will + * \li If 'options' does not have #DNS_DBFIND_GLUEOK set, then no glue will * be returned. For zone databases, glue is as defined in RFC2181. * For cache databases, glue is any rdataset with a trust of * dns_trust_glue. * - *\li If 'options' does not have #DNS_DBFIND_PENDINGOK set, then no + * \li If 'options' does not have #DNS_DBFIND_PENDINGOK set, then no * pending data will be returned. This option is only meaningful for * cache databases. * - *\li If the #DNS_DBFIND_NOWILD option is set, then wildcard matching will + * \li If the #DNS_DBFIND_NOWILD option is set, then wildcard matching will * be disabled. This option is only meaningful for zone databases. * - *\li If the #DNS_DBFIND_FORCENSEC option is set, the database is assumed to + * \li If the #DNS_DBFIND_FORCENSEC option is set, the database is assumed to * have NSEC records, and these will be returned when appropriate. This * is only necessary when querying a database that was not secure * when created. * - *\li If the DNS_DBFIND_COVERINGNSEC option is set, then look for a + * \li If the DNS_DBFIND_COVERINGNSEC option is set, then look for a * NSEC record that potentially covers 'name' if a answer cannot * be found. Note the returned NSEC needs to be checked to ensure * that it is correct. This only affects answers returned from the * cache. * - *\li To respond to a query for SIG records, the caller should create a + * \li To respond to a query for SIG records, the caller should create a * rdataset iterator and extract the signatures from each rdataset. * - *\li Making queries of type ANY with #DNS_DBFIND_GLUEOK is not recommended, + * \li Making queries of type ANY with #DNS_DBFIND_GLUEOK is not recommended, * because the burden of determining whether a given rdataset is valid * glue or not falls upon the caller. * - *\li The 'now' field is ignored if 'db' is a zone database. If 'db' is a + * \li The 'now' field is ignored if 'db' is a zone database. If 'db' is a * cache database, an rdataset will not be found unless it expires after * 'now'. Any ANY query will not match unless at least one rdataset at * the node expires after 'now'. If 'now' is zero, then the current time @@ -685,15 +685,15 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'type' is not SIG, or a meta-RR type other than 'ANY' (e.g. 'OPT'). + * \li 'type' is not SIG, or a meta-RR type other than 'ANY' (e.g. 'OPT'). * - *\li 'nodep' is NULL, or nodep is a valid pointer and *nodep == NULL. + * \li 'nodep' is NULL, or nodep is a valid pointer and *nodep == NULL. * - *\li 'foundname' is a valid name with a dedicated buffer. + * \li 'foundname' is a valid name with a dedicated buffer. * - *\li 'rdataset' is NULL, or is a valid unassociated rdataset. + * \li 'rdataset' is NULL, or is a valid unassociated rdataset. * * Ensures, * on a non-error completion: @@ -708,10 +708,10 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * * Non-error results are: * - *\li #ISC_R_SUCCESS The desired node and type were + * \li #ISC_R_SUCCESS The desired node and type were * found. * - *\li #DNS_R_WILDCARD The desired node and type were + * \li #DNS_R_WILDCARD The desired node and type were * found after performing * wildcard matching. This is * only returned if the @@ -719,7 +719,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * option is set; otherwise * #ISC_R_SUCCESS is returned. * - *\li #DNS_R_GLUE The desired node and type were + * \li #DNS_R_GLUE The desired node and type were * found, but are glue. This * result can only occur if * the DNS_DBFIND_GLUEOK option @@ -734,7 +734,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * take care not to return invalid * glue to a client. * - *\li #DNS_R_DELEGATION The data requested is beneath + * \li #DNS_R_DELEGATION The data requested is beneath * a zone cut. node, foundname, * and rdataset reference the * NS RRset of the zone cut. @@ -742,7 +742,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * then this is the deepest known * delegation. * - *\li #DNS_R_ZONECUT type == dns_rdatatype_any, and + * \li #DNS_R_ZONECUT type == dns_rdatatype_any, and * the desired node is a zonecut. * The caller must take care not * to return inappropriate glue @@ -751,24 +751,24 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * database and DNS_DBFIND_GLUEOK * is set. * - *\li #DNS_R_DNAME The data requested is beneath + * \li #DNS_R_DNAME The data requested is beneath * a DNAME. node, foundname, * and rdataset reference the * DNAME RRset. * - *\li #DNS_R_CNAME The rdataset requested was not + * \li #DNS_R_CNAME The rdataset requested was not * found, but there is a CNAME * at the desired name. node, * foundname, and rdataset * reference the CNAME RRset. * - *\li #DNS_R_NXDOMAIN The desired name does not + * \li #DNS_R_NXDOMAIN The desired name does not * exist. * - *\li #DNS_R_NXRRSET The desired name exists, but + * \li #DNS_R_NXRRSET The desired name exists, but * the desired type does not. * - *\li #ISC_R_NOTFOUND The desired name does not + * \li #ISC_R_NOTFOUND The desired name does not * exist, and no delegation could * be found. This result can only * occur if 'db' is a cache @@ -776,34 +776,34 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, * use its nameserver(s) of last * resort (e.g. root hints). * - *\li #DNS_R_NCACHENXDOMAIN The desired name does not + * \li #DNS_R_NCACHENXDOMAIN The desired name does not * exist. 'node' is bound to the * cache node with the desired * name, and 'rdataset' contains * the negative caching proof. * - *\li #DNS_R_NCACHENXRRSET The desired type does not + * \li #DNS_R_NCACHENXRRSET The desired type does not * exist. 'node' is bound to the * cache node with the desired * name, and 'rdataset' contains * the negative caching proof. * - *\li #DNS_R_EMPTYNAME The name exists but there is + * \li #DNS_R_EMPTYNAME The name exists but there is * no data at the name. * - * DNS_R_COVERINGNSEC The returned data is a NSEC + * \li #DNS_R_COVERINGNSEC The returned data is a NSEC * that potentially covers 'name'. * * Error results: * - *\li #ISC_R_NOMEMORY + * \li #ISC_R_NOMEMORY * - *\li #DNS_R_BADDB Data that is required to be + * \li #DNS_R_BADDB Data that is required to be * present in the DB, e.g. an NSEC * record in a secure zone, is not * present. * - *\li Other results are possible, and should all be treated as + * \li Other results are possible, and should all be treated as * errors. */ @@ -817,39 +817,39 @@ dns_db_findzonecut(dns_db_t *db, dns_name_t *name, * * Notes: * - *\li If the #DNS_DBFIND_NOEXACT option is set, then the zonecut returned + * \li If the #DNS_DBFIND_NOEXACT option is set, then the zonecut returned * (if any) will be the deepest known ancestor of 'name'. * - *\li If 'now' is zero, then the current time will be used. + * \li If 'now' is zero, then the current time will be used. * * Requires: * - *\li 'db' is a valid database with cache semantics. + * \li 'db' is a valid database with cache semantics. * - *\li 'nodep' is NULL, or nodep is a valid pointer and *nodep == NULL. + * \li 'nodep' is NULL, or nodep is a valid pointer and *nodep == NULL. * - *\li 'foundname' is a valid name with a dedicated buffer. + * \li 'foundname' is a valid name with a dedicated buffer. * - *\li 'rdataset' is NULL, or is a valid unassociated rdataset. + * \li 'rdataset' is NULL, or is a valid unassociated rdataset. * - * Ensures, on a non-error completion: + * Ensures, on a non-error completion: * - *\li If nodep != NULL, then it is bound to the found node. + * \li If nodep != NULL, then it is bound to the found node. * - *\li If foundname != NULL, then it contains the full name of the - * found node. + * \li If foundname != NULL, then it contains the full name of the + * found node. * - *\li If rdataset != NULL and type != dns_rdatatype_any, then - * rdataset is bound to the found rdataset. + * \li If rdataset != NULL and type != dns_rdatatype_any, then + * rdataset is bound to the found rdataset. * - * Non-error results are: + * Non-error results are: * - * \li #ISC_R_SUCCESS + * \li #ISC_R_SUCCESS * - * \li #ISC_R_NOTFOUND + * \li #ISC_R_NOTFOUND * - * \li Other results are possible, and should all be treated as - * errors. + * \li Other results are possible, and should all be treated as + * errors. */ void @@ -859,15 +859,15 @@ dns_db_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'source' is a valid node. + * \li 'source' is a valid node. * - *\li 'targetp' points to a NULL dns_node_t *. + * \li 'targetp' points to a NULL dns_node_t *. * * Ensures: * - *\li *targetp is attached to source. + * \li *targetp is attached to source. */ void @@ -877,13 +877,13 @@ dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'nodep' points to a valid node. + * \li 'nodep' points to a valid node. * * Ensures: * - *\li *nodep is NULL. + * \li *nodep is NULL. */ isc_result_t @@ -895,9 +895,9 @@ dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now); * * Requires: * - *\li 'db' is a valid cache database. + * \li 'db' is a valid cache database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. */ void @@ -910,12 +910,12 @@ dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. */ -/*%<** +/*** *** DB Iterator Creation ***/ @@ -927,31 +927,31 @@ dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names, * * Notes: * - *\li If 'relative_names' is ISC_TRUE, then node names returned by the + * \li If 'relative_names' is ISC_TRUE, then node names returned by the * iterator will be relative to the iterator's current origin. If * #ISC_FALSE, then the node names will be absolute. * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li iteratorp != NULL && *iteratorp == NULL + * \li iteratorp != NULL && *iteratorp == NULL * * Ensures: * - *\li On success, *iteratorp will be a valid database iterator. + * \li On success, *iteratorp will be a valid database iterator. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY */ -/*%<** +/*** *** Rdataset Methods ***/ -/*%< +/* * XXXRTH Should we check for glue and pending data in dns_db_findrdataset()? */ @@ -966,41 +966,41 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * * Notes: * - *\li If 'version' is NULL, then the current version will be used. + * \li If 'version' is NULL, then the current version will be used. * - *\li Care must be used when using this routine to build a DNS response: + * \li Care must be used when using this routine to build a DNS response: * 'node' should have been found with dns_db_find(), not * dns_db_findnode(). No glue checking is done. No checking for * pending data is done. * - *\li The 'now' field is ignored if 'db' is a zone database. If 'db' is a + * \li The 'now' field is ignored if 'db' is a zone database. If 'db' is a * cache database, an rdataset will not be found unless it expires after * 'now'. If 'now' is zero, then the current time will be used. * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. * - *\li 'rdataset' is a valid, disassociated rdataset. + * \li 'rdataset' is a valid, disassociated rdataset. * - *\li 'sigrdataset' is a valid, disassociated rdataset, or it is NULL. + * \li 'sigrdataset' is a valid, disassociated rdataset, or it is NULL. * - *\li If 'covers' != 0, 'type' must be SIG. + * \li If 'covers' != 0, 'type' must be SIG. * - *\li 'type' is not a meta-RR type such as 'ANY' or 'OPT'. + * \li 'type' is not a meta-RR type such as 'ANY' or 'OPT'. * * Ensures: * - *\li On success, 'rdataset' is associated with the found rdataset. + * \li On success, 'rdataset' is associated with the found rdataset. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOTFOUND + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOTFOUND * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -1013,9 +1013,9 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * * Notes: * - *\li If 'version' is NULL, then the current version will be used. + * \li If 'version' is NULL, then the current version will be used. * - *\li The 'now' field is ignored if 'db' is a zone database. If 'db' is a + * \li The 'now' field is ignored if 'db' is a zone database. If 'db' is a * cache database, an rdataset will not be found unless it expires after * 'now'. Any ANY query will not match unless at least one rdataset at * the node expires after 'now'. If 'now' is zero, then the current time @@ -1023,22 +1023,22 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. * - *\li iteratorp != NULL && *iteratorp == NULL + * \li iteratorp != NULL && *iteratorp == NULL * * Ensures: * - *\li On success, '*iteratorp' is a valid rdataset iterator. + * \li On success, '*iteratorp' is a valid rdataset iterator. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOTFOUND + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOTFOUND * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -1051,7 +1051,7 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * * Notes: * - *\li If the database has zone semantics, the #DNS_DBADD_MERGE option is set, + * \li If the database has zone semantics, the #DNS_DBADD_MERGE option is set, * and an rdataset of the same type as 'rdataset' already exists at * 'node' then the contents of 'rdataset' will be merged with the existing * rdataset. If the option is not set, then rdataset will replace any @@ -1064,40 +1064,40 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * the old and new rdata sets. If #DNS_DBADD_EXACTTTL is set then both * the old and new rdata sets must have the same ttl. * - *\li The 'now' field is ignored if 'db' is a zone database. If 'db' is + * \li The 'now' field is ignored if 'db' is a zone database. If 'db' is * a cache database, then the added rdataset will expire no later than * now + rdataset->ttl. * - *\li If 'addedrdataset' is not NULL, then it will be attached to the + * \li If 'addedrdataset' is not NULL, then it will be attached to the * resulting new rdataset in the database, or to the existing data if * the existing data was better. * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. * - *\li 'rdataset' is a valid, associated rdataset with the same class + * \li 'rdataset' is a valid, associated rdataset with the same class * as 'db'. * - *\li 'addedrdataset' is NULL, or a valid, unassociated rdataset. + * \li 'addedrdataset' is NULL, or a valid, unassociated rdataset. * - *\li The database has zone semantics and 'version' is a valid + * \li The database has zone semantics and 'version' is a valid * read-write version, or the database has cache semantics * and version is NULL. * - *\li If the database has cache semantics, the #DNS_DBADD_MERGE option must + * \li If the database has cache semantics, the #DNS_DBADD_MERGE option must * not be set. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #DNS_R_UNCHANGED The operation did not change anything. - *\li #ISC_R_NOMEMORY - *\li #DNS_R_NOTEXACT + * \li #ISC_R_SUCCESS + * \li #DNS_R_UNCHANGED The operation did not change anything. + * \li #ISC_R_NOMEMORY + * \li #DNS_R_NOTEXACT * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -1111,35 +1111,35 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, * * Notes: * - *\li If 'newrdataset' is not NULL, then it will be attached to the + * \li If 'newrdataset' is not NULL, then it will be attached to the * resulting new rdataset in the database, unless the rdataset has * become nonexistent. If DNS_DBSUB_EXACT is set then all elements * of 'rdataset' must exist at 'node'. * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. * - *\li 'rdataset' is a valid, associated rdataset with the same class + * \li 'rdataset' is a valid, associated rdataset with the same class * as 'db'. * - *\li 'newrdataset' is NULL, or a valid, unassociated rdataset. + * \li 'newrdataset' is NULL, or a valid, unassociated rdataset. * - *\li The database has zone semantics and 'version' is a valid + * \li The database has zone semantics and 'version' is a valid * read-write version. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #DNS_R_UNCHANGED The operation did not change anything. - *\li #DNS_R_NXRRSET All rdata of the same type as those + * \li #ISC_R_SUCCESS + * \li #DNS_R_UNCHANGED The operation did not change anything. + * \li #DNS_R_NXRRSET All rdata of the same type as those * in 'rdataset' have been deleted. - *\li #DNS_R_NOTEXACT Some part of 'rdataset' did not + * \li #DNS_R_NOTEXACT Some part of 'rdataset' did not * exist and DNS_DBSUB_EXACT was set. * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -1153,32 +1153,32 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, * * Notes: * - *\li If 'type' is dns_rdatatype_any, then no rdatasets will exist in + * \li If 'type' is dns_rdatatype_any, then no rdatasets will exist in * 'version' (provided that the dns_db_deleterdataset() isn't followed * by one or more dns_db_addrdataset() calls). * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * - *\li 'node' is a valid node. + * \li 'node' is a valid node. * - *\li The database has zone semantics and 'version' is a valid + * \li The database has zone semantics and 'version' is a valid * read-write version, or the database has cache semantics * and version is NULL. * - *\li 'type' is not a meta-RR type, except for dns_rdatatype_any, which is + * \li 'type' is not a meta-RR type, except for dns_rdatatype_any, which is * allowed. * - *\li If 'covers' != 0, 'type' must be SIG. + * \li If 'covers' != 0, 'type' must be SIG. * * Returns: * - *\li #ISC_R_SUCCESS - *\li #DNS_R_UNCHANGED No rdatasets of 'type' existed before + * \li #ISC_R_SUCCESS + * \li #DNS_R_UNCHANGED No rdatasets of 'type' existed before * the operation was attempted. * - *\li Other results are possible, depending upon the database + * \li Other results are possible, depending upon the database * implementation used. */ @@ -1188,8 +1188,8 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp); * Get the current SOA serial number from a zone database. * * Requires: - * \li 'db' is a valid database with zone semantics. - * \li 'ver' is a valid version. + * \li 'db' is a valid database with zone semantics. + * \li 'ver' is a valid version. */ void @@ -1205,7 +1205,7 @@ dns_db_nodecount(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: * \li The number of nodes in the database @@ -1213,12 +1213,12 @@ dns_db_nodecount(dns_db_t *db); void dns_db_settask(dns_db_t *db, isc_task_t *task); -/* +/*%< * If task is set then the final detach maybe performed asynchronously. * * Requires: - * 'db' is a valid database. - * 'task' to be valid or NULL. + * \li 'db' is a valid database. + * \li 'task' to be valid or NULL. */ isc_boolean_t @@ -1229,11 +1229,11 @@ dns_db_ispersistent(dns_db_t *db); * * Requires: * - *\li 'db' is a valid database. + * \li 'db' is a valid database. * * Returns: - *\li #ISC_TRUE 'db' is persistent. - *\li #ISC_FALSE 'db' is not persistent. + * \li #ISC_TRUE 'db' is persistent. + * \li #ISC_FALSE 'db' is not persistent. */ isc_result_t @@ -1246,7 +1246,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, * * Requires: * - *\li 'name' is not NULL + * \li 'name' is not NULL * \li 'order' is a valid function pointer * \li 'mctx' is a valid memory context * \li dbimp != NULL && *dbimp == NULL @@ -1258,7 +1258,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, * * Ensures: * - *\li *dbimp points to an opaque structure which must be passed to + * \li *dbimp points to an opaque structure which must be passed to * dns_db_unregister(). */ @@ -1270,7 +1270,7 @@ dns_db_unregister(dns_dbimplementation_t **dbimp); * is called. * * Requires: - *\li dbimp != NULL && *dbimp == NULL + * \li dbimp != NULL && *dbimp == NULL * * Ensures: * @@ -1279,80 +1279,80 @@ dns_db_unregister(dns_dbimplementation_t **dbimp); isc_result_t dns_db_getsoanode(dns_db_t *db, dns_dbnode_t **nodep); -/* +/*%< * Get a cached SOA DB node corresponding to the DB's zone. * * Requires: * - * 'db' is a valid zone database. - * 'nodep' != NULL && '*nodep' == NULL + * \li 'db' is a valid zone database. + * \li 'nodep' != NULL && '*nodep' == NULL * * Ensures: - * On sucess, '*nodep' will point to a DB node for the SOA RR of 'db.' + * \li On sucess, '*nodep' will point to a DB node for the SOA RR of 'db.' * * Returns: - * ISC_R_SUCCESS - * ISC_R_NOTFOUND - an SOA RR node has not been cached in 'db' or SOA RR - * caching is not supported for 'db' + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOTFOUND - an SOA RR node has not been cached in 'db' or SOA RR + * caching is not supported for 'db' */ isc_result_t dns_db_setsoanode(dns_db_t *db, dns_dbnode_t *node); -/* +/*%< * Set an SOA DB node as cache corresponding to the DB's zone. If there is * already a node set in the DB, it will be detached and replaced with the * new one. * * Requires: * - * 'db' is a valid zone database. - * 'node' is a valid DB node. + * \li 'db' is a valid zone database. + * \li 'node' is a valid DB node. * * Ensures: - * On sucess, '*nodep' will point to a DB node for the SOA RR of 'db.' + * \li On sucess, '*nodep' will point to a DB node for the SOA RR of 'db.' * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - SOA RR caching is not supported for 'db' + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE - SOA RR caching is not supported for 'db' */ isc_result_t dns_db_getnsnode(dns_db_t *db, dns_dbnode_t **nodep); -/* +/*%< * Get a cached NS DB node corresponding to the DB's zone. * * Requires: * - * 'db' is a valid zone database. - * 'nodep' != NULL && '*nodep' == NULL + * \li 'db' is a valid zone database. + * \li 'nodep' != NULL && '*nodep' == NULL * * Ensures: - * On sucess, '*nodep' will point to a DB node for the NS RR of 'db.' + * \li On sucess, '*nodep' will point to a DB node for the NS RR of 'db.' * * Returns: - * ISC_R_SUCCESS - * ISC_R_NOTFOUND - an NS RR node has not been cached in 'db' or NS RR - * caching is not supported for 'db' + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOTFOUND - an NS RR node has not been cached in 'db' or NS RR + * caching is not supported for 'db' */ isc_result_t dns_db_setnsnode(dns_db_t *db, dns_dbnode_t *node); -/* +/*%< * Set an NS DB node as cache corresponding to the DB's zone. If there is * already a node set in the DB, it will be detached and replaced with the * new one. * * Requires: * - * 'db' is a valid zone database. - * 'node' is a valid DB node. + * \li 'db' is a valid zone database. + * \li 'node' is a valid DB node. * * Ensures: - * On sucess, '*nodep' will point to a DB node for the NS RR of 'db.' + * \li On sucess, '*nodep' will point to a DB node for the NS RR of 'db.' * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - NS RR caching is not supported for 'db' + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE - NS RR caching is not supported for 'db' */ ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h index bdbffe4452..38518140a3 100644 --- a/lib/dns/include/dns/forward.h +++ b/lib/dns/include/dns/forward.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: forward.h,v 1.6 2005/04/27 04:56:55 sra Exp $ */ +/* $Id: forward.h,v 1.7 2005/07/18 05:58:59 marka Exp $ */ #ifndef DNS_FORWARD_H #define DNS_FORWARD_H 1 @@ -44,8 +44,8 @@ dns_fwdtable_create(isc_mem_t *mctx, dns_fwdtable_t **fwdtablep); * \li fwdtablep != NULL && *fwdtablep == NULL * * Returns: - *\li #ISC_R_SUCCESS - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_NOMEMORY */ isc_result_t diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index f63658c038..755facbdec 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdataset.h,v 1.55 2005/04/27 04:56:58 sra Exp $ */ +/* $Id: rdataset.h,v 1.56 2005/07/18 05:58:59 marka Exp $ */ #ifndef DNS_RDATASET_H #define DNS_RDATASET_H 1 @@ -162,6 +162,7 @@ struct dns_rdataset { * Used by message.c to indicate that the rdataset's rdata had differing * TTL values, and the rdataset->ttl holds the smallest. */ + #define DNS_RDATASETATTR_QUESTION 0x00000001 #define DNS_RDATASETATTR_RENDERED 0x00000002 /*%< Used by message.c */ #define DNS_RDATASETATTR_ANSWERED 0x00000004 /*%< Used by server. */ @@ -507,7 +508,7 @@ dns_rdataset_getadditional(dns_rdataset_t *rdataset, dns_name_t *fname, dns_message_t *msg, isc_stdtime_t now); -/* +/*%< * Get cached additional information from the DB node for a particular * 'rdataset.' 'type' is one of dns_rdatasetadditional_fromauth, * dns_rdatasetadditional_fromcache, and dns_rdatasetadditional_fromglue, @@ -515,21 +516,20 @@ dns_rdataset_getadditional(dns_rdataset_t *rdataset, * be used for specifying a particular rdata type in the cached information. * * Requires: - * 'rdataset' is a valid rdataset. - * 'acache' can be NULL, in which case this function will simply return - * ISC_R_FAILURE. - * For the other pointers, see dns_acache_getentry(). + * \li 'rdataset' is a valid rdataset. + * \li 'acache' can be NULL, in which case this function will simply return + * ISC_R_FAILURE. + * \li For the other pointers, see dns_acache_getentry(). * * Ensures: - * See dns_acache_getentry(). + * \li See dns_acache_getentry(). * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - additional information caching is not supported. - * ISC_R_NOTFOUND - the corresponding DB node has not cached additional + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE - additional information caching is not supported. + * \li #ISC_R_NOTFOUND - the corresponding DB node has not cached additional * information for 'rdataset.' - * - * Any error that dns_acache_getentry() can return. + * \li Any error that dns_acache_getentry() can return. */ isc_result_t @@ -542,26 +542,25 @@ dns_rdataset_setadditional(dns_rdataset_t *rdataset, dns_dbversion_t *version, dns_dbnode_t *node, dns_name_t *fname); -/* +/*%< * Set cached additional information to the DB node for a particular * 'rdataset.' See dns_rdataset_getadditional for the semantics of 'type' * and 'qtype'. * * Requires: - * 'rdataset' is a valid rdataset. - * 'acache' can be NULL, in which case this function will simply return + * \li 'rdataset' is a valid rdataset. + * \li 'acache' can be NULL, in which case this function will simply return * ISC_R_FAILURE. - * For the other pointers, see dns_acache_setentry(). + * \li For the other pointers, see dns_acache_setentry(). * * Ensures: - * See dns_acache_setentry(). + * \li See dns_acache_setentry(). * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - additional information caching is not supported. - * ISC_R_NOMEMORY - * - * Any error that dns_acache_setentry() can return. + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE - additional information caching is not supported. + * \li #ISC_R_NOMEMORY + * \li Any error that dns_acache_setentry() can return. */ isc_result_t @@ -569,23 +568,23 @@ dns_rdataset_putadditional(dns_acache_t *acache, dns_rdataset_t *rdataset, dns_rdatasetadditional_t type, dns_rdatatype_t qtype); -/* +/*%< * Discard cached additional information stored in the DB node for a particular * 'rdataset.' See dns_rdataset_getadditional for the semantics of 'type' * and 'qtype'. * * Requires: - * 'rdataset' is a valid rdataset. - * 'acache' can be NULL, in which case this function will simply return + * \li 'rdataset' is a valid rdataset. + * \li 'acache' can be NULL, in which case this function will simply return * ISC_R_FAILURE. * * Ensures: - * See dns_acache_cancelentry(). + * \li See dns_acache_cancelentry(). * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE - additional information caching is not supported. - * ISC_R_NOTFOUND - the corresponding DB node has not cached additional + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE - additional information caching is not supported. + * \li #ISC_R_NOTFOUND - the corresponding DB node has not cached additional * information for 'rdataset.' */ diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 959da0d7d8..23428fd4b5 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.h,v 1.47 2005/06/27 00:15:44 marka Exp $ */ +/* $Id: resolver.h,v 1.48 2005/07/18 05:58:59 marka Exp $ */ #ifndef DNS_RESOLVER_H #define DNS_RESOLVER_H 1 @@ -444,7 +444,7 @@ dns_resolver_algorithm_supported(dns_resolver_t *resolver, dns_name_t *name, isc_boolean_t dns_resolver_digest_supported(dns_resolver_t *resolver, unsigned int digest_type); -/* +/*%< * Is this digest type supported. */ diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index 09f30bd68f..7cc4e89185 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: view.h,v 1.95 2005/04/27 04:57:01 sra Exp $ */ +/* $Id: view.h,v 1.96 2005/07/18 05:58:59 marka Exp $ */ #ifndef DNS_VIEW_H #define DNS_VIEW_H 1 @@ -791,10 +791,10 @@ dns_view_getrootdelonly(dns_view_t *view); isc_result_t dns_view_freezezones(dns_view_t *view, isc_boolean_t freeze); -/* +/*%< * Freeze/thaw updates to master zones. * * Requires: - * 'view' is valid. + * \li 'view' is valid. */ #endif /* DNS_VIEW_H */ diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index c6848d3c5d..488a1314f7 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zt.h,v 1.33 2005/04/27 04:57:01 sra Exp $ */ +/* $Id: zt.h,v 1.34 2005/07/18 05:59:00 marka Exp $ */ #ifndef DNS_ZT_H #define DNS_ZT_H 1 @@ -39,8 +39,8 @@ dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **zt); * \li 'mctx' to be initialized. * * Returns: - *\li #ISC_R_SUCCESS on success. - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS on success. + * \li #ISC_R_NOMEMORY */ isc_result_t @@ -49,14 +49,14 @@ dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone); * Mounts the zone on the zone table. * * Requires: - *\li 'zt' to be valid - *\li 'zone' to be valid + * \li 'zt' to be valid + * \li 'zone' to be valid * * Returns: - *\li #ISC_R_SUCCESS - *\li #ISC_R_EXISTS - *\li #ISC_R_NOSPACE - *\li #ISC_R_NOMEMORY + * \li #ISC_R_SUCCESS + * \li #ISC_R_EXISTS + * \li #ISC_R_NOSPACE + * \li #ISC_R_NOMEMORY */ isc_result_t @@ -66,12 +66,12 @@ dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone); * * Requires: * 'zt' to be valid - *\li 'zone' to be valid + * \li 'zone' to be valid * * Returns: * \li #ISC_R_SUCCESS - *\li #ISC_R_NOTFOUND - *\li #ISC_R_NOMEMORY + * \li #ISC_R_NOTFOUND + * \li #ISC_R_NOMEMORY */ isc_result_t @@ -82,20 +82,20 @@ dns_zt_find(dns_zt_t *zt, dns_name_t *name, unsigned int options, * then the name of the zone found is returned. * * Notes: - *\li If the DNS_ZTFIND_NOEXACT is set, the best partial match (if any) + * \li If the DNS_ZTFIND_NOEXACT is set, the best partial match (if any) * to 'name' will be returned. * * Requires: - *\li 'zt' to be valid - *\li 'name' to be valid - *\li 'foundname' to be initialized and associated with a fixedname or NULL - *\li 'zone' to be non NULL and '*zone' to be NULL + * \li 'zt' to be valid + * \li 'name' to be valid + * \li 'foundname' to be initialized and associated with a fixedname or NULL + * \li 'zone' to be non NULL and '*zone' to be NULL * * Returns: * \li #ISC_R_SUCCESS - *\li #DNS_R_PARTIALMATCH - *\li #ISC_R_NOTFOUND - *\li #ISC_R_NOSPACE + * \li #DNS_R_PARTIALMATCH + * \li #ISC_R_NOTFOUND + * \li #ISC_R_NOSPACE */ void @@ -105,7 +105,7 @@ dns_zt_detach(dns_zt_t **ztp); * zonetable will be freed. In either case 'ztp' is set to NULL. * * Requires: - *\li '*ztp' to be valid + * \li '*ztp' to be valid */ void @@ -116,7 +116,7 @@ dns_zt_flushanddetach(dns_zt_t **ztp); * set to NULL. * * Requires: - *\li '*ztp' to be valid + * \li '*ztp' to be valid */ void @@ -125,8 +125,8 @@ dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp); * Attach 'zt' to '*ztp'. * * Requires: - *\li 'zt' to be valid - *\li '*ztp' to be NULL + * \li 'zt' to be valid + * \li '*ztp' to be NULL */ isc_result_t diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 91ae599e98..f48fbd322a 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.213 2005/07/12 01:00:15 marka Exp $ */ +/* $Id: rbtdb.c,v 1.214 2005/07/18 05:58:58 marka Exp $ */ /*! \file */ @@ -6383,7 +6383,7 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { return (dns_name_copy(origin, name, NULL)); } -/* +/*% * Additional cache routines. */ static isc_result_t diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h index 374decc876..2773fdef56 100644 --- a/lib/isc/include/isc/sockaddr.h +++ b/lib/isc/include/isc/sockaddr.h @@ -15,14 +15,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sockaddr.h,v 1.47 2005/04/27 04:57:20 sra Exp $ */ - -/*! \file - */ +/* $Id: sockaddr.h,v 1.48 2005/07/18 05:59:00 marka Exp $ */ #ifndef ISC_SOCKADDR_H #define ISC_SOCKADDR_H 1 +/*! \file */ + #include #include #include @@ -45,21 +44,21 @@ struct isc_sockaddr { typedef ISC_LIST(struct isc_sockaddr) isc_sockaddrlist_t; -#define ISC_SOCKADDR_CMPADDR 0x0001 /* compare the address - * sin_addr/sin6_addr */ -#define ISC_SOCKADDR_CMPPORT 0x0002 /* compare the port - * sin_port/sin6_port */ -#define ISC_SOCKADDR_CMPSCOPE 0x0004 /* compare the scope - * sin6_scope */ -#define ISC_SOCKADDR_CMPSCOPEZERO 0x0008 /* when comparing scopes - * zero scopes always match */ +#define ISC_SOCKADDR_CMPADDR 0x0001 /*%< compare the address + * sin_addr/sin6_addr */ +#define ISC_SOCKADDR_CMPPORT 0x0002 /*%< compare the port + * sin_port/sin6_port */ +#define ISC_SOCKADDR_CMPSCOPE 0x0004 /*%< compare the scope + * sin6_scope */ +#define ISC_SOCKADDR_CMPSCOPEZERO 0x0008 /*%< when comparing scopes + * zero scopes always match */ ISC_LANG_BEGINDECLS isc_boolean_t isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, unsigned int flags); -/* +/*%< * Compare the elements of the two address ('a' and 'b') as specified * by 'flags' and report if they are equal or not. * @@ -116,7 +115,7 @@ isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int family); * 'family'. * * Requires: - * 'family' is AF_INET or AF_INET6. + * \li 'family' is AF_INET or AF_INET6. */ void @@ -183,8 +182,8 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target); * part of the buffer's used region. * * Returns: - * ISC_R_SUCCESS - * ISC_R_NOSPACE The text or the null termination did not fit. + * \li ISC_R_SUCCESS + * \li ISC_R_NOSPACE The text or the null termination did not fit. */ void @@ -221,13 +220,13 @@ isc_sockaddr_issitelocal(isc_sockaddr_t *sa); isc_result_t isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path); -/*%< +/* * Create a UNIX domain sockaddr that refers to path. * * Returns: - * ISC_R_NOSPACE - * ISC_R_NOTIMPLEMENTED - * ISC_R_SUCCESS + * \li ISC_R_NOSPACE + * \li ISC_R_NOTIMPLEMENTED + * \li ISC_R_SUCCESS */ #define ISC_SOCKADDR_FORMATSIZE \ diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index 422d1b5bf8..aa5a559b76 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.h,v 1.60 2005/04/27 04:57:20 sra Exp $ */ +/* $Id: socket.h,v 1.61 2005/07/18 05:59:01 marka Exp $ */ #ifndef ISC_SOCKET_H #define ISC_SOCKET_H 1 @@ -713,7 +713,7 @@ isc_socket_ipv6only(isc_socket_t *sock, isc_boolean_t yes); void isc_socket_cleanunix(isc_sockaddr_t *addr, isc_boolean_t active); -/* +/*%< * Cleanup UNIX domain sockets in the file-system. If 'active' is true * then just unlink the socket. If 'active' is false try to determine * if there is a listener of the socket or not. If no listener is found @@ -731,7 +731,7 @@ isc_socket_cleanunix(isc_sockaddr_t *addr, isc_boolean_t active); isc_boolean_t isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group); -/* +/*%< * Set ownership and file permissions on the UNIX domain socket. * * Note: On Solaris and SunOS this secures the directory containing @@ -739,11 +739,11 @@ isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, * permissions on the socket. * * Requires: - * 'sockaddr' to be a valid UNIX domain sockaddr. + * \li 'sockaddr' to be a valid UNIX domain sockaddr. * * Returns: - * ISC_R_SUCCESS - * ISC_R_FAILURE + * \li #ISC_R_SUCCESS + * \li #ISC_R_FAILURE */ ISC_LANG_ENDDECLS diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h index 89e2207545..54218ea442 100644 --- a/lib/isc/unix/include/isc/net.h +++ b/lib/isc/unix/include/isc/net.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.h,v 1.43 2005/04/27 04:57:24 sra Exp $ */ +/* $Id: net.h,v 1.44 2005/07/18 05:59:01 marka Exp $ */ #ifndef ISC_NET_H #define ISC_NET_H 1 @@ -301,9 +301,9 @@ isc_net_probe_ipv6pktinfo(void); * * Returns: * - * ISC_R_SUCCESS the option is supported. - * ISC_R_NOTFOUND IPv6 itself or the option is not supported. - * ISC_R_UNEXPECTED + * \li #ISC_R_SUCCESS the option is supported. + * \li #ISC_R_NOTFOUND IPv6 itself or the option is not supported. + * \li #ISC_R_UNEXPECTED */ void diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index adbbd0147c..309d6e79d1 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: namedconf.c,v 1.53 2005/06/27 00:15:45 marka Exp $ */ +/* $Id: namedconf.c,v 1.54 2005/07/18 05:59:01 marka Exp $ */ /*! \file */ @@ -670,7 +670,7 @@ static cfg_type_t cfg_type_masterformat = { &cfg_rep_string, &masterformat_enums }; -/* +/*% * dnssec-lookaside */ diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt index 61dcc43a5c..30cbc60a00 100644 --- a/win32utils/readme1st.txt +++ b/win32utils/readme1st.txt @@ -2,11 +2,11 @@ Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 2001, 2003 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. -$Id: readme1st.txt,v 1.13 2004/08/19 05:09:16 marka Exp $ +$Id: readme1st.txt,v 1.14 2005/07/18 05:59:02 marka Exp $ - Release of BIND 9.3 for Window NT/2000/XP/2003 + Release of BIND 9.5 for Window NT/2000/XP/2003 -This is a release of BIND 9.3 for Window NT/2000/XP/2003. +This is a release of BIND 9.5 for Window NT/2000/XP/2003. Only IPv4 stacks are supported on the box running this version of BIND. IPv6 stacks will be supported in a future release.