9.4/HEAD sync

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]

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);

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.
  */
 

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;

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_mem_t *		mctx;		/*%< Memory context. */
-	isc_taskmgr_t *		taskmgr;	/*% Task manager. */
+	isc_taskmgr_t *		taskmgr;	/*%< Task manager. */
-	isc_socketmgr_t *	socketmgr;	/*% Socket 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 */
+	dns_aclenv_t		aclenv;		/*%< Localhost/localnets ACLs */
-	ISC_LIST(ns_interface_t) interfaces;	/*% List of interfaces. */
+	ISC_LIST(ns_interface_t) interfaces;	/*%< List of interfaces. */
 	ISC_LIST(isc_sockaddr_t) listenon;
 };
 

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 <config.h>
 
@@ -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

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
 		;;

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
 		;;

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 */

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@

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
@@ -594,7 +594,7 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp,
  *	not become the current version.
  */
 
-/*%<**
+/***
  *** Node Methods
  ***/
 
@@ -791,7 +791,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *	\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:
@@ -915,7 +915,7 @@ dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out);
  * \li	'node' is a valid node.
  */
 
-/*%<**
+/***
  *** DB Iterator Creation
  ***/
 
@@ -947,11 +947,11 @@ dns_db_createiterator(dns_db_t *db, isc_boolean_t relative_names,
  * \li	#ISC_R_NOMEMORY
  */
 
-/*%<**
+/***
  *** Rdataset Methods
  ***/
 
-/*%<
+/*
  * XXXRTH  Should we check for glue and pending data in dns_db_findrdataset()?
  */
 
@@ -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.
+ * \li	'db' is a valid database.
- *	'task' to be valid or NULL.
+ * \li	'task' to be valid or NULL.
  */
 
 isc_boolean_t
@@ -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.
+ * \li	'db' is a valid zone database.
- *	'nodep' != NULL && '*nodep' == NULL
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_NOTFOUND - an SOA RR node has not been cached in 'db' or SOA RR
+ * \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.
+ * \li	'db' is a valid zone database.
- *	'node' is a valid DB node.
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE - SOA RR caching is not supported for 'db'
+ * \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.
+ * \li	'db' is a valid zone database.
- *	'nodep' != NULL && '*nodep' == NULL
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_NOTFOUND - an NS RR node has not been cached in 'db' or NS RR
+ * \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.
+ * \li	'db' is a valid zone database.
- *	'node' is a valid DB node.
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE - NS RR caching is not supported for 'db'
+ * \li	#ISC_R_FAILURE - NS RR caching is not supported for 'db'
  */
 
 ISC_LANG_ENDDECLS

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

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.
+ * \li	'rdataset' is a valid rdataset.
- *	'acache' can be NULL, in which case this function will simply return
+ * \li	'acache' can be NULL, in which case this function will simply return
  * 	ISC_R_FAILURE.
- *	For the other pointers, see dns_acache_getentry().
+ * \li	For the other pointers, see dns_acache_getentry().
  *
  * Ensures:
- *	See dns_acache_getentry().
+ * \li	See dns_acache_getentry().
  *
  * Returns:
- *	ISC_R_SUCCESS
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE	- additional information caching is not supported.
+ * \li	#ISC_R_FAILURE	- additional information caching is not supported.
- *	ISC_R_NOTFOUND	- the corresponding DB node has not cached additional
+ * \li	#ISC_R_NOTFOUND	- the corresponding DB node has not cached additional
  *			  information for 'rdataset.'
- *
+ * \li	Any error that dns_acache_getentry() can return.
- *	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.
+ * \li	'rdataset' is a valid rdataset.
- *	'acache' can be NULL, in which case this function will simply return
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE	- additional information caching is not supported.
+ * \li	#ISC_R_FAILURE	- additional information caching is not supported.
- *	ISC_R_NOMEMORY
+ * \li	#ISC_R_NOMEMORY
- *
+ * \li	Any error that dns_acache_setentry() can return.
- *	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.
+ * \li	'rdataset' is a valid rdataset.
- *	'acache' can be NULL, in which case this function will simply return
+ * \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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE	- additional information caching is not supported.
+ * \li	#ISC_R_FAILURE	- additional information caching is not supported.
- *	ISC_R_NOTFOUND	- the corresponding DB node has not cached additional
+ * \li	#ISC_R_NOTFOUND	- the corresponding DB node has not cached additional
  *			  information for 'rdataset.'
  */
 

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.
  */
 

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 */

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

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

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 $ */
+/* $Id: sockaddr.h,v 1.48 2005/07/18 05:59:00 marka Exp $ */
-
-/*! \file
- */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
 
+/*! \file */
+
 #include <isc/lang.h>
 #include <isc/net.h>
 #include <isc/types.h>
@@ -45,13 +44,13 @@ struct isc_sockaddr {
 
 typedef ISC_LIST(struct isc_sockaddr)	isc_sockaddrlist_t;
 
-#define ISC_SOCKADDR_CMPADDR	  0x0001	/* compare the address
+#define ISC_SOCKADDR_CMPADDR	  0x0001	/*%< compare the address
 						 *   sin_addr/sin6_addr */
-#define ISC_SOCKADDR_CMPPORT 	  0x0002	/* compare the port
+#define ISC_SOCKADDR_CMPPORT 	  0x0002	/*%< compare the port
 						 *   sin_port/sin6_port */
-#define ISC_SOCKADDR_CMPSCOPE     0x0004	/* compare the scope
+#define ISC_SOCKADDR_CMPSCOPE     0x0004	/*%< compare the scope
 						 *   sin6_scope */
-#define ISC_SOCKADDR_CMPSCOPEZERO 0x0008	/* when comparing scopes
+#define ISC_SOCKADDR_CMPSCOPEZERO 0x0008	/*%< when comparing scopes
 						 *   zero scopes always match */
 
 ISC_LANG_BEGINDECLS
@@ -59,7 +58,7 @@ 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
+ * \li	ISC_R_SUCCESS
- *	ISC_R_NOSPACE	The text or the null termination did not fit.
+ * \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
+ * \li	ISC_R_NOSPACE
- *	ISC_R_NOTIMPLEMENTED
+ * \li	ISC_R_NOTIMPLEMENTED
- *	ISC_R_SUCCESS
+ * \li	ISC_R_SUCCESS
  */
 
 #define ISC_SOCKADDR_FORMATSIZE \

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
+ * \li	#ISC_R_SUCCESS
- *	ISC_R_FAILURE
+ * \li	#ISC_R_FAILURE
  */
 
 ISC_LANG_ENDDECLS

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.
+ * \li	#ISC_R_SUCCESS		the option is supported.
- *	ISC_R_NOTFOUND		IPv6 itself or the option is not supported.
+ * \li	#ISC_R_NOTFOUND		IPv6 itself or the option is not supported.
- *	ISC_R_UNEXPECTED
+ * \li	#ISC_R_UNEXPECTED
  */
 
 void

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
  */
 

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.