9.2.1

16 files changed, 154 insertions, 110 deletions

diff --git a/CHANGES b/CHANGES
index f854f1ee..9d2bab3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,19 @@
 
+	--- 9.2.1 released ---
+
+1271.	[port]		win32: a make file contained absolute version specific
+			references.
+
+1269.	[bug]		Missing masters clause was not handled gracefully.
+			[RT #2703]
+
+1244.	[bug]		Receiving a TCP message from a blackhole address would
+			prevent further messages being received over that
+			interface.
+
+1178.	[bug]		Follow and cache (if appropriate) A6 and other
+			data chains to completion in the additional section.
+
 	--- 9.2.1rc2 released ---
 
 1240.	[bug]		It was possible to leak zone references by
diff --git a/bin/named/client.c b/bin/named/client.c
index 89d3b39b..78c07bb6 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.10 2002/02/08 03:57:07 marka Exp $ */
+/* $Id: client.c,v 1.176.2.11 2002/04/23 01:53:53 marka Exp $ */
 
 #include <config.h>
 
@@ -1727,6 +1727,8 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
 			ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
 				      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
 				      "blackholed connection attempt");
+			client->newstate = NS_CLIENTSTATE_READY;
+			(void)exit_check(client);
 			goto freeevent;
 		}
 
diff --git a/contrib/idn/mdnkit/patch/bind9/patch.configure b/contrib/idn/mdnkit/patch/bind9/patch.configure
index 7c79cac5..3939df55 100644
--- a/contrib/idn/mdnkit/patch/bind9/patch.configure
+++ b/contrib/idn/mdnkit/patch/bind9/patch.configure
@@ -4,7 +4,7 @@ RCS file: /proj/cvs/isc/bind9/configure,v
 retrieving revision 1.284.2.8
 diff -u -u -2 -r1.284.2.8 configure
 --- configure	2001/12/05 02:30:08	1.284.2.8
-+++ configure	2002/03/26 04:43:33
++++ configure	2002/04/23 05:07:58
 @@ -370,4 +370,12 @@
  ac_help="$ac_help
    --disable-linux-caps	disable linux capabilities"
diff --git a/contrib/idn/mdnkit/patch/bind9/patch.most b/contrib/idn/mdnkit/patch/bind9/patch.most
index 7ff75709..d494176e 100644
--- a/contrib/idn/mdnkit/patch/bind9/patch.most
+++ b/contrib/idn/mdnkit/patch/bind9/patch.most
@@ -1,5 +1,5 @@
---- README.mdnkit.orig	Tue Mar 26 15:20:34 2002
-+++ README.mdnkit	Tue Mar 26 15:20:34 2002
+--- README.mdnkit.orig	Tue Apr 23 14:43:48 2002
++++ README.mdnkit	Tue Apr 23 14:43:48 2002
 @@ -0,0 +1,124 @@
 +
 +			BIND-9 MDN patch
@@ -125,8 +125,8 @@
 +
 +
 +; $Id: bind-9.2.0-patch,v 1.1.2.1 2002/02/08 12:15:13 marka Exp $
---- config.h.in.orig	Tue Feb 12 20:18:50 2002
-+++ config.h.in	Tue Mar 26 15:18:22 2002
+--- config.h.in.orig	Thu Mar 28 10:45:46 2002
++++ config.h.in	Tue Apr 23 14:43:48 2002
 @@ -142,4 +142,7 @@
  #undef HAVE_STRERROR
  
@@ -150,8 +150,8 @@
 +/* define if mDNkit support is to be included. */
 +#undef WITH_MDN
 +
---- configure.in.orig	Tue Feb 12 20:20:00 2002
-+++ configure.in	Tue Mar 26 15:18:23 2002
+--- configure.in.orig	Thu Mar 28 10:46:34 2002
++++ configure.in	Tue Apr 23 14:43:48 2002
 @@ -1615,4 +1615,77 @@
  
  #
@@ -230,8 +230,8 @@
 +#
  # Substitutions
  #
---- bin/dig/dig.1.orig	Tue Feb 12 17:42:49 2002
-+++ bin/dig/dig.1	Tue Mar 26 15:18:23 2002
+--- bin/dig/dig.1.orig	Thu Mar 28 10:46:36 2002
++++ bin/dig/dig.1	Tue Apr 23 14:43:49 2002
 @@ -74,5 +74,5 @@
  .TP
  \fBtype\fR
@@ -255,8 +255,8 @@
 +\fBdig\fR runs.
  .SH "FILES"
  .PP
---- bin/dig/dig.c.orig	Tue Mar 12 14:55:57 2002
-+++ bin/dig/dig.c	Tue Mar 26 15:18:23 2002
+--- bin/dig/dig.c.orig	Thu Mar 28 10:46:41 2002
++++ bin/dig/dig.c	Tue Apr 23 14:43:49 2002
 @@ -1308,4 +1308,9 @@
  		ISC_LIST_APPEND(lookup_list, lookup, link);
  	}
@@ -267,8 +267,8 @@
 +#endif
  }
  
---- bin/dig/dig.docbook.orig	Tue Feb 12 17:42:57 2002
-+++ bin/dig/dig.docbook	Tue Mar 26 15:18:23 2002
+--- bin/dig/dig.docbook.orig	Thu Mar 28 10:46:44 2002
++++ bin/dig/dig.docbook	Tue Apr 23 14:43:49 2002
 @@ -524,4 +524,19 @@
  
  <refsect1>
@@ -289,8 +289,8 @@
 +<refsect1>
  <title>FILES</title>
  <para>
---- bin/dig/dighost.c.orig	Wed Feb 20 10:02:43 2002
-+++ bin/dig/dighost.c	Tue Mar 26 15:18:23 2002
+--- bin/dig/dighost.c.orig	Thu Mar 28 10:46:53 2002
++++ bin/dig/dighost.c	Tue Apr 23 14:43:49 2002
 @@ -33,4 +33,15 @@
  #include <limits.h>
  
@@ -561,8 +561,8 @@
 +}
 +
 +#endif /* WITH_MDN */
---- bin/dig/host.1.orig	Tue Feb 12 17:43:07 2002
-+++ bin/dig/host.1	Tue Mar 26 15:18:23 2002
+--- bin/dig/host.1.orig	Thu Mar 28 10:46:54 2002
++++ bin/dig/host.1	Tue Apr 23 14:43:49 2002
 @@ -88,6 +88,6 @@
  .PP
  Non-recursive queries can be made via the \fB-r\fR option.
@@ -588,8 +588,8 @@
 +\fBhost\fR runs.
  .SH "FILES"
  .PP
---- bin/dig/host.c.orig	Tue Feb 12 17:43:09 2002
-+++ bin/dig/host.c	Tue Mar 26 15:18:23 2002
+--- bin/dig/host.c.orig	Thu Mar 28 10:46:56 2002
++++ bin/dig/host.c	Tue Apr 23 14:43:49 2002
 @@ -667,4 +667,9 @@
  	ISC_LIST_APPEND(lookup_list, lookup, link);
  
@@ -600,8 +600,8 @@
 +
  	usesearch = ISC_TRUE;
  }
---- bin/dig/host.docbook.orig	Tue Feb 12 17:43:10 2002
-+++ bin/dig/host.docbook	Tue Mar 26 15:18:24 2002
+--- bin/dig/host.docbook.orig	Thu Mar 28 10:46:57 2002
++++ bin/dig/host.docbook	Tue Apr 23 14:43:50 2002
 @@ -182,4 +182,19 @@
  
  <refsect1>
@@ -622,8 +622,8 @@
 +<refsect1>
  <title>FILES</title>
  <para>
---- bin/dig/nslookup.c.orig	Thu Mar 21 09:45:11 2002
-+++ bin/dig/nslookup.c	Tue Mar 26 15:18:24 2002
+--- bin/dig/nslookup.c.orig	Thu Mar 28 10:47:00 2002
++++ bin/dig/nslookup.c	Tue Apr 23 14:43:50 2002
 @@ -660,4 +660,8 @@
  	lookup->origin = NULL;
  	ISC_LIST_INIT(lookup->my_server_list);
@@ -633,8 +633,8 @@
 +#endif
  	debug("looking up %s", lookup->textname);
  }
---- bin/dig/include/dig/dig.h.orig	Tue Feb 12 17:43:14 2002
-+++ bin/dig/include/dig/dig.h	Tue Mar 26 15:18:24 2002
+--- bin/dig/include/dig/dig.h.orig	Thu Mar 28 10:47:01 2002
++++ bin/dig/include/dig/dig.h	Tue Apr 23 14:43:50 2002
 @@ -75,4 +75,11 @@
   */
  
@@ -655,8 +655,8 @@
 +#endif
  		dnssec;
  	char textname[MXNAME]; /* Name we're going to be looking up */
---- lib/dns/name.c.orig	Tue Mar 26 14:57:49 2002
-+++ lib/dns/name.c	Tue Mar 26 15:18:24 2002
+--- lib/dns/name.c.orig	Thu Mar 28 10:47:30 2002
++++ lib/dns/name.c	Tue Apr 23 14:43:50 2002
 @@ -195,4 +195,11 @@
  dns_name_t *dns_wildcardname = &wild;
  
@@ -695,9 +695,9 @@
 +	totext_filter_proc = proc;
 +}
 +#endif
---- lib/dns/include/dns/name.h.orig	Tue Feb 12 20:23:10 2002
-+++ lib/dns/include/dns/name.h	Tue Mar 26 15:18:24 2002
-@@ -219,4 +219,15 @@
+--- lib/dns/include/dns/name.h.orig	Tue Apr 23 14:35:36 2002
++++ lib/dns/include/dns/name.h	Tue Apr 23 14:43:50 2002
+@@ -220,4 +220,15 @@
  #define DNS_NAME_MAXWIRE 255
  
 +#ifdef WITH_MDN
@@ -713,7 +713,7 @@
 +
  /***
   *** Initialization
-@@ -1244,4 +1255,12 @@
+@@ -1245,4 +1256,12 @@
   *
   */
 +
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 3bdad868..9ef45467 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.16 2002/01/23 01:41:17 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.18 2002/04/22 04:14:25 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -3298,7 +3298,7 @@ synthetic responses to IPv6 queries as described in
 receive zone transfers from the server. <command>allow-transfer</command> may
 also be specified in the <command>zone</command> statement, in which
 case it overrides the <command>options allow-transfer</command> statement.
-If not specified, the default is to allow transfers from all hosts.</para>
+If not specified, the default is to allow transfers to all hosts.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>blackhole</command></term>
@@ -3931,8 +3931,8 @@ are set by the master, giving slave server administrators little
 control over their contents.
 </para><para>
 These options allow the administrator to set a minimum and maximum
-refresh and retry time either per-zone, per-view, or per-server.
-These options are valid for master, slave and stub zones, 
+refresh and retry time either per-zone, per-view or globally.
+These options are valid for slave and stub zones, 
 and clamp the SOA refresh and retry times to the specified values.
 </para></listitem></varlistentry>
 
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index e6ee27fa..00c68edc 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -5222,7 +5222,7 @@ case it overrides the <B
 CLASS="command"
 >options allow-transfer</B
 > statement.
-If not specified, the default is to allow transfers from all hosts.</P
+If not specified, the default is to allow transfers to all hosts.</P
 ></DD
 ><DT
 ><B
@@ -6698,8 +6698,8 @@ control over their contents.
 </P
 ><P
 >&#13;These options allow the administrator to set a minimum and maximum
-refresh and retry time either per-zone, per-view, or per-server.
-These options are valid for master, slave and stub zones, 
+refresh and retry time either per-zone, per-view or globally.
+These options are valid for slave and stub zones, 
 and clamp the SOA refresh and retry times to the specified values.
 </P
 ></DD
diff --git a/lib/dns/api b/lib/dns/api
index b68bc303..f0755020 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 7
-LIBREVISION = 1
-LIBAGE = 2
+LIBINTERFACE = 8
+LIBREVISION = 0
+LIBAGE = 3
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 12e97108..8995b53b 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001  Internet Software Consortium.
+ * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.95 2001/08/28 03:58:19 marka Exp $ */
+/* $Id: name.h,v 1.95.2.2 2002/04/23 02:28:51 marka Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -209,6 +209,7 @@ struct dns_name {
 #define DNS_NAMEATTR_ANSWER		0x0200		/* Used by resolver. */
 #define DNS_NAMEATTR_NCACHE		0x0400		/* Used by resolver. */
 #define DNS_NAMEATTR_CHAINING		0x0800		/* Used by resolver. */
+#define DNS_NAMEATTR_CHASE		0x1000		/* Used by resolver. */
 
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname;
 extern dns_name_t *dns_wildcardname;
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 2281fb5b..c434cade 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001  Internet Software Consortium.
+ * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.41 2001/08/28 03:58:21 marka Exp $ */
+/* $Id: rdataset.h,v 1.41.2.2 2002/04/23 02:28:52 marka Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -128,6 +128,7 @@ struct dns_rdataset {
 #define DNS_RDATASETATTR_TTLADJUSTED	0x0200		/* Used by message.c */
 #define DNS_RDATASETATTR_FIXEDORDER	0x0400
 #define DNS_RDATASETATTR_RANDOMIZE	0x0800
+#define DNS_RDATASETATTR_CHASE		0x1000		/* Used by resolver. */
 
 void
 dns_rdataset_init(dns_rdataset_t *rdataset);
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index f52bdb16..4c1eeb0a 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.9 2002/03/26 00:54:58 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.10 2002/04/19 01:11:16 marka Exp $ */
 
 #include <config.h>
 
@@ -2427,6 +2427,7 @@ clone_results(fetchctx_t *fctx) {
 #define ANSWERSIG(r)	(((r)->attributes & DNS_RDATASETATTR_ANSWERSIG) != 0)
 #define EXTERNAL(r)	(((r)->attributes & DNS_RDATASETATTR_EXTERNAL) != 0)
 #define CHAINING(r)	(((r)->attributes & DNS_RDATASETATTR_CHAINING) != 0)
+#define CHASE(r)	(((r)->attributes & DNS_RDATASETATTR_CHASE) != 0)
 
 
 /*
@@ -3240,6 +3241,13 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
 			rdataset->ttl = 1;
 	} else
 		rdataset->trust = dns_trust_additional;
+	/*
+	 * Avoid infinite loops by only marking new rdatasets.
+	 */
+	if (!CACHE(rdataset)) {
+		name->attributes |= DNS_NAMEATTR_CHASE;
+		rdataset->attributes |= DNS_RDATASETATTR_CHASE;
+	}
 	rdataset->attributes |= DNS_RDATASETATTR_CACHE;
 	if (external)
 		rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL;
@@ -3262,58 +3270,66 @@ check_related(void *arg, dns_name_t *addname, dns_rdatatype_t type) {
 	else
 		gluing = ISC_FALSE;
 	name = NULL;
-	rdataset = NULL;
 	result = dns_message_findname(fctx->rmessage, DNS_SECTION_ADDITIONAL,
 				      addname, dns_rdatatype_any, 0, &name,
 				      NULL);
 	if (result == ISC_R_SUCCESS) {
 		external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain));
-		if (type == dns_rdatatype_a) {
-			for (rdataset = ISC_LIST_HEAD(name->list);
-			     rdataset != NULL;
-			     rdataset = ISC_LIST_NEXT(rdataset, link)) {
-				if (rdataset->type == dns_rdatatype_sig)
-					rtype = rdataset->covers;
-				else
-					rtype = rdataset->type;
-				if (rtype == dns_rdatatype_a ||
-				    rtype == dns_rdatatype_aaaa ||
-				    rtype == dns_rdatatype_a6)
-					mark_related(name, rdataset, external,
-						     gluing);
-				/*
-				 * XXXRTH  Need to do a controlled recursion
-				 *	   on the A6 prefix names to mark
-				 *	   any additional data related to them.
-				 *
-				 *	   Ick.
-				 */
-			}
-		} else {
-			result = dns_message_findtype(name, type, 0,
-						      &rdataset);
-			if (result == ISC_R_SUCCESS) {
-				mark_related(name, rdataset, external, gluing);
-				/*
-				 * Do we have its SIG too?
-				 */
-				result = dns_message_findtype(name,
-						      dns_rdatatype_sig,
-						      type, &rdataset);
-				if (result == ISC_R_SUCCESS)
-					mark_related(name, rdataset, external,
-						     gluing);
-			}
+		for (rdataset = ISC_LIST_HEAD(name->list);
+		     rdataset != NULL;
+		     rdataset = ISC_LIST_NEXT(rdataset, link)) {
+			if (rdataset->type == dns_rdatatype_sig)
+				rtype = rdataset->covers;
+			else
+				rtype = rdataset->type;
+			if ((type == dns_rdatatype_a && 
+			     (rtype == dns_rdatatype_a ||
+			      rtype == dns_rdatatype_aaaa ||
+			      rtype == dns_rdatatype_a6)) ||
+			    type == rtype)
+				mark_related(name, rdataset, external,
+					     gluing);
 		}
-		/*
-		 * XXXRTH  Some other stuff still needs to be marked.
-		 *         See query.c.
-		 */
 	}
 
 	return (ISC_R_SUCCESS);
 }
 
+static void
+chase_additional(fetchctx_t *fctx) {
+	isc_boolean_t rescan;
+	dns_section_t section = DNS_SECTION_ADDITIONAL;
+	isc_result_t result;
+
+ again:
+	rescan = ISC_FALSE;
+	
+	for (result = dns_message_firstname(fctx->rmessage, section);
+	     result == ISC_R_SUCCESS;
+	     result = dns_message_nextname(fctx->rmessage, section)) {
+		dns_name_t *name = NULL;
+		dns_rdataset_t *rdataset;
+		dns_message_currentname(fctx->rmessage, DNS_SECTION_ADDITIONAL,
+					&name);
+		if ((name->attributes & DNS_NAMEATTR_CHASE) == 0)
+			continue;
+		name->attributes &= ~DNS_NAMEATTR_CHASE;
+		for (rdataset = ISC_LIST_HEAD(name->list);
+		     rdataset != NULL;
+		     rdataset = ISC_LIST_NEXT(rdataset, link)) {
+			if (CHASE(rdataset)) {
+				rdataset->attributes &= ~DNS_RDATASETATTR_CHASE;
+				(void)dns_rdataset_additionaldata(rdataset,
+								  check_related,
+								  fctx);
+				rescan = ISC_TRUE;
+			}
+		}
+	}
+	if (rescan)
+		goto again;
+}
+
 static inline isc_result_t
 cname_target(dns_rdataset_t *rdataset, dns_name_t *tname) {
 	isc_result_t result;
@@ -4351,6 +4367,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 	}
 
 	/*
+	 * Follow A6 and other additional section data chains.
+	 */
+	chase_additional(fctx);
+
+	/*
 	 * Cache the cacheable parts of the message.  This may also cause
 	 * work to be queued to the DNSSEC validator.
 	 */
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 2dfcc5c9..c49e866d 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001  Internet Software Consortium.
+ * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.85.2.1 2002/03/29 01:41:01 marka Exp $ */
+/* $Id: task.c,v 1.85.2.2 2002/04/23 02:28:54 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
diff --git a/lib/isccfg/api b/lib/isccfg/api
index 7931195a..ae2943dd 100644
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 0
-LIBREVISION = 2
+LIBREVISION = 3
 LIBAGE = 0
diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index 2fe46e3a..b762c73b 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.14.2.15 2002/03/20 20:21:15 marka Exp $ */
+/* $Id: check.c,v 1.14.2.16 2002/04/23 02:00:03 marka Exp $ */
 
 #include <config.h>
 
@@ -261,13 +261,14 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab, isc_log_t *logctx,
 				    "zone '%s': missing 'masters' entry",
 				    zname);
 			result = ISC_R_FAILURE;
-		}
-		addrlist = cfg_tuple_get(obj, "addresses");
-		if (cfg_list_first(addrlist) == NULL) {
-			cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR,
-				    "zone '%s': empty 'masters' entry",
-				    zname);
-			result = ISC_R_FAILURE;
+		} else {
+			addrlist = cfg_tuple_get(obj, "addresses");
+			if (cfg_list_first(addrlist) == NULL) {
+				cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR,
+					    "zone '%s': empty 'masters' entry",
+					    zname);
+				result = ISC_R_FAILURE;
+			}
 		}
 	}
 
diff --git a/lib/isccfg/win32/libisccfg.mak b/lib/isccfg/win32/libisccfg.mak
index c0eee0ac..a7c09380 100644
--- a/lib/isccfg/win32/libisccfg.mak
+++ b/lib/isccfg/win32/libisccfg.mak
@@ -297,24 +297,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libisccfg - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.2.1rc1\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\isccfg\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.2.1rc1\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
 !ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.2.1rc1\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\isccfg\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.2.1rc1\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
@@ -323,24 +323,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libisccfg - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.2.1rc1\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\isccfg\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.2.1rc1\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
 !ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.2.1rc1\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\isccfg\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.2.1rc1\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
diff --git a/version b/version
index 4ea31344..ac1daf39 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.26.2.12 2002/03/15 05:14:11 marka Exp $
+# $Id: version,v 1.26.2.13 2002/03/29 03:01:13 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=2
 PATCHVER=1
-RELEASETYPE=rc
-RELEASEVER=2
+RELEASETYPE=
+RELEASEVER=
diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 49d34dba..f95f2da0 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -42,8 +42,11 @@ if NOT Exist ..\Build\Release mkdir ..\Build\Release
 
 echo Copying the ARM and the Installation Notes.
  
+copy ..\COPYRIGHT ..\Build\Release
 copy readme1st.txt ..\Build\Release
 copy ..\doc\arm\*.html ..\Build\Release
+copy ..\CHANGES ..\Build\Release
+copy ..\FAQ ..\Build\Release
 
 echo Copying the OpenSSL DLL.