9.3.3b1

294 files changed, 30137 insertions, 20701 deletions

diff --git a/CHANGES b/CHANGES
index 941b946d..79bfeea6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,203 @@
 
+	--- 9.3.3b1 released ---
+
+2031.	[bug]		Emit a error message when "rndc refresh" is called on
+			a non slave/stub zone. [RT # 16073]
+
+2030.	[bug]		We were being overly conservative when disabling
+			openssl engine support. [RT #16030]
+
+2029.	[bug]		host printed out the server multiple times when
+			specified on the command line. [RT #15992]
+
+2028.	[port]		linux: socket.c compatability for old systems.
+			[RT #16015]
+
+2027.	[port]		libbind: Solaris x86 support. [RT #16020]
+
+2026.	[bug]		Rate limit the two recursive client exceeded messages.
+			[RT #16044]
+
+2024.	[bug]		named emited spurious "zone serial unchanged"
+			messages on reload. [RT #16027]
+
+2023.	[bug]		"make install" should create ${localstatedir}/run and
+			${sysconfdir} if they do not exist. [RT #16033]
+
+2016.	[bug]		Return a partial answer if recursion is not
+			allowed but requested and we had the answer
+			to the original qname. [RT #15945]
+
+2013.	[bug]		Handle unexpected TSIGs on unsigned AXFR/IXFR
+			responses more gracefully. [RT #15941]
+
+2009.	[bug]		libbind: coverity fixes. [RT #15808]
+
+2005.	[bug]		libbind: Retransmission timeouts should be
+			based on which attempt it is to the nameserver
+			and not the nameserver itself. [RT #13548]
+
+2004.	[bug]		dns_tsig_sign() could pass a NULL pointer to
+			dst_context_destroy() when cleaning up after a
+			error. [RT #15835]
+
+2003.	[bug]		libbind: The DNS name/address lookup functions could
+			occasionally follow a random pointer due to
+			structures not being completely zeroed. [RT #15806]
+
+2002.	[bug]		libbind: tighten the constraints on when
+			struct addrinfo._ai_pad exists.  [RT #15783]
+
+2000.	[bug]		memmove()/strtol() fix was incomplete. [RT #15812]
+
+1998.	[bug]		Restrict handling of fifos as sockets to just SunOS.
+			This allows named to connect to entropy gathering
+			daemons that use fifos instead of sockets. [RT #15840]
+
+1997.	[bug]		Named was failing to replace negative cache entries
+			when a positive one for the type was learnt.
+			[RT #15818]
+
+1995.	[bug]		'host' was reporting multiple "is an alias" messages.
+			[RT #15702]
+
+1994.	[port]		OpenSSL 0.9.8 support. [RT #15694]
+
+1993.	[bug]		Log messsage, via syslog, were missing the space
+			after the timestamp if "print-time yes" was specified.
+			[RT #15844]
+
+1991.	[cleanup]	The configuration data, once read, should be treated
+			as readonly.  Expand the use of const to enforce this
+			at compile time. [RT #15813]
+
+1990.	[bug]		libbind:  isc's override of broken gettimeofday()
+			implementions was not always effective.
+			[RT #15709]
+
+1989.	[bug]		win32: don't check the service password when
+			re-installing. [RT #15882]
+
+1985.	[protocol]	DLV has now been assigned a official type code of
+			32769. [RT #15807]
+
+			Note: care should be taken to ensure you upgrade
+			both named and dnssec-signzone at the same time for
+			zones with DLV records where named is the master
+			server for the zone.  Also any zones that contain
+			DLV records should be removed when upgrading a slave
+			zone.  You do not however have to upgrade all
+			servers for a zone with DLV records simultaniously.
+
+1982.	[bug]		DNSKEY was being accepted on the parent side of
+			a delegation.  KEY is still accepted there for
+			RFC 3007 validated updates. [RT #15620]
+
+1981.	[bug]		win32: condition.c:wait() could fail to reattain
+			the mutex lock.
+
+1979.	[port]		linux: allow named to drop core after changing
+			user ids. [RT #15753]
+
+1978.	[port]		Handle systems which have a broken recvmsg().
+			[RT #15742]
+
+1977.	[bug]		Silence noisy log message. [RT #15704]
+
+1976.	[bug]		Handle systems with no IPv4 addresses. [RT #15695]
+
+1975.	[bug]		libbind: isc_gethexstring() could misparse multi-line
+			hex strings with comments. [RT #15814]
+
+1974.	[doc]		List each of the zone types and associated zone
+			options seperately in the ARM.
+
+1972.	[contrib]	DBUS dynamic forwarders integation from
+			Jason Vas Dias <jvdias@redhat.com>.
+
+1971.	[port]		linux: make detection of missing IF_NAMESIZE more
+			robust. [RT #15443]
+
+1970.	[bug]		nsupdate: adjust UDP timeout when falling back to
+			unsigned SOA query. [RT #15775]
+
+1969.	[bug]		win32: the socket code was freeing the socket
+			structure too early. [RT #15776]
+
+1968.	[bug]		Missing lock in resolver.c:validated(). [RT #15739]
+
+1966.	[bug]		Don't set CD when we have fallen back to plain DNS.
+			[RT #15727]
+
+1963.	[port]		Tru64 4.0E doesn't support send() and recv(). 
+			[RT #15586]
+
+1962.	[bug]		Named failed to clear old update-policy when it
+			was removed. [RT #15491]
+
+1961.	[bug]		Check the port and address of responses forwarded
+			to dispatch. [RT #15474]
+
+1960.	[bug]		Update code should set NSEC ttls from SOA MINIMUM.
+			[RT #15465]
+
+1958.	[bug]		Named failed to update the zone's secure state
+			until the zone was reloaded. [RT #15412]
+
+1957.	[bug]		Dig mishandled responses to class ANY queries.
+			[RT #15402]
+
+1956.	[bug]		Improve cross compile support, 'gen' is now built
+			by native compiler.  See README for additional
+			cross compile support information. [RT #15148]
+
+1955.	[bug]		Pre-allocate the cache cleaning interator. [RT #14998]
+
+1952.	[port]		hpux: tell the linker to build a runtime link
+			path "-Wl,+b:". [RT #14816].
+
+1951.	[security]	Drop queries from particular well known ports.
+			Don't return FORMERR to queries from particular
+			well known ports.  [RT #15636]
+			
+1950.	[port]		Solaris 2.5.1 and earlier cannot bind() then connect()
+			a TCP socket. This prevents the source address being
+			set for TCP connections. [RT #15628]
+
+1948.	[bug]		If was possible to trigger a REQUIRE failure in
+			xfrin.c:maybe_free() if named ran out of memory.
+			[RT #15568]
+
+1946.	[bug]		resume_dslookup() could trigger a REQUIRE failure
+			when using forwarders. [RT #15549]
+
+1944.	[cleanup]	isc_hash_create() does not need a read/write lock.
+			[RT #15522]
+
+1943.	[bug]		Set the loadtime after rolling forward the journal.
+			[RT #15647]
+
+1942.	[bug]		If the name of a DNSKEY match that of one in
+			trusted-keys do not attempt to validate the DNSKEY
+			using the parents DS RRset. [RT #15649]
+
+1941.	[bug]		ncache_adderesult() should set eresult even if no
+			rdataset is passed to it. [RT #15642]
+
+1940.	[bug]		Fixed a number of error conditions reported by
+			Coverity.
+
+1939.	[bug]           The resolver could dereference a null pointer after
+			validation if all the queries have timed out.
+			[RT #15528]
+
+1938.	[bug]		The validator was not correctly handling unsecure
+			negative responses at or below a SEP. [RT #15528]
+
+1919.	[contrib]	queryperf: a set of new features: collecting/printing
+			response delays, printing intermediate results, and
+			adjusting query rate for the "target" qps.
+
 	--- 9.3.2 released ---
 
 	--- 9.3.2rc1 released ---
@@ -316,14 +515,14 @@
 
 1779.	[port]		OSF 5.1: libtool didn't handle -pthread correctly.
 
-1778.   [port]   	HUX 11.11: fix broken IN6ADDR_ANY_INIT and
+1778.	[port]		HUX 11.11: fix broken IN6ADDR_ANY_INIT and
 			IN6ADDR_LOOPBACK_INIT macros.
 
-1777.   [port]   	OSF 5.1: fix broken IN6ADDR_ANY_INIT and
+1777.	[port]		OSF 5.1: fix broken IN6ADDR_ANY_INIT and
 			IN6ADDR_LOOPBACK_INIT macros.
 
-1776.   [port]   	Solaris 2.9: fix broken IN6ADDR_ANY_INIT and
-                        IN6ADDR_LOOPBACK_INIT macros.
+1776.	[port]		Solaris 2.9: fix broken IN6ADDR_ANY_INIT and
+			IN6ADDR_LOOPBACK_INIT macros.
 
 1775.	[bug]		Only compile getnetent_r.c when threaded. [RT #13205]
 
@@ -1166,8 +1365,8 @@
 
 1414.	[func]		Support for KSK flag.
 
-1413.	[func]		Explictly request the (re-)generation of DS records from
-			keysets (dnssec-signzone -g).
+1413.	[func]		Explicitly request the (re-)generation of DS records
+			from keysets (dnssec-signzone -g).
 
 1412.	[func]		You can now specify servers to be tried if a nameserver
 			has IPv6 address and you only support IPv4 or the
@@ -5564,7 +5763,7 @@
 			<isc/bufferlist.h>, <isc/task.h>, <isc/mem.h> or
 			<isc/net.h>.
 
- 119.	[cleanup]	structure definitions for generic rdata stuctures do
+ 119.	[cleanup]	structure definitions for generic rdata structures do
 			not have _generic_ in their names.
 
  118.	[cleanup]	libdns.a is now namespace-clean, on NetBSD, excepting
diff --git a/COPYRIGHT b/COPYRIGHT
index 484dac8e..8bbcf244 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.6.2.2.8.3 2005/01/10 23:51:37 marka Exp $
+$Id: COPYRIGHT,v 1.6.2.2.8.4 2006/01/04 00:37:22 marka Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 
diff --git a/FAQ b/FAQ
index 9b806cbd..5c6a2a73 100644
--- a/FAQ
+++ b/FAQ
@@ -4,26 +4,36 @@ Frequently Asked Questions about BIND 9
 
 Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads?
 
-A: Linux threads do not fully implement the Posix threads (pthreads) standard.
-   In particular, setuid() operates only on the current thread, not the full
-   process. Because of this limitation, BIND 9 cannot use setuid() on Linux as
-   it can on all other supported platforms. setuid() cannot be called before
-   creating threads, since the server does not start listening on reserved
-   ports until after threads have started.
+A: Linux threads do not fully implement the Posix threads (pthreads) standard. In
+   particular, setuid() operates only on the current thread, not the full process.
+   Because of this limitation, BIND 9 cannot use setuid() on Linux as it can on
+   all other supported platforms. setuid() cannot be called before creating
+   threads, since the server does not start listening on reserved ports until
+   after threads have started.
 
    In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve
    capabilities across a setuid() call is present. This allows BIND 9 to call
-   setuid() early, while retaining the ability to bind reserved ports. This is
-   a Linux-specific hack.
+   setuid() early, while retaining the ability to bind reserved ports. This is a
+   Linux-specific hack.
 
-   On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less
-   of a security risk than a root process that has not dropped privileges.
+   On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less of
+   a security risk than a root process that has not dropped privileges.
 
    If Linux threads ever work correctly, this restriction will go away.
 
    Configuring BIND9 with the --disable-threads option (the default) causes a
    non-threaded version to be built, which will allow -u to be used.
 
+Q: Why do I get the following errors:
+
+   general: errno2result.c:109: unexpected error:
+   general: unable to convert errno to isc_result: 14: Bad address
+   client: UDP client handler shutting down due to fatal receive error: unexpected error
+
+A: This is the result of a Linux kernel bug.
+
+   See: http://marc.theaimsgroup.com/?l=linux-netdev&m=113081708031466&w=2
+
 Q: Why does named log the warning message "no TTL specified - using SOA MINTTL
    instead"?
 
@@ -40,23 +50,26 @@ A: Your zone file is illegal according to RFC1035. It must either have a line
 Q: Why do I see 5 (or more) copies of named on Linux?
 
 A: Linux threads each show up as a process under ps. The approximate number of
-   threads running is n+4, where n is the number of CPUs. Note that the amount
-   of memory used is not cumulative; if each process is using 10M of memory,
-   only a total of 10M is used.
+   threads running is n+4, where n is the number of CPUs. Note that the amount of
+   memory used is not cumulative; if each process is using 10M of memory, only a
+   total of 10M is used.
+
+   Newer versions of Linux's ps command hide the individual threads and require -L
+   to display them.
 
 Q: Why does BIND 9 log "permission denied" errors accessing its configuration
    files or zones on my Linux system even though it is running as root?
 
-A: On Linux, BIND 9 drops most of its root privileges on startup. This
-   including the privilege to open files owned by other users. Therefore, if
-   the server is running as root, the configuration files and zone files should
-   also be owned by root.
+A: On Linux, BIND 9 drops most of its root privileges on startup. This including
+   the privilege to open files owned by other users. Therefore, if the server is
+   running as root, the configuration files and zone files should also be owned by
+   root.
 
-Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file
-   bar: ran out of space"?
+Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file bar:
+   ran out of space"?
 
-A: This is often caused by TXT records with missing close quotes. Check that
-   all TXT records containing quoted strings have both open and close quotes.
+A: This is often caused by TXT records with missing close quotes. Check that all
+   TXT records containing quoted strings have both open and close quotes.
 
 Q: How do I produce a usable core file from a multithreaded named on Linux?
 
@@ -68,16 +81,16 @@ A: If the Linux kernel is 2.4.7 or newer, multithreaded core dumps are usable
 
 Q: How do I restrict people from looking up the server version?
 
-A: Put a "version" option containing something other than the real version in
-   the "options" section of named.conf. Note doing this will not prevent
-   attacks and may impede people trying to diagnose problems with your server.
-   Also it is possible to "fingerprint" nameservers to determine their version.
+A: Put a "version" option containing something other than the real version in the
+   "options" section of named.conf. Note doing this will not prevent attacks and
+   may impede people trying to diagnose problems with your server. Also it is
+   possible to "fingerprint" nameservers to determine their version.
 
 Q: How do I restrict only remote users from looking up the server version?
 
-A: The following view statement will intercept lookups as the internal view
-   that holds the version information will be matched last. The caveats of the
-   previous answer still apply, of course.
+A: The following view statement will intercept lookups as the internal view that
+   holds the version information will be matched last. The caveats of the previous
+   answer still apply, of course.
 
    view "chaos" chaos {
            match-clients { <those to be refused>; };
@@ -91,48 +104,45 @@ A: The following view statement will intercept lookups as the internal view
 Q: What do "no source of entropy found" or "could not open entropy source foo"
    mean?
 
-A: The server requires a source of entropy to perform certain operations,
-   mostly DNSSEC related. These messages indicate that you have no source of
-   entropy. On systems with /dev/random or an equivalent, it is used by
-   default. A source of entropy can also be defined using the random-device
-   option in named.conf.
+A: The server requires a source of entropy to perform certain operations, mostly
+   DNSSEC related. These messages indicate that you have no source of entropy. On
+   systems with /dev/random or an equivalent, it is used by default. A source of
+   entropy can also be defined using the random-device option in named.conf.
 
 Q: I installed BIND 9 and restarted named, but it's still BIND 8. Why?
 
 A: BIND 9 is installed under /usr/local by default. BIND 8 is often installed
    under /usr. Check that the correct named is running.
 
-Q: I'm trying to use TSIG to authenticate dynamic updates or zone transfers.
-   I'm sure I have the keys set up correctly, but the server is rejecting the
-   TSIG. Why?
+Q: I'm trying to use TSIG to authenticate dynamic updates or zone transfers. I'm
+   sure I have the keys set up correctly, but the server is rejecting the TSIG.
+   Why?
 
-A: This may be a clock skew problem. Check that the the clocks on the client
-   and server are properly synchronised (e.g., using ntp).
+A: This may be a clock skew problem. Check that the the clocks on the client and
+   server are properly synchronised (e.g., using ntp).
 
 Q: I'm trying to compile BIND 9, and "make" is failing due to files not being
    found. Why?
 
 A: Using a parallel or distributed "make" to build BIND 9 is not supported, and
-   doesn't work. If you are using one of these, use normal make or gmake
-   instead.
+   doesn't work. If you are using one of these, use normal make or gmake instead.
 
-Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is logging
-   error messages like "notify to 10.0.0.1#53 failed: unexpected end of input".
-   What's wrong?
+Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is logging error
+   messages like "notify to 10.0.0.1#53 failed: unexpected end of input". What's
+   wrong?
 
-A: This error message is caused by a known bug in BIND 8.2.3 and is fixed in
-   BIND 8.2.4. It can be safely ignored - the notify has been acted on by the
-   slave despite the error message.
+A: This error message is caused by a known bug in BIND 8.2.3 and is fixed in BIND
+   8.2.4. It can be safely ignored - the notify has been acted on by the slave
+   despite the error message.
 
 Q: I keep getting log messages like the following. Why?
 
    Dec 4 23:47:59 client 10.0.0.1#1355: updating zone 'example.com/IN': update
-   failed: 'RRset exists (value dependent)' prerequisite not satisfied
-   (NXRRSET)
+   failed: 'RRset exists (value dependent)' prerequisite not satisfied (NXRRSET)
 
-A: DNS updates allow the update request to test to see if certain conditions
-   are met prior to proceeding with the update. The message above is saying
-   that conditions were not met and the update is not proceeding. See doc/rfc/
+A: DNS updates allow the update request to test to see if certain conditions are
+   met prior to proceeding with the update. The message above is saying that
+   conditions were not met and the update is not proceeding. See doc/rfc/
    rfc2136.txt for more details on prerequisites.
 
 Q: I keep getting log messages like the following. Why?
@@ -140,11 +150,11 @@ Q: I keep getting log messages like the following. Why?
    Jun 21 12:00:00.000 client 10.0.0.1#1234: update denied
 
 A: Someone is trying to update your DNS data using the RFC2136 Dynamic Update
-   protocol. Windows 2000 machines have a habit of sending dynamic update
-   requests to DNS servers without being specifically configured to do so. If
-   the update requests are coming from a Windows 2000 machine, see http://
-   support.microsoft.com/support/kb/articles/q246/8/04.asp for information
-   about how to turn them off.
+   protocol. Windows 2000 machines have a habit of sending dynamic update requests
+   to DNS servers without being specifically configured to do so. If the update
+   requests are coming from a Windows 2000 machine, see http://
+   support.microsoft.com/support/kb/articles/q246/8/04.asp for information about
+   how to turn them off.
 
 Q: I see a log message like the following. Why?
 
@@ -152,59 +162,59 @@ Q: I see a log message like the following. Why?
 
 A: You are most likely running named as a non-root user, and that user does not
    have permission to write in /var/run. The common ways of fixing this are to
-   create a /var/run/named directory owned by the named user and set pid-file
-   to "/var/run/named/named.pid", or set pid-file to "named.pid", which will
-   put the file in the directory specified by the directory option (which, in
-   this case, must be writable by the named user).
-
-Q: When I do a "dig . ns", many of the A records for the root servers are
-   missing. Why?
-
-A: This is normal and harmless. It is a somewhat confusing side effect of the
-   way BIND 9 does RFC2181 trust ranking and of the efforts BIND 9 makes to
-   avoid promoting glue into answers.
-
-   When BIND 9 first starts up and primes its cache, it receives the root
-   server addresses as additional data in an authoritative response from a root
-   server, and these records are eligible for inclusion as additional data in
-   responses. Subsequently it receives a subset of the root server addresses as
-   additional data in a non-authoritative (referral) response from a root
-   server. This causes the addresses to now be considered non-authoritative
-   (glue) data, which is not eligible for inclusion in responses.
+   create a /var/run/named directory owned by the named user and set pid-file to "
+   /var/run/named/named.pid", or set pid-file to "named.pid", which will put the
+   file in the directory specified by the directory option (which, in this case,
+   must be writable by the named user).
+
+Q: When I do a "dig . ns", many of the A records for the root servers are missing.
+   Why?
+
+A: This is normal and harmless. It is a somewhat confusing side effect of the way
+   BIND 9 does RFC2181 trust ranking and of the efforts BIND 9 makes to avoid
+   promoting glue into answers.
+
+   When BIND 9 first starts up and primes its cache, it receives the root server
+   addresses as additional data in an authoritative response from a root server,
+   and these records are eligible for inclusion as additional data in responses.
+   Subsequently it receives a subset of the root server addresses as additional
+   data in a non-authoritative (referral) response from a root server. This causes
+   the addresses to now be considered non-authoritative (glue) data, which is not
+   eligible for inclusion in responses.
 
    The server does have a complete set of root server addresses cached at all
    times, it just may not include all of them as additional data, depending on
-   whether they were last received as answers or as glue. You can always look
-   up the addresses with explicit queries like "dig a.root-servers.net A".
+   whether they were last received as answers or as glue. You can always look up
+   the addresses with explicit queries like "dig a.root-servers.net A".
 
 Q: Zone transfers from my BIND 9 master to my Windows 2000 slave fail. Why?
 
-A: This may be caused by a bug in the Windows 2000 DNS server where DNS
-   messages larger than 16K are not handled properly. This can be worked around
-   by setting the option "transfer-format one-answer;". Also check whether your
-   zone contains domain names with embedded spaces or other special characters,
-   like "John\032Doe\213s\032Computer", since such names have been known to
-   cause Windows 2000 slaves to incorrectly reject the zone.
+A: This may be caused by a bug in the Windows 2000 DNS server where DNS messages
+   larger than 16K are not handled properly. This can be worked around by setting
+   the option "transfer-format one-answer;". Also check whether your zone contains
+   domain names with embedded spaces or other special characters, like "John\
+   032Doe\213s\032Computer", since such names have been known to cause Windows
+   2000 slaves to incorrectly reject the zone.
 
 Q: Why don't my zones reload when I do an "rndc reload" or SIGHUP?
 
-A: A zone can be updated either by editing zone files and reloading the server
-   or by dynamic update, but not both. If you have enabled dynamic update for a
-   zone using the "allow-update" option, you are not supposed to edit the zone
-   file by hand, and the server will not attempt to reload it.
+A: A zone can be updated either by editing zone files and reloading the server or
+   by dynamic update, but not both. If you have enabled dynamic update for a zone
+   using the "allow-update" option, you are not supposed to edit the zone file by
+   hand, and the server will not attempt to reload it.
 
 Q: I can query the nameserver from the nameserver but not from other machines.
    Why?
 
-A: This is usually the result of the firewall configuration stopping the
-   queries and / or the replies.
+A: This is usually the result of the firewall configuration stopping the queries
+   and / or the replies.
 
 Q: How can I make a server a slave for both an internal and an external view at
-   the same time? When I tried, both views on the slave were transferred from
-   the same view on the master.
+   the same time? When I tried, both views on the slave were transferred from the
+   same view on the master.
 
-A: You will need to give the master and slave multiple IP addresses and use
-   those to make sure you reach the correct view on the other machine.
+A: You will need to give the master and slave multiple IP addresses and use those
+   to make sure you reach the correct view on the other machine.
 
    Master: 10.0.1.1 (internal), 10.0.1.2 (external, IP alias)
        internal:
@@ -232,8 +242,8 @@ A: You will need to give the master and slave multiple IP addresses and use
            transfer-source 10.0.1.4;
            query-source address 10.0.1.4;
 
-   You put the external address on the alias so that all the other dns clients
-   on these boxes see the internal view by default.
+   You put the external address on the alias so that all the other dns clients on
+   these boxes see the internal view by default.
 
 A: BIND 9.3 and later: Use TSIG to select the appropriate view.
 
@@ -248,7 +258,7 @@ A: BIND 9.3 and later: Use TSIG to select the appropriate view.
            };
            view "external" {
                    match-clients { key external; any; };
-                   server 10.0.0.2 { keys external; };
+                   server 10.0.1.2 { keys external; };
                    recursion no;
                    ...
            };
@@ -264,7 +274,7 @@ A: BIND 9.3 and later: Use TSIG to select the appropriate view.
            };
            view "external" {
                    match-clients { key external; any; };
-                   server 10.0.0.1 { keys external; };
+                   server 10.0.1.1 { keys external; };
                    recursion no;
                    ...
            };
@@ -272,8 +282,8 @@ A: BIND 9.3 and later: Use TSIG to select the appropriate view.
 Q: I have FreeBSD 4.x and "rndc-confgen -a" just sits there.
 
 A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel to use
-   certain interrupts as a source of random events. You can make this permanent
-   by setting rand_irqs in /etc/rc.conf.
+   certain interrupts as a source of random events. You can make this permanent by
+   setting rand_irqs in /etc/rc.conf.
 
    /etc/rc.conf
    rand_irqs="3 14 15"
@@ -283,34 +293,33 @@ A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel to use
 Q: Why is named listening on UDP port other than 53?
 
 A: Named uses a system selected port to make queries of other nameservers. This
-   behaviour can be overridden by using query-source to lock down the port and/
-   or address. See also notify-source and transfer-source.
+   behaviour can be overridden by using query-source to lock down the port and/or
+   address. See also notify-source and transfer-source.
 
-Q: I get error messages like "multiple RRs of singleton type" and "CNAME and
-   other data" when transferring a zone. What does this mean?
+Q: I get error messages like "multiple RRs of singleton type" and "CNAME and other
+   data" when transferring a zone. What does this mean?
 
 A: These indicate a malformed master zone. You can identify the exact records
-   involved by transferring the zone using dig then running named-checkzone on
-   it.
+   involved by transferring the zone using dig then running named-checkzone on it.
 
    dig axfr example.com @master-server > tmp
    named-checkzone example.com tmp
 
-   A CNAME record cannot exist with the same name as another record except for
-   the DNSSEC records which prove its existance (NSEC).
+   A CNAME record cannot exist with the same name as another record except for the
+   DNSSEC records which prove its existance (NSEC).
 
    RFC 1034, Section 3.6.2: "If a CNAME RR is present at a node, no other data
    should be present; this ensures that the data for a canonical name and its
-   aliases cannot be different. This rule also insures that a cached CNAME can
-   be used without checking with an authoritative server for other RR types."
+   aliases cannot be different. This rule also insures that a cached CNAME can be
+   used without checking with an authoritative server for other RR types."
 
-Q: I get error messages like "named.conf:99: unexpected end of input" where 99
-   is the last line of named.conf.
+Q: I get error messages like "named.conf:99: unexpected end of input" where 99 is
+   the last line of named.conf.
 
 A: Some text editors (notepad and wordpad) fail to put a line title indication
-   (e.g. CR/LF) on the last line of a text file. This can be fixed by "adding"
-   a blank line to the end of the file. Named expects to see EOF immediately
-   after EOL and treats text files where this is not met as truncated.
+   (e.g. CR/LF) on the last line of a text file. This can be fixed by "adding" a
+   blank line to the end of the file. Named expects to see EOF immediately after
+   EOL and treats text files where this is not met as truncated.
 
 Q: I get warning messages like "zone example.com/IN: refresh: failure trying
    master 1.2.3.4#53: timed out".
@@ -319,15 +328,15 @@ A: Check that you can make UDP queries from the slave to the master
 
    dig +norec example.com soa @1.2.3.4
 
-   You could be generating queries faster than the slave can cope with. Lower
-   the serial query rate.
+   You could be generating queries faster than the slave can cope with. Lower the
+   serial query rate.
 
    serial-query-rate 5; // default 20
 
 Q: How do I share a dynamic zone between multiple views?
 
-A: You choose one view to be master and the second a slave and transfer the
-   zone between views.
+A: You choose one view to be master and the second a slave and transfer the zone
+   between views.
 
    Master 10.0.1.1:
            key "external" {
@@ -370,14 +379,14 @@ Q: I get a error message like "zone wireless.ietf56.ietf.org/IN: loading master
    file primaries/wireless.ietf56.ietf.org: no owner".
 
 A: This error is produced when a line in the master file contains leading white
-   space (tab/space) but the is no current record owner name to inherit the
-   name from. Usually this is the result of putting white space before a
-   comment. Forgeting the "@" for the SOA record or indenting the master file.
+   space (tab/space) but the is no current record owner name to inherit the name
+   from. Usually this is the result of putting white space before a comment.
+   Forgeting the "@" for the SOA record or indenting the master file.
 
 Q: Why are my logs in GMT (UTC).
 
-A: You are running chrooted (-t) and have not supplied local timzone
-   information in the chroot area.
+A: You are running chrooted (-t) and have not supplied local timzone information
+   in the chroot area.
 
    FreeBSD: /etc/localtime
    Solaris: /etc/TIMEZONE and /usr/share/lib/zoneinfo
@@ -395,23 +404,23 @@ Q: I get "rndc: connect failed: connection refused" when I try to run rndc.
 
 A: This is usually a configuration error.
 
-   First ensure that named is running and no errors are being reported at
-   startup (/var/log/messages or equivalent). Running "named -g <usual
-   arguments>" from a title can help at this point.
+   First ensure that named is running and no errors are being reported at startup
+   (/var/log/messages or equivalent). Running "named -g <usual arguments>" from a
+   title can help at this point.
 
    Secondly ensure that named is configured to use rndc either by "rndc-confgen
-   -a", rndc-confgen or manually. The Administrators Reference manual has
-   details on how to do this.
+   -a", rndc-confgen or manually. The Administrators Reference manual has details
+   on how to do this.
 
    Old versions of rndc-confgen used localhost rather than 127.0.0.1 in /etc/
    rndc.conf for the default server. Update /etc/rndc.conf if necessary so that
    the default server listed in /etc/rndc.conf matches the addresses used in
    named.conf. "localhost" has two address (127.0.0.1 and ::1).
 
-   If you use "rndc-confgen -a" and named is running with -t or -u ensure that
-   /etc/rndc.conf has the correct ownership and that a copy is in the chroot
-   area. You can do this by re-running "rndc-confgen -a" with appropriate -t
-   and -u arguments.
+   If you use "rndc-confgen -a" and named is running with -t or -u ensure that /
+   etc/rndc.conf has the correct ownership and that a copy is in the chroot area.
+   You can do this by re-running "rndc-confgen -a" with appropriate -t and -u
+   arguments.
 
 Q: I don't get RRSIG's returned when I use "dig +dnssec".
 
@@ -419,12 +428,11 @@ A: You need to ensure DNSSEC is enabled (dnssec-enable yes;).
 
 Q: I get "Error 1067" when starting named under Windows.
 
-A: This is the service manager saying that named exited. You need to examine
-   the Application log in the EventViewer to find out why.
+A: This is the service manager saying that named exited. You need to examine the
+   Application log in the EventViewer to find out why.
 
-   Common causes are that you failed to create "named.conf" (usually "C:\
-   windows\dns\etc\named.conf") or failed to specify the directory in
-   named.conf.
+   Common causes are that you failed to create "named.conf" (usually "C:\windows\
+   dns\etc\named.conf") or failed to specify the directory in named.conf.
 
    options {
            Directory "C:\windows\dns\etc";
@@ -439,11 +447,11 @@ A: These indicate a filesystem permission error preventing named creating /
 
    "dumping master file: sl/tmp-XXXX5il3sQ: open: permission denied"
 
-   Named needs write permission on the directory containing the file. Named
-   writes the new cache file to a temporary file then renames it to the name
-   specified in named.conf to ensure that the contents are always complete.
-   This is to prevent named loading a partial zone in the event of power
-   failure or similar interrupting the write of the master file.
+   Named needs write permission on the directory containing the file. Named writes
+   the new cache file to a temporary file then renames it to the name specified in
+   named.conf to ensure that the contents are always complete. This is to prevent
+   named loading a partial zone in the event of power failure or similar
+   interrupting the write of the master file.
 
    Note file names are relative to the directory specified in options and any
    chroot directory ([<chroot dir>/][<options dir>]).
@@ -489,8 +497,8 @@ A: If the IN-ADDR.ARPA name covered refers to a internal address space you are
 
    If you are not using these private addresses then a client has queried for
    them. You can just ignore the messages, get the offending client to stop
-   sending you these messages as they are most probably leaking them or setup
-   your own zones empty zones to serve answers to these queries.
+   sending you these messages as they are most probably leaking them or setup your
+   own zones empty zones to serve answers to these queries.
 
    zone "10.IN-ADDR.ARPA" {
            type master;
@@ -523,3 +531,102 @@ A: If the IN-ADDR.ARPA name covered refers to a internal address space you are
 
    Future versions of named are likely to do this automatically.
 
+Q: I'm running BIND on Red Hat Enterprise Linux or Fedora Core -
+
+   Why can't named update slave zone database files?
+
+   Why can't named create DDNS journal files or update the master zones from
+   journals?
+
+   Why can't named create custom log files?
+
+A: Red Hat Security Enhanced Linux (SELinux) policy security protections :
+
+   Red Hat have adopted the National Security Agency's SELinux security policy (
+   see http://www.nsa.gov/selinux ) and recommendations for BIND security , which
+   are more secure than running named in a chroot and make use of the bind-chroot
+   environment unecessary .
+
+   By default, named is not allowed by the SELinux policy to write, create or
+   delete any files EXCEPT in these directories:
+
+   $ROOTDIR/var/named/slaves
+   $ROOTDIR/var/named/data
+   $ROOTDIR/var/tmp
+
+
+   where $ROOTDIR may be set in /etc/sysconfig/named if bind-chroot is installed.
+
+   The SELinux policy particularly does NOT allow named to modify the $ROOTDIR/var
+   /named directory, the default location for master zone database files.
+
+   SELinux policy overrules file access permissions - so even if all the files
+   under /var/named have ownership named:named and mode rw-rw-r--, named will
+   still not be able to write or create files except in the directories above,
+   with SELinux in Enforcing mode.
+
+   So, to allow named to update slave or DDNS zone files, it is best to locate
+   them in $ROOTDIR/var/named/slaves, with named.conf zone statements such as:
+
+   zone "slave.zone." IN {
+           type slave;
+           file "slaves/slave.zone.db";
+           ...
+   };
+   zone "ddns.zone." IN  {
+           type master;
+           allow-updates {...};
+           file "slaves/ddns.zone.db";
+   };
+
+
+   To allow named to create its cache dump and statistics files, for example, you
+   could use named.conf options statements such as:
+
+   options {
+           ...
+           dump-file "/var/named/data/cache_dump.db";
+           statistics-file "/var/named/data/named_stats.txt";
+           ...
+   };
+
+
+   You can also tell SELinux to allow named to update any zone database files, by
+   setting the SELinux tunable boolean parameter 'named_write_master_zones=1',
+   using the system-config-securitylevel GUI, using the 'setsebool' command, or in
+   /etc/selinux/targeted/booleans.
+
+   You can disable SELinux protection for named entirely by setting the
+   'named_disable_trans=1' SELinux tunable boolean parameter.
+
+   The SELinux named policy defines these SELinux contexts for named:
+
+   named_zone_t : for zone database files       - $ROOTDIR/var/named/*
+   named_conf_t : for named configuration files - $ROOTDIR/etc/{named,rndc}.*
+   named_cache_t: for files modifiable by named - $ROOTDIR/var/{tmp,named/{slaves,data}}
+
+
+   If you want to retain use of the SELinux policy for named, and put named files
+   in different locations, you can do so by changing the context of the custom
+   file locations .
+
+   To create a custom configuration file location, eg. '/root/named.conf', to use
+   with the 'named -c' option, do:
+
+   # chcon system_u:object_r:named_conf_t /root/named.conf
+
+
+   To create a custom modifiable named data location, eg. '/var/log/named' for a
+   log file, do:
+
+   # chcon system_u:object_r:named_cache_t /var/log/named
+
+
+   To create a custom zone file location, eg. /root/zones/, do:
+
+   # chcon system_u:object_r:named_zone_t /root/zones/{.,*}
+
+
+   See these man-pages for more information : selinux(8), named_selinux(8), chcon
+   (1), setsebool(8)
+
diff --git a/FAQ.xml b/FAQ.xml
index 963cd0a8..8c43ed5a 100644
--- a/FAQ.xml
+++ b/FAQ.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []>
 <!--
- - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: FAQ.xml,v 1.4.6.3 2005/11/02 22:53:51 marka Exp $ -->
+<!-- $Id: FAQ.xml,v 1.4.6.5 2006/02/27 21:11:40 marka Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>
@@ -67,6 +67,26 @@
     <qandaentry>
       <question>
 	<para>
+	  Why do I get the following errors:
+<programlisting>general: errno2result.c:109: unexpected error:
+general: unable to convert errno to isc_result: 14: Bad address
+client: UDP client handler shutting down due to fatal receive error: unexpected error</programlisting>
+	</para>
+      </question>
+      <answer>
+	<para>
+	  This is the result of a Linux kernel bug.
+	</para>
+	<para>
+	  See:
+	  <ulink url="http://marc.theaimsgroup.com/?l=linux-netdev&amp;m=113081708031466&amp;w=2">http://marc.theaimsgroup.com/?l=linux-netdev&amp;m=113081708031466&amp;w=2</ulink>
+	</para>
+      </answer>
+    </qandaentry>
+
+    <qandaentry>
+      <question>
+	<para>
 	  Why does named log the warning message <quote>no TTL specified -
 	  using SOA MINTTL instead</quote>?
 	</para>
@@ -105,6 +125,10 @@ example.com. 86400 IN SOA ns hostmaster ( 1 3600 1800 1814400 3600 )</programlis
 	  is not cumulative; if each process is using 10M of memory,
 	  only a total of 10M is used.
 	</para>
+	<para>
+	  Newer versions of Linux's ps command hide the individual threads
+	  and require -L to display them.
+	</para>
       </answer>
     </qandaentry>
 
@@ -516,7 +540,7 @@ Master 10.0.1.1:
 	};
 	view "external" {
 		match-clients { key external; any; };
-		server 10.0.0.2 { keys external; };
+		server 10.0.1.2 { keys external; };
 		recursion no;
 		...
 	};
@@ -532,7 +556,7 @@ Slave 10.0.1.2:
 	};
 	view "external" {
 		match-clients { key external; any; };
-		server 10.0.0.1 { keys external; };
+		server 10.0.1.1 { keys external; };
 		recursion no;
 		...
 	};</programlisting>
@@ -997,11 +1021,177 @@ empty:
 	       1 3600 1200 604800 10800 )
 @ 10800 IN NS &lt;name-of-server&gt;.</programlisting>
 	</informalexample>
+	<para>
 	<note>
 	  Future versions of named are likely to do this automatically.
 	</note>
+	</para>
       </answer>
     </qandaentry>
 
+    <qandaentry>
+      <question>
+	<para>
+	   I'm running BIND on Red Hat Enterprise Linux or Fedora Core -
+	</para>
+	<para>
+	  Why can't named update slave zone database files?
+	</para>
+	<para>
+	  Why can't named create DDNS journal files or update
+	  the master zones from journals?
+	</para>
+	<para>
+	  Why can't named create custom log files?
+	</para>
+      </question>
+
+      <answer>
+	<para>
+	  Red Hat Security Enhanced Linux (SELinux) policy security
+	  protections :
+	</para>
+
+	<para>
+	   Red Hat have adopted the National Security Agency's
+	   SELinux security policy ( see http://www.nsa.gov/selinux
+	   ) and recommendations for BIND security , which are more
+	   secure than running named in a chroot and make use of
+	   the bind-chroot environment unecessary .
+	</para>
+
+	<para>
+	  By default, named is not allowed by the SELinux policy
+	  to write, create or delete any files EXCEPT in these
+	  directories:
+	  <informalexample>
+	    <programlisting>
+$ROOTDIR/var/named/slaves
+$ROOTDIR/var/named/data
+$ROOTDIR/var/tmp
+	    </programlisting>
+	  </informalexample>
+	  where $ROOTDIR may be set in /etc/sysconfig/named if
+	  bind-chroot is installed.
+	</para>
+
+	<para>
+	  The SELinux policy particularly does NOT allow named to modify
+	  the $ROOTDIR/var/named directory, the default location for master
+	  zone database files.
+	</para>
+
+	<para>
+	  SELinux policy overrules file access permissions - so
+	  even if all the files under /var/named have ownership
+	  named:named and mode rw-rw-r--, named will still not be
+	  able to write or create files except in the directories
+	  above, with SELinux in Enforcing mode.
+	</para>
+  
+	<para>
+	  So, to allow named to update slave or DDNS zone files,
+	  it is best to locate them in $ROOTDIR/var/named/slaves,
+	  with named.conf zone statements such as:
+	  <informalexample>
+	    <programlisting>
+zone "slave.zone." IN {
+	type slave;
+	file "slaves/slave.zone.db";
+	...
+};   
+zone "ddns.zone." IN  {
+	type master;
+	allow-updates {...};
+	file "slaves/ddns.zone.db";
+};
+	    </programlisting>
+	  </informalexample>
+	</para>
+
+	<para>
+	  To allow named to create its cache dump and statistics
+	  files, for example, you could use named.conf options
+	  statements such as:
+	  <informalexample>
+	    <programlisting>
+options {
+	...
+	dump-file "/var/named/data/cache_dump.db";
+	statistics-file "/var/named/data/named_stats.txt";
+	...
+};
+	    </programlisting>
+	  </informalexample>
+	</para>
+
+	<para>
+	  You can also tell SELinux to allow named to update any
+	  zone database files, by setting the SELinux tunable boolean
+	  parameter 'named_write_master_zones=1', using the
+	  system-config-securitylevel GUI, using the 'setsebool'
+	  command, or in /etc/selinux/targeted/booleans.
+	</para>
+  
+	<para>
+	  You can disable SELinux protection for named entirely by
+	  setting the 'named_disable_trans=1' SELinux tunable boolean
+	  parameter.
+	</para>
+    
+	<para>
+	  The SELinux named policy defines these SELinux contexts for named:
+	  <informalexample>
+	    <programlisting>
+named_zone_t : for zone database files       - $ROOTDIR/var/named/*
+named_conf_t : for named configuration files - $ROOTDIR/etc/{named,rndc}.*
+named_cache_t: for files modifiable by named - $ROOTDIR/var/{tmp,named/{slaves,data}}
+	    </programlisting>
+	  </informalexample>
+	</para>
+   
+	<para>
+	  If you want to retain use of the SELinux policy for named,
+	  and put named files in different locations, you can do
+	  so by changing the context of the custom file locations
+	  .
+	</para>
+
+	<para>
+	  To create a custom configuration file location, eg.
+	  '/root/named.conf', to use with the 'named -c' option,
+	  do:
+	  <informalexample>
+	    <programlisting>
+# chcon system_u:object_r:named_conf_t /root/named.conf
+	    </programlisting>
+	  </informalexample>
+	</para>
+  
+	<para>
+	  To create a custom modifiable named data location, eg.
+	  '/var/log/named' for a log file, do:
+	  <informalexample>
+	    <programlisting>
+# chcon system_u:object_r:named_cache_t /var/log/named
+	    </programlisting>
+	  </informalexample>
+	</para>
+   
+	<para>
+   To create a custom zone file location, eg. /root/zones/, do:
+	  <informalexample>
+	    <programlisting>
+# chcon system_u:object_r:named_zone_t /root/zones/{.,*}
+	    </programlisting>
+	  </informalexample>
+	</para>
+  
+	<para>
+	  See these man-pages for more information : selinux(8),
+	  named_selinux(8), chcon(1), setsebool(8)
+	</para>
+      </answer>
+    </qandaentry>
   </qandaset>
 </article>
diff --git a/Makefile.in b/Makefile.in
index a2a06531..7f3a6888 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -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.41.2.2.2.2 2004/03/08 04:04:12 marka Exp $
+# $Id: Makefile.in,v 1.41.2.2.2.4 2006/05/19 00:04:00 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -44,7 +44,8 @@ maintainer-clean::
 	rm -f configure
 
 installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \
+	${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
 
 install:: isc-config.sh installdirs
 	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
diff --git a/README b/README
index 574b07d7..91ba0d6f 100644
--- a/README
+++ b/README
@@ -265,10 +265,23 @@ Building
 		Enable DNSSEC signature chasing support in dig.
 		  -DDIG_SIGCHASE=1 (sets -DDIG_SIGCHASE_TD=1 and
 				    -DDIG_SIGCHASE_BU=1)
+		Disable dropping queries from particular well known ports.
+		  -DNS_CLIENT_DROPPORT=0
 
 	    LDFLAGS
 		Linker flags. Defaults to empty string.
 
+	The following need to be set when cross compiling.
+
+	    BUILD_CC
+		The native C compiler.
+	    BUILD_CFLAGS (optional)
+	    BUILD_CPPFLAGS (optional)
+		Possible Settings:
+		-DNEED_OPTARG=1		(optarg is not declared in <unistd.h>)
+	    BUILD_LDFLAGS (optional)
+	    BUILD_LIBS (optional)
+
 	To build shared libraries, specify "--with-libtool" on the
 	configure command line.
 
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index e7f91386..f50461d7 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.12.12.9 2005/03/03 06:33:38 marka Exp $ */
+/* $Id: named-checkconf.c,v 1.12.12.11 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -60,9 +60,9 @@ usage(void) {
 }
 
 static isc_result_t
-directory_callback(const char *clausename, cfg_obj_t *obj, void *arg) {
+directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) {
 	isc_result_t result;
-	char *directory;
+	const char *directory;
 
 	REQUIRE(strcasecmp("directory", clausename) == 0);
 
@@ -85,18 +85,18 @@ directory_callback(const char *clausename, cfg_obj_t *obj, void *arg) {
 }
 
 static isc_result_t
-configure_zone(const char *vclass, const char *view, cfg_obj_t *zconfig,
-	       isc_mem_t *mctx)
+configure_zone(const char *vclass, const char *view,
+	       const cfg_obj_t *zconfig, isc_mem_t *mctx)
 {
 	isc_result_t result;
 	const char *zclass;
 	const char *zname;
 	const char *zfile;
-	cfg_obj_t *zoptions = NULL;
-	cfg_obj_t *classobj = NULL;
-	cfg_obj_t *typeobj = NULL;
-	cfg_obj_t *fileobj = NULL;
-	cfg_obj_t *dbobj = NULL;
+	const cfg_obj_t *zoptions = NULL;
+	const cfg_obj_t *classobj = NULL;
+	const cfg_obj_t *typeobj = NULL;
+	const cfg_obj_t *fileobj = NULL;
+	const cfg_obj_t *dbobj = NULL;
 
 	zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name"));
 	classobj = cfg_tuple_get(zconfig, "class");
@@ -125,12 +125,12 @@ configure_zone(const char *vclass, const char *view, cfg_obj_t *zconfig,
 }
 
 static isc_result_t
-configure_view(const char *vclass, const char *view, cfg_obj_t *config,
-	       cfg_obj_t *vconfig, isc_mem_t *mctx)
+configure_view(const char *vclass, const char *view, const cfg_obj_t *config,
+	       const cfg_obj_t *vconfig, isc_mem_t *mctx)
 {
-	cfg_listelt_t *element;
-	cfg_obj_t *voptions;
-	cfg_obj_t *zonelist;
+	const cfg_listelt_t *element;
+	const cfg_obj_t *voptions;
+	const cfg_obj_t *zonelist;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 
@@ -148,7 +148,7 @@ configure_view(const char *vclass, const char *view, cfg_obj_t *config,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *zconfig = cfg_listelt_value(element);
+		const cfg_obj_t *zconfig = cfg_listelt_value(element);
 		tresult = configure_zone(vclass, view, zconfig, mctx);
 		if (tresult != ISC_R_SUCCESS)
 			result = tresult;
@@ -158,11 +158,11 @@ configure_view(const char *vclass, const char *view, cfg_obj_t *config,
 
 
 static isc_result_t
-load_zones_fromconfig(cfg_obj_t *config, isc_mem_t *mctx) {
-	cfg_listelt_t *element;
-	cfg_obj_t *classobj;
-	cfg_obj_t *views;
-	cfg_obj_t *vconfig;
+load_zones_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx) {
+	const cfg_listelt_t *element;
+	const cfg_obj_t *classobj;
+	const cfg_obj_t *views;
+	const cfg_obj_t *vconfig;
 	const char *vclass;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html
index 14b8ff89..dc102f1e 100644
--- a/bin/check/named-checkconf.html
+++ b/bin/check/named-checkconf.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkconf.html,v 1.5.2.1.4.12 2005/10/13 02:33:42 marka Exp $ -->
+<!-- $Id: named-checkconf.html,v 1.5.2.1.4.14 2006/04/23 10:11:11 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">named-checkconf</span> &#8212; named configuration file syntax checking tool</p>
@@ -32,14 +32,14 @@
 <div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-z</code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525865"></a><h2>DESCRIPTION</h2>
+<a name="id2524089"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">named-checkconf</strong></span> checks the syntax, but not
 	the semantics, of a named configuration file.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525878"></a><h2>OPTIONS</h2>
+<a name="id2524443"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
 <dd><p>
@@ -69,21 +69,21 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525970"></a><h2>RETURN VALUES</h2>
+<a name="id2525218"></a><h2>RETURN VALUES</h2>
 <p>
         <span><strong class="command">named-checkconf</strong></span> returns an exit status of 1 if
 	errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525982"></a><h2>SEE ALSO</h2>
+<a name="id2525230"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526006"></a><h2>AUTHOR</h2>
+<a name="id2525254"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/check/named-checkzone.html b/bin/check/named-checkzone.html
index cf544c94..4d3db0b2 100644
--- a/bin/check/named-checkzone.html
+++ b/bin/check/named-checkzone.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named-checkzone.html,v 1.5.2.2.4.13 2005/10/13 02:33:42 marka Exp $ -->
+<!-- $Id: named-checkzone.html,v 1.5.2.2.4.14 2006/04/23 10:11:11 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">named-checkzone</span> &#8212; zone file validity checking tool</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-checkzone</code>  [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-o <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] {zonename} {filename}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525922"></a><h2>DESCRIPTION</h2>
+<a name="id2524487"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">named-checkzone</strong></span> checks the syntax and integrity of
 	a zone file.  It performs the same checks as <span><strong class="command">named</strong></span>
@@ -42,7 +42,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525942"></a><h2>OPTIONS</h2>
+<a name="id2525190"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-d</span></dt>
 <dd><p>
@@ -111,14 +111,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526187"></a><h2>RETURN VALUES</h2>
+<a name="id2525435"></a><h2>RETURN VALUES</h2>
 <p>
         <span><strong class="command">named-checkzone</strong></span> returns an exit status of 1 if
 	errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526200"></a><h2>SEE ALSO</h2>
+<a name="id2525448"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <em class="citetitle">RFC 1035</em>,
@@ -126,7 +126,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526227"></a><h2>AUTHOR</h2>
+<a name="id2525475"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/check/win32/namedcheckconf.dsp b/bin/check/win32/namedcheckconf.dsp
index 72910f4d..e180f385 100644
--- a/bin/check/win32/namedcheckconf.dsp
+++ b/bin/check/win32/namedcheckconf.dsp
@@ -1,111 +1,111 @@
-# Microsoft Developer Studio Project File - Name="namedcheckconf" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=namedcheckconf - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckconf.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkconf.exe"

-

-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "namedcheckconf - Win32 Release"

-# Name "namedcheckconf - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\check-tool.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\named-checkconf.c"

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE="..\check-tool.h"

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="namedcheckconf" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=namedcheckconf - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckconf.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkconf.exe"
+
+!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "namedcheckconf - Win32 Release"
+# Name "namedcheckconf - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\check-tool.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\named-checkconf.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="..\check-tool.h"
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/check/win32/namedcheckconf.dsw b/bin/check/win32/namedcheckconf.dsw
index d7b794f9..7433eeb2 100644
--- a/bin/check/win32/namedcheckconf.dsw
+++ b/bin/check/win32/namedcheckconf.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "namedcheckconf"=".\namedcheckconf.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "namedcheckconf"=".\namedcheckconf.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/check/win32/namedcheckconf.mak b/bin/check/win32/namedcheckconf.mak
index 5c4ea159..1119c195 100644
--- a/bin/check/win32/namedcheckconf.mak
+++ b/bin/check/win32/namedcheckconf.mak
@@ -1,289 +1,289 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckconf.dsp

-!IF "$(CFG)" == ""

-CFG=namedcheckconf - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to namedcheckconf - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "namedcheckconf - Win32 Release" && "$(CFG)" != "namedcheckconf - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-# Begin Custom Macros

-OutDir=.\Release

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"

-

-!ELSE 

-

-ALL : "libdns - Win32 Release" "libisccfg - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libdns - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check-tool.obj"

-	-@erase "$(INTDIR)\check-tool.sbr"

-	-@erase "$(INTDIR)\named-checkconf.obj"

-	-@erase "$(INTDIR)\named-checkconf.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(OUTDIR)\namedcheckconf.bsc"

-	-@erase "..\..\..\Build\Release\named-checkconf.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\namedcheckconf.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\check-tool.sbr" \

-	"$(INTDIR)\named-checkconf.sbr"

-

-"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib  ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkconf.pdb" /machine:I386 /out:"../../../Build/Release/named-checkconf.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\check-tool.obj" \

-	"$(INTDIR)\named-checkconf.obj" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib"

-

-"..\..\..\Build\Release\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"

-

-!ELSE 

-

-ALL : "libdns - Win32 Debug" "libisccfg - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libdns - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check-tool.obj"

-	-@erase "$(INTDIR)\check-tool.sbr"

-	-@erase "$(INTDIR)\named-checkconf.obj"

-	-@erase "$(INTDIR)\named-checkconf.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\named-checkconf.pdb"

-	-@erase "$(OUTDIR)\namedcheckconf.bsc"

-	-@erase "..\..\..\Build\Debug\named-checkconf.exe"

-	-@erase "..\..\..\Build\Debug\named-checkconf.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\check-tool.sbr" \

-	"$(INTDIR)\named-checkconf.sbr"

-

-"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib  ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkconf.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\check-tool.obj" \

-	"$(INTDIR)\named-checkconf.obj" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib"

-

-"..\..\..\Build\Debug\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("namedcheckconf.dep")

-!INCLUDE "namedcheckconf.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "namedcheckconf.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "namedcheckconf - Win32 Release" || "$(CFG)" == "namedcheckconf - Win32 Debug"

-SOURCE="..\check-tool.c"

-

-"$(INTDIR)\check-tool.obj"	"$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-SOURCE="..\named-checkconf.c"

-

-"$(INTDIR)\named-checkconf.obj"	"$(INTDIR)\named-checkconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\check\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\check\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"

-

-"libisccfg - Win32 Release" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 

-   cd "..\..\..\bin\check\win32"

-

-"libisccfg - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"

-

-"libisccfg - Win32 Debug" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 

-   cd "..\..\..\bin\check\win32"

-

-"libisccfg - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\check\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\check\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckconf.dsp
+!IF "$(CFG)" == ""
+CFG=namedcheckconf - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to namedcheckconf - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "namedcheckconf - Win32 Release" && "$(CFG)" != "namedcheckconf - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+
+!ELSE 
+
+ALL : "libdns - Win32 Release" "libisccfg - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libdns - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check-tool.obj"
+	-@erase "$(INTDIR)\check-tool.sbr"
+	-@erase "$(INTDIR)\named-checkconf.obj"
+	-@erase "$(INTDIR)\named-checkconf.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\namedcheckconf.bsc"
+	-@erase "..\..\..\Build\Release\named-checkconf.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\namedcheckconf.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\check-tool.sbr" \
+	"$(INTDIR)\named-checkconf.sbr"
+
+"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib  ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkconf.pdb" /machine:I386 /out:"../../../Build/Release/named-checkconf.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\check-tool.obj" \
+	"$(INTDIR)\named-checkconf.obj" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib"
+
+"..\..\..\Build\Release\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+
+!ELSE 
+
+ALL : "libdns - Win32 Debug" "libisccfg - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libdns - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check-tool.obj"
+	-@erase "$(INTDIR)\check-tool.sbr"
+	-@erase "$(INTDIR)\named-checkconf.obj"
+	-@erase "$(INTDIR)\named-checkconf.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\named-checkconf.pdb"
+	-@erase "$(OUTDIR)\namedcheckconf.bsc"
+	-@erase "..\..\..\Build\Debug\named-checkconf.exe"
+	-@erase "..\..\..\Build\Debug\named-checkconf.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\check-tool.sbr" \
+	"$(INTDIR)\named-checkconf.sbr"
+
+"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib  ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkconf.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\check-tool.obj" \
+	"$(INTDIR)\named-checkconf.obj" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib"
+
+"..\..\..\Build\Debug\named-checkconf.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("namedcheckconf.dep")
+!INCLUDE "namedcheckconf.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "namedcheckconf.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "namedcheckconf - Win32 Release" || "$(CFG)" == "namedcheckconf - Win32 Debug"
+SOURCE="..\check-tool.c"
+
+"$(INTDIR)\check-tool.obj"	"$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\named-checkconf.c"
+
+"$(INTDIR)\named-checkconf.obj"	"$(INTDIR)\named-checkconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\check\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\check\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+
+"libisccfg - Win32 Release" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   cd "..\..\..\bin\check\win32"
+
+"libisccfg - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+
+"libisccfg - Win32 Debug" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   cd "..\..\..\bin\check\win32"
+
+"libisccfg - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\check\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\check\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/check/win32/namedcheckzone.dsp b/bin/check/win32/namedcheckzone.dsp
index ebb8ae7e..e18514ce 100644
--- a/bin/check/win32/namedcheckzone.dsp
+++ b/bin/check/win32/namedcheckzone.dsp
@@ -1,112 +1,112 @@
-# Microsoft Developer Studio Project File - Name="namedcheckzone" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=namedcheckzone - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckzone.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c

-# SUBTRACT CPP /Fr

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkzone.exe"

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "namedcheckzone - Win32 Release"

-# Name "namedcheckzone - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\check-tool.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\named-checkzone.c"

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE="..\check-tool.h"

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="namedcheckzone" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=namedcheckzone - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckzone.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkzone.exe"
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "namedcheckzone - Win32 Release"
+# Name "namedcheckzone - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\check-tool.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\named-checkzone.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="..\check-tool.h"
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/check/win32/namedcheckzone.dsw b/bin/check/win32/namedcheckzone.dsw
index d723eb5a..68cb1ac1 100644
--- a/bin/check/win32/namedcheckzone.dsw
+++ b/bin/check/win32/namedcheckzone.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "namedcheckzone"=".\namedcheckzone.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "namedcheckzone"=".\namedcheckzone.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/check/win32/namedcheckzone.mak b/bin/check/win32/namedcheckzone.mak
index 51d192ab..d16fef9f 100644
--- a/bin/check/win32/namedcheckzone.mak
+++ b/bin/check/win32/namedcheckzone.mak
@@ -1,305 +1,305 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckzone.dsp

-!IF "$(CFG)" == ""

-CFG=namedcheckzone - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to namedcheckzone - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "namedcheckzone - Win32 Release" && "$(CFG)" != "namedcheckzone - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\named-checkzone.exe"

-

-!ELSE 

-

-ALL : "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named-checkzone.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check-tool.obj"

-	-@erase "$(INTDIR)\named-checkzone.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\named-checkzone.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\namedcheckzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" /machine:I386 /out:"../../../Build/Release/named-checkzone.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\check-tool.obj" \

-	"$(INTDIR)\named-checkzone.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib"

-

-"..\..\..\Build\Release\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"

-

-!ELSE 

-

-ALL : "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check-tool.obj"

-	-@erase "$(INTDIR)\check-tool.sbr"

-	-@erase "$(INTDIR)\named-checkzone.obj"

-	-@erase "$(INTDIR)\named-checkzone.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\named-checkzone.pdb"

-	-@erase "$(OUTDIR)\namedcheckzone.bsc"

-	-@erase "..\..\..\Build\Debug\named-checkzone.exe"

-	-@erase "..\..\..\Build\Debug\named-checkzone.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\check-tool.sbr" \

-	"$(INTDIR)\named-checkzone.sbr"

-

-"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\check-tool.obj" \

-	"$(INTDIR)\named-checkzone.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib"

-

-"..\..\..\Build\Debug\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("namedcheckzone.dep")

-!INCLUDE "namedcheckzone.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "namedcheckzone.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "namedcheckzone - Win32 Release" || "$(CFG)" == "namedcheckzone - Win32 Debug"

-SOURCE="..\check-tool.c"

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-

-"$(INTDIR)\check-tool.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-

-"$(INTDIR)\check-tool.obj"	"$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE="..\named-checkzone.c"

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-

-"$(INTDIR)\named-checkzone.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-

-"$(INTDIR)\named-checkzone.obj"	"$(INTDIR)\named-checkzone.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\check\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\check\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\check\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\check\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\check\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckzone.dsp
+!IF "$(CFG)" == ""
+CFG=namedcheckzone - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to namedcheckzone - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "namedcheckzone - Win32 Release" && "$(CFG)" != "namedcheckzone - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\named-checkzone.exe"
+
+!ELSE 
+
+ALL : "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named-checkzone.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check-tool.obj"
+	-@erase "$(INTDIR)\named-checkzone.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\named-checkzone.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\namedcheckzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" /machine:I386 /out:"../../../Build/Release/named-checkzone.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\check-tool.obj" \
+	"$(INTDIR)\named-checkzone.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib"
+
+"..\..\..\Build\Release\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+
+!ELSE 
+
+ALL : "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check-tool.obj"
+	-@erase "$(INTDIR)\check-tool.sbr"
+	-@erase "$(INTDIR)\named-checkzone.obj"
+	-@erase "$(INTDIR)\named-checkzone.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\named-checkzone.pdb"
+	-@erase "$(OUTDIR)\namedcheckzone.bsc"
+	-@erase "..\..\..\Build\Debug\named-checkzone.exe"
+	-@erase "..\..\..\Build\Debug\named-checkzone.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\check-tool.sbr" \
+	"$(INTDIR)\named-checkzone.sbr"
+
+"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\check-tool.obj" \
+	"$(INTDIR)\named-checkzone.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("namedcheckzone.dep")
+!INCLUDE "namedcheckzone.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "namedcheckzone.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "namedcheckzone - Win32 Release" || "$(CFG)" == "namedcheckzone - Win32 Debug"
+SOURCE="..\check-tool.c"
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+
+"$(INTDIR)\check-tool.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+
+"$(INTDIR)\check-tool.obj"	"$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE="..\named-checkzone.c"
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+
+"$(INTDIR)\named-checkzone.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+
+"$(INTDIR)\named-checkzone.obj"	"$(INTDIR)\named-checkzone.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\check\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\check\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\check\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\check\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\check\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 3425fb3d..8c405da0 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dig.html,v 1.6.2.4.2.13 2005/10/13 02:33:43 marka Exp $ -->
+<!-- $Id: dig.html,v 1.6.2.4.2.14 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>dig &#8212; DNS lookup utility</p>
@@ -34,7 +34,7 @@
 <div class="cmdsynopsis"><p><code class="command">dig</code>  [global-queryopt...] [query...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525976"></a><h2>DESCRIPTION</h2>
+<a name="id2525224"></a><h2>DESCRIPTION</h2>
 <p>
 <span><strong class="command">dig</strong></span> (domain information groper) is a flexible tool
 for interrogating DNS name servers.  It performs DNS lookups and
@@ -69,7 +69,7 @@ are applied before the command line arguments.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526035"></a><h2>SIMPLE USAGE</h2>
+<a name="id2525283"></a><h2>SIMPLE USAGE</h2>
 <p>
 A typical invocation of <span><strong class="command">dig</strong></span> looks like:
 </p>
@@ -107,7 +107,7 @@ ANY, A, MX, SIG, etc.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526114"></a><h2>OPTIONS</h2>
+<a name="id2525362"></a><h2>OPTIONS</h2>
 <p>
 The <code class="option">-b</code> option sets the source IP address of the query
 to <em class="parameter"><code>address</code></em>.  This must be a valid address on
@@ -188,7 +188,7 @@ being used.  In BIND, this is done by providing appropriate
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526365"></a><h2>QUERY OPTIONS</h2>
+<a name="id2525613"></a><h2>QUERY OPTIONS</h2>
 <p>
 <span><strong class="command">dig</strong></span> provides a number of query options which affect
 the way in which lookups are made and the results displayed.  Some of
@@ -446,7 +446,7 @@ Requires dig be compiled with -DDIG_SIGCHASE.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527033"></a><h2>MULTIPLE QUERIES</h2>
+<a name="id2526281"></a><h2>MULTIPLE QUERIES</h2>
 <p>
 The BIND 9 implementation of <span><strong class="command">dig </strong></span> supports
 specifying multiple queries on the command line (in addition to
@@ -487,7 +487,7 @@ will not print the initial query when it looks up the NS records for
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527092"></a><h2>FILES</h2>
+<a name="id2526340"></a><h2>FILES</h2>
 <p>
 <code class="filename">/etc/resolv.conf</code>
 </p>
@@ -496,7 +496,7 @@ will not print the initial query when it looks up the NS records for
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527111"></a><h2>SEE ALSO</h2>
+<a name="id2526359"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
 <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -505,7 +505,7 @@ will not print the initial query when it looks up the NS records for
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527149"></a><h2>BUGS </h2>
+<a name="id2526397"></a><h2>BUGS </h2>
 <p>
 There are probably too many query options. 
 </p>
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 468d53bf..7d8ce9b8 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.76.2.5.2.13 2005/07/04 03:29:45 marka Exp $ */
+/* $Id: host.c,v 1.76.2.5.2.16 2006/05/23 04:43:47 marka Exp $ */
 
 #include <config.h>
 #include <limits.h>
@@ -37,6 +37,7 @@
 #include <dns/rdataclass.h>
 #include <dns/rdataset.h>
 #include <dns/rdatatype.h>
+#include <dns/rdatastruct.h>
 
 #include <dig/dig.h>
 
@@ -45,6 +46,7 @@ static isc_boolean_t default_lookups = ISC_TRUE;
 static int seen_error = -1;
 static isc_boolean_t list_addresses = ISC_TRUE;
 static dns_rdatatype_t list_type = dns_rdatatype_a;
+static isc_boolean_t printed_server = ISC_FALSE;
 
 static const char *opcodetext[] = {
 	"QUERY",
@@ -351,6 +353,32 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner,
 	return (ISC_R_SUCCESS);
 }
 
+static void
+chase_cnamechain(dns_message_t *msg, dns_name_t *qname) {
+	isc_result_t result;
+	dns_rdataset_t *rdataset;
+	dns_rdata_cname_t cname;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	unsigned int i = msg->counts[DNS_SECTION_ANSWER];
+
+ 	while (i-- > 0) {
+		rdataset = NULL;
+		result = dns_message_findname(msg, DNS_SECTION_ANSWER, qname,
+					      dns_rdatatype_cname, 0, NULL,
+					      &rdataset);
+		if (result != ISC_R_SUCCESS)
+			return;
+		result = dns_rdataset_first(rdataset);
+		check_result(result, "dns_rdataset_first");
+		dns_rdata_reset(&rdata);
+		dns_rdataset_current(rdataset, &rdata);
+		result = dns_rdata_tostruct(&rdata, &cname, NULL);
+		check_result(result, "dns_rdata_tostruct");
+		dns_name_copy(&cname.cname, qname, NULL);
+		dns_rdata_freestruct(&cname);
+	}
+}
+
 isc_result_t
 printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	isc_boolean_t did_flag = ISC_FALSE;
@@ -367,7 +395,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	 */
 	force_error = (seen_error == 1) ? 1 : 0;
 	seen_error = 1;
-	if (listed_server) {
+	if (listed_server && !printed_server) {
 		char sockstr[ISC_SOCKADDR_FORMATSIZE];
 
 		printf("Using domain server:\n");
@@ -376,6 +404,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 				    sizeof(sockstr));
 		printf("Address: %s\n", sockstr);
 		printf("Aliases: \n\n");
+		printed_server = ISC_TRUE;
 	}
 
 	if (msg->rcode != 0) {
@@ -389,10 +418,15 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) {
 		char namestr[DNS_NAME_FORMATSIZE];
 		dig_lookup_t *lookup;
+		dns_fixedname_t fixed;
+		dns_name_t *name;
 
 		/* Add AAAA and MX lookups. */
-
-		dns_name_format(query->lookup->name, namestr, sizeof(namestr));
+		dns_fixedname_init(&fixed);
+		name = dns_fixedname_name(&fixed);
+		dns_name_copy(query->lookup->name, name, NULL);
+		chase_cnamechain(msg, name);
+		dns_name_format(name, namestr, sizeof(namestr));
 		lookup = clone_lookup(query->lookup, ISC_FALSE);
 		if (lookup != NULL) {
 			strncpy(lookup->textname, namestr,
diff --git a/bin/dig/host.html b/bin/dig/host.html
index 7670868c..b66560f5 100644
--- a/bin/dig/host.html
+++ b/bin/dig/host.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: host.html,v 1.4.2.1.4.12 2005/10/13 02:33:44 marka Exp $ -->
+<!-- $Id: host.html,v 1.4.2.1.4.13 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>host &#8212; DNS lookup utility</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">host</code>  [<code class="option">-aCdlnrTwv</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-N <em class="replaceable"><code>ndots</code></em></code>] [<code class="option">-R <em class="replaceable"><code>number</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-W <em class="replaceable"><code>wait</code></em></code>] [<code class="option">-4</code>] [<code class="option">-6</code>] {name} [server]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525901"></a><h2>DESCRIPTION</h2>
+<a name="id2524467"></a><h2>DESCRIPTION</h2>
 <p>
 <span><strong class="command">host</strong></span>
 is a simple utility for performing DNS lookups.
@@ -155,13 +155,13 @@ value for an integer quantity.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526241"></a><h2>FILES</h2>
+<a name="id2525489"></a><h2>FILES</h2>
 <p>
 <code class="filename">/etc/resolv.conf</code>
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526253"></a><h2>SEE ALSO</h2>
+<a name="id2525501"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
 <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
diff --git a/bin/dig/nslookup.1 b/bin/dig/nslookup.1
index 3de04ca4..75c57536 100644
--- a/bin/dig/nslookup.1
+++ b/bin/dig/nslookup.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
 .\" 
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nslookup.1,v 1.1.6.5 2005/10/13 02:33:43 marka Exp $
+.\" $Id: nslookup.1,v 1.1.6.6 2006/01/06 01:47:24 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -147,7 +147,7 @@ Change the default TCP/UDP name server port to
 \fBquerytype=\fR\fIvalue\fR
 .TP
 \fBtype=\fR\fIvalue\fR
-Change the top of the information query.
+Change the type of the information query.
 .sp
 (Default = A; abbreviations = q, ty)
 .TP
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 189fabe8..741ad345 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nslookup.docbook,v 1.3.6.5 2005/05/13 01:22:33 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.3.6.7 2006/01/06 00:01:42 marka Exp $ -->
 
 <!--
  - Copyright (c) 1985, 1989
@@ -68,6 +68,7 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -263,7 +264,7 @@ the lookups.  Valid keywords are:
 
   <varlistentry><term><constant>type=</constant><replaceable>value</replaceable></term>
   <listitem><para>
-  Change the top of the information query.
+  Change the type of the information query.
   </para><para>
   (Default = A; abbreviations = q, ty)
   </para></listitem></varlistentry>
diff --git a/bin/dig/nslookup.html b/bin/dig/nslookup.html
index fc2e4e80..3ddc0869 100644
--- a/bin/dig/nslookup.html
+++ b/bin/dig/nslookup.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - 
  - Permission to use, copy, modify, and distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: nslookup.html,v 1.1.6.9 2005/10/13 02:33:44 marka Exp $ -->
+<!-- $Id: nslookup.html,v 1.1.6.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -21,7 +21,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463728"></a><div class="titlepage"></div>
+<a name="id2462969"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>nslookup &#8212; query Internet name servers interactively</p>
@@ -31,7 +31,7 @@
 <div class="cmdsynopsis"><p><code class="command">nslookup</code>  [<code class="option">-option</code>] [name | -] [server]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525973"></a><h2>DESCRIPTION</h2>
+<a name="id2525224"></a><h2>DESCRIPTION</h2>
 <p>
 <span><strong class="command">Nslookup</strong></span>
 is a program to query Internet domain name servers.  <span><strong class="command">Nslookup</strong></span>
@@ -43,7 +43,7 @@ domain.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525990"></a><h2>ARGUMENTS</h2>
+<a name="id2525241"></a><h2>ARGUMENTS</h2>
 <p>
 Interactive mode is entered in the following cases:
 </p>
@@ -75,7 +75,7 @@ nslookup -query=hinfo  -timeout=10
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526033"></a><h2>INTERACTIVE COMMANDS</h2>
+<a name="id2525284"></a><h2>INTERACTIVE COMMANDS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">host [<span class="optional">server</span>]</span></dt>
 <dd>
@@ -200,7 +200,7 @@ the lookups.  Valid keywords are:
 <dt><span class="term"><code class="constant">type=</code><em class="replaceable"><code>value</code></em></span></dt>
 <dd>
 <p>
-  Change the top of the information query.
+  Change the type of the information query.
   </p>
 <p>
   (Default = A; abbreviations = q, ty)
@@ -241,13 +241,13 @@ the lookups.  Valid keywords are:
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526490"></a><h2>FILES</h2>
+<a name="id2525741"></a><h2>FILES</h2>
 <p>
 <code class="filename">/etc/resolv.conf</code>
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526503"></a><h2>SEE ALSO</h2>
+<a name="id2525754"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
 <span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
@@ -255,7 +255,7 @@ the lookups.  Valid keywords are:
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526538"></a><h2>Author</h2>
+<a name="id2525789"></a><h2>Author</h2>
 <p>
 Andrew Cherenson
 </p>
diff --git a/bin/dig/win32/dig.dsp b/bin/dig/win32/dig.dsp
index b9cdc095..311e9191 100644
--- a/bin/dig/win32/dig.dsp
+++ b/bin/dig/win32/dig.dsp
@@ -1,111 +1,111 @@
-# Microsoft Developer Studio Project File - Name="dig" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=dig - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "dig.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dig.exe"

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /u /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "dig - Win32 Release"

-# Name "dig - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\dig.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dighost.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\dig\dig.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="dig" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=dig - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "dig.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dig.exe"
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "dig - Win32 Release"
+# Name "dig - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\dig.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dighost.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\dig\dig.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dig/win32/dig.dsw b/bin/dig/win32/dig.dsw
index ae9c5489..bccc2677 100644
--- a/bin/dig/win32/dig.dsw
+++ b/bin/dig/win32/dig.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "dig"=".\dig.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "dig"=".\dig.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dig/win32/dig.mak b/bin/dig/win32/dig.mak
index 3e3084f1..80a614b9 100644
--- a/bin/dig/win32/dig.mak
+++ b/bin/dig/win32/dig.mak
@@ -1,328 +1,328 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on dig.dsp

-!IF "$(CFG)" == ""

-CFG=dig - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to dig - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "dig - Win32 Release" && "$(CFG)" != "dig - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\dig.exe"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\dig.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dig.obj"

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\dig.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dig.pdb" /machine:I386 /out:"../../../Build/Release/dig.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\dig.obj" \

-	"$(INTDIR)\dighost.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Release\liblwres.lib"

-

-"..\..\..\Build\Release\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dig.obj"

-	-@erase "$(INTDIR)\dig.sbr"

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\dighost.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\dig.bsc"

-	-@erase "$(OUTDIR)\dig.pdb"

-	-@erase "..\..\..\Build\Debug\dig.exe"

-	-@erase "..\..\..\Build\Debug\dig.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\dig.sbr" \

-	"$(INTDIR)\dighost.sbr"

-

-"$(OUTDIR)\dig.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dig.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\dig.obj" \

-	"$(INTDIR)\dighost.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"

-

-"..\..\..\Build\Debug\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("dig.dep")

-!INCLUDE "dig.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "dig.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "dig - Win32 Release" || "$(CFG)" == "dig - Win32 Debug"

-SOURCE=..\dig.c

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-

-"$(INTDIR)\dig.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-

-"$(INTDIR)\dig.obj"	"$(INTDIR)\dig.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dighost.c

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-

-"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-

-"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "dig - Win32 Release"

-

-"liblwres - Win32 Release" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"

-

-"liblwres - Win32 Debug" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on dig.dsp
+!IF "$(CFG)" == ""
+CFG=dig - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to dig - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "dig - Win32 Release" && "$(CFG)" != "dig - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\dig.exe"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\dig.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dig.obj"
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\dig.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dig.pdb" /machine:I386 /out:"../../../Build/Release/dig.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\dig.obj" \
+	"$(INTDIR)\dighost.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Release\liblwres.lib"
+
+"..\..\..\Build\Release\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dig.obj"
+	-@erase "$(INTDIR)\dig.sbr"
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\dighost.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\dig.bsc"
+	-@erase "$(OUTDIR)\dig.pdb"
+	-@erase "..\..\..\Build\Debug\dig.exe"
+	-@erase "..\..\..\Build\Debug\dig.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\dig.sbr" \
+	"$(INTDIR)\dighost.sbr"
+
+"$(OUTDIR)\dig.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dig.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\dig.obj" \
+	"$(INTDIR)\dighost.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"
+
+"..\..\..\Build\Debug\dig.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("dig.dep")
+!INCLUDE "dig.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "dig.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "dig - Win32 Release" || "$(CFG)" == "dig - Win32 Debug"
+SOURCE=..\dig.c
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+
+"$(INTDIR)\dig.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+
+"$(INTDIR)\dig.obj"	"$(INTDIR)\dig.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dighost.c
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+
+"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+
+"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "dig - Win32 Release"
+
+"liblwres - Win32 Release" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+
+"liblwres - Win32 Debug" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/dig/win32/host.dsp b/bin/dig/win32/host.dsp
index bb89b829..bf207851 100644
--- a/bin/dig/win32/host.dsp
+++ b/bin/dig/win32/host.dsp
@@ -1,107 +1,107 @@
-# Microsoft Developer Studio Project File - Name="host" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=host - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "host.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/host.exe"

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /u /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "host - Win32 Release"

-# Name "host - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\dighost.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\host.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="host" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=host - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "host.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/host.exe"
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "host - Win32 Release"
+# Name "host - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\dighost.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\host.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dig/win32/host.dsw b/bin/dig/win32/host.dsw
index e566e780..5a217b30 100644
--- a/bin/dig/win32/host.dsw
+++ b/bin/dig/win32/host.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "host"=".\host.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "host"=".\host.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dig/win32/host.mak b/bin/dig/win32/host.mak
index bf99524c..0732b5da 100644
--- a/bin/dig/win32/host.mak
+++ b/bin/dig/win32/host.mak
@@ -1,328 +1,328 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on host.dsp

-!IF "$(CFG)" == ""

-CFG=host - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to host - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "host - Win32 Release" && "$(CFG)" != "host - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\host.exe"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\host.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\host.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\host.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\host.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\host.pdb" /machine:I386 /out:"../../../Build/Release/host.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\dighost.obj" \

-	"$(INTDIR)\host.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Release\liblwres.lib"

-

-"..\..\..\Build\Release\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\dighost.sbr"

-	-@erase "$(INTDIR)\host.obj"

-	-@erase "$(INTDIR)\host.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\host.bsc"

-	-@erase "$(OUTDIR)\host.pdb"

-	-@erase "..\..\..\Build\Debug\host.exe"

-	-@erase "..\..\..\Build\Debug\host.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\dighost.sbr" \

-	"$(INTDIR)\host.sbr"

-

-"$(OUTDIR)\host.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\host.pdb" /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\dighost.obj" \

-	"$(INTDIR)\host.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"

-

-"..\..\..\Build\Debug\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("host.dep")

-!INCLUDE "host.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "host.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "host - Win32 Release" || "$(CFG)" == "host - Win32 Debug"

-SOURCE=..\dighost.c

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-

-"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-

-"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\host.c

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-

-"$(INTDIR)\host.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-

-"$(INTDIR)\host.obj"	"$(INTDIR)\host.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "host - Win32 Release"

-

-"liblwres - Win32 Release" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "host - Win32 Debug"

-

-"liblwres - Win32 Debug" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on host.dsp
+!IF "$(CFG)" == ""
+CFG=host - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to host - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "host - Win32 Release" && "$(CFG)" != "host - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\host.exe"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\host.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\host.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\host.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\host.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\host.pdb" /machine:I386 /out:"../../../Build/Release/host.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\dighost.obj" \
+	"$(INTDIR)\host.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Release\liblwres.lib"
+
+"..\..\..\Build\Release\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\dighost.sbr"
+	-@erase "$(INTDIR)\host.obj"
+	-@erase "$(INTDIR)\host.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\host.bsc"
+	-@erase "$(OUTDIR)\host.pdb"
+	-@erase "..\..\..\Build\Debug\host.exe"
+	-@erase "..\..\..\Build\Debug\host.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\dighost.sbr" \
+	"$(INTDIR)\host.sbr"
+
+"$(OUTDIR)\host.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\host.pdb" /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\dighost.obj" \
+	"$(INTDIR)\host.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"
+
+"..\..\..\Build\Debug\host.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("host.dep")
+!INCLUDE "host.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "host.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "host - Win32 Release" || "$(CFG)" == "host - Win32 Debug"
+SOURCE=..\dighost.c
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+
+"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+
+"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\host.c
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+
+"$(INTDIR)\host.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+
+"$(INTDIR)\host.obj"	"$(INTDIR)\host.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "host - Win32 Release"
+
+"liblwres - Win32 Release" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+
+"liblwres - Win32 Debug" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/dig/win32/nslookup.dsp b/bin/dig/win32/nslookup.dsp
index ce3fc598..867bad22 100644
--- a/bin/dig/win32/nslookup.dsp
+++ b/bin/dig/win32/nslookup.dsp
@@ -1,107 +1,107 @@
-# Microsoft Developer Studio Project File - Name="nslookup" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=nslookup - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "nslookup.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nslookup.exe"

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /u /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "nslookup - Win32 Release"

-# Name "nslookup - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\dighost.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\nslookup.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="nslookup" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=nslookup - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "nslookup.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nslookup.exe"
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "nslookup - Win32 Release"
+# Name "nslookup - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\dighost.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\nslookup.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dig/win32/nslookup.dsw b/bin/dig/win32/nslookup.dsw
index 0ff8c660..7ffdc8e9 100644
--- a/bin/dig/win32/nslookup.dsw
+++ b/bin/dig/win32/nslookup.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "nslookup"=".\nslookup.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "nslookup"=".\nslookup.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dig/win32/nslookup.mak b/bin/dig/win32/nslookup.mak
index 73a6a2d4..fbc6bf4d 100644
--- a/bin/dig/win32/nslookup.mak
+++ b/bin/dig/win32/nslookup.mak
@@ -1,328 +1,328 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on nslookup.dsp

-!IF "$(CFG)" == ""

-CFG=nslookup - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to nslookup - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "nslookup - Win32 Release" && "$(CFG)" != "nslookup - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\nslookup.exe"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nslookup.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\nslookup.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\nslookup.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nslookup.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nslookup.pdb" /machine:I386 /out:"../../../Build/Release/nslookup.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\dighost.obj" \

-	"$(INTDIR)\nslookup.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Release\liblwres.lib"

-

-"..\..\..\Build\Release\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"

-

-!ELSE 

-

-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\dighost.obj"

-	-@erase "$(INTDIR)\dighost.sbr"

-	-@erase "$(INTDIR)\nslookup.obj"

-	-@erase "$(INTDIR)\nslookup.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\nslookup.bsc"

-	-@erase "$(OUTDIR)\nslookup.pdb"

-	-@erase "..\..\..\Build\Debug\nslookup.exe"

-	-@erase "..\..\..\Build\Debug\nslookup.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\dighost.sbr" \

-	"$(INTDIR)\nslookup.sbr"

-

-"$(OUTDIR)\nslookup.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nslookup.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\dighost.obj" \

-	"$(INTDIR)\nslookup.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"

-

-"..\..\..\Build\Debug\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("nslookup.dep")

-!INCLUDE "nslookup.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "nslookup.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "nslookup - Win32 Release" || "$(CFG)" == "nslookup - Win32 Debug"

-SOURCE=..\dighost.c

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-

-"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-

-"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\nslookup.c

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-

-"$(INTDIR)\nslookup.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-

-"$(INTDIR)\nslookup.obj"	"$(INTDIR)\nslookup.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nslookup - Win32 Release"

-

-"liblwres - Win32 Release" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"

-

-"liblwres - Win32 Debug" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 

-   cd "..\..\..\bin\dig\win32"

-

-"liblwres - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\dig\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on nslookup.dsp
+!IF "$(CFG)" == ""
+CFG=nslookup - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to nslookup - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "nslookup - Win32 Release" && "$(CFG)" != "nslookup - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\nslookup.exe"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nslookup.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\nslookup.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\nslookup.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nslookup.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nslookup.pdb" /machine:I386 /out:"../../../Build/Release/nslookup.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\dighost.obj" \
+	"$(INTDIR)\nslookup.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Release\liblwres.lib"
+
+"..\..\..\Build\Release\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"
+
+!ELSE 
+
+ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\dighost.obj"
+	-@erase "$(INTDIR)\dighost.sbr"
+	-@erase "$(INTDIR)\nslookup.obj"
+	-@erase "$(INTDIR)\nslookup.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\nslookup.bsc"
+	-@erase "$(OUTDIR)\nslookup.pdb"
+	-@erase "..\..\..\Build\Debug\nslookup.exe"
+	-@erase "..\..\..\Build\Debug\nslookup.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\dighost.sbr" \
+	"$(INTDIR)\nslookup.sbr"
+
+"$(OUTDIR)\nslookup.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nslookup.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\dighost.obj" \
+	"$(INTDIR)\nslookup.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Debug\liblwres.lib"
+
+"..\..\..\Build\Debug\nslookup.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("nslookup.dep")
+!INCLUDE "nslookup.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "nslookup.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "nslookup - Win32 Release" || "$(CFG)" == "nslookup - Win32 Debug"
+SOURCE=..\dighost.c
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+
+"$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+
+"$(INTDIR)\dighost.obj"	"$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\nslookup.c
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+
+"$(INTDIR)\nslookup.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+
+"$(INTDIR)\nslookup.obj"	"$(INTDIR)\nslookup.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nslookup - Win32 Release"
+
+"liblwres - Win32 Release" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+
+"liblwres - Win32 Debug" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   cd "..\..\..\bin\dig\win32"
+
+"liblwres - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\dig\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/dnssec/dnssec-keygen.html b/bin/dnssec/dnssec-keygen.html
index 00271faa..fcc30587 100644
--- a/bin/dnssec/dnssec-keygen.html
+++ b/bin/dnssec/dnssec-keygen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-keygen.html,v 1.5.2.1.4.13 2005/10/13 02:33:45 marka Exp $ -->
+<!-- $Id: dnssec-keygen.html,v 1.5.2.1.4.14 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">dnssec-keygen</span> &#8212; DNSSEC key generation tool</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-keygen</code>  {-a <em class="replaceable"><code>algorithm</code></em>} {-b <em class="replaceable"><code>keysize</code></em>} {-n <em class="replaceable"><code>nametype</code></em>} [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-e</code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-g <em class="replaceable"><code>generator</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k</code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-s <em class="replaceable"><code>strength</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {name}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525956"></a><h2>DESCRIPTION</h2>
+<a name="id2525204"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">dnssec-keygen</strong></span> generates keys for DNSSEC
 	(Secure DNS), as defined in RFC 2535 and RFC &lt;TBA\&gt;.  It can also generate
@@ -41,7 +41,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525969"></a><h2>OPTIONS</h2>
+<a name="id2525217"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd>
@@ -144,7 +144,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526306"></a><h2>GENERATED KEYS</h2>
+<a name="id2525554"></a><h2>GENERATED KEYS</h2>
 <p>
         When <span><strong class="command">dnssec-keygen</strong></span> completes successfully,
 	it prints a string of the form <code class="filename">Knnnn.+aaa+iiiii</code>
@@ -187,7 +187,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526394"></a><h2>EXAMPLE</h2>
+<a name="id2525642"></a><h2>EXAMPLE</h2>
 <p>
         To generate a 768-bit DSA key for the domain
 	<strong class="userinput"><code>example.com</code></strong>, the following command would be
@@ -209,7 +209,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526440"></a><h2>SEE ALSO</h2>
+<a name="id2525688"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -219,7 +219,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526473"></a><h2>AUTHOR</h2>
+<a name="id2525721"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 93caf497..4ac840df 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.139.2.2.4.21 2005/10/14 01:38:41 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.2.4.23 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -1292,10 +1292,6 @@ nsecify(void) {
 				result = dns_dbiterator_next(dbiter);
 				continue;
 			}
-			if (result != ISC_R_SUCCESS) {
-				dns_db_detachnode(gdb, &nextnode);
-				break;
-			}
 			if (!dns_name_issubdomain(nextname, gorigin) ||
 			    (zonecut != NULL &&
 			     dns_name_issubdomain(nextname, zonecut)))
diff --git a/bin/dnssec/dnssec-signzone.html b/bin/dnssec/dnssec-signzone.html
index 5cc8c074..a387b42e 100644
--- a/bin/dnssec/dnssec-signzone.html
+++ b/bin/dnssec/dnssec-signzone.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: dnssec-signzone.html,v 1.4.2.1.4.14 2005/10/13 02:33:46 marka Exp $ -->
+<!-- $Id: dnssec-signzone.html,v 1.4.2.1.4.15 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">dnssec-signzone</span> &#8212; DNSSEC zone signing tool</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-signzone</code>  [<code class="option">-a</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-d <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-e <em class="replaceable"><code>end-time</code></em></code>] [<code class="option">-f <em class="replaceable"><code>output-file</code></em></code>] [<code class="option">-g</code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>key</code></em></code>] [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-i <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-n <em class="replaceable"><code>nthreads</code></em></code>] [<code class="option">-o <em class="replaceable"><code>origin</code></em></code>] [<code class="option">-p</code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-s <em class="replaceable"><code>start-time</code></em></code>] [<code class="option">-t</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-z</code>] {zonefile} [key...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525979"></a><h2>DESCRIPTION</h2>
+<a name="id2525227"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">dnssec-signzone</strong></span> signs a zone.  It generates
 	NSEC and RRSIG records and produces a signed version of the
@@ -43,7 +43,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525995"></a><h2>OPTIONS</h2>
+<a name="id2525243"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a</span></dt>
 <dd><p>
@@ -179,7 +179,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526435"></a><h2>EXAMPLE</h2>
+<a name="id2525683"></a><h2>EXAMPLE</h2>
 <p>
         The following command signs the <strong class="userinput"><code>example.com</code></strong>
 	zone with the DSA key generated in the <span><strong class="command">dnssec-keygen</strong></span>
@@ -203,7 +203,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526485"></a><h2>SEE ALSO</h2>
+<a name="id2525733"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -211,7 +211,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526512"></a><h2>AUTHOR</h2>
+<a name="id2525760"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/dnssec/win32/keygen.dsp b/bin/dnssec/win32/keygen.dsp
index 3510477c..201d96d6 100644
--- a/bin/dnssec/win32/keygen.dsp
+++ b/bin/dnssec/win32/keygen.dsp
@@ -1,107 +1,107 @@
-# Microsoft Developer Studio Project File - Name="keygen" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=keygen - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "keygen.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "keygen - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe"

-

-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "keygen - Win32 Release"

-# Name "keygen - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\dnssec-keygen.c"

-# End Source File

-# Begin Source File

-

-SOURCE=..\dnssectool.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="keygen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=keygen - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "keygen.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "keygen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe"
+
+!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "keygen - Win32 Release"
+# Name "keygen - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\dnssec-keygen.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\dnssectool.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dnssec/win32/keygen.dsw b/bin/dnssec/win32/keygen.dsw
index f9886513..bdd633e4 100644
--- a/bin/dnssec/win32/keygen.dsw
+++ b/bin/dnssec/win32/keygen.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "keygen"=".\keygen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "keygen"=".\keygen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dnssec/win32/keygen.mak b/bin/dnssec/win32/keygen.mak
index 3a82db74..83ffd011 100644
--- a/bin/dnssec/win32/keygen.mak
+++ b/bin/dnssec/win32/keygen.mak
@@ -1,227 +1,227 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on keygen.dsp

-!IF "$(CFG)" == ""

-CFG=keygen - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to keygen - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "keygen - Win32 Release" && "$(CFG)" != "keygen - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "keygen - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\dnssec-keygen.exe"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\dnssec-keygen.obj"

-	-@erase "$(INTDIR)\dnssectool.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\dnssec-keygen.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keygen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\dnssec-keygen.obj" \

-	"$(INTDIR)\dnssectool.obj"

-

-"..\..\..\Build\Release\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\dnssec-keygen.exe" "$(OUTDIR)\keygen.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\dnssec-keygen.obj"

-	-@erase "$(INTDIR)\dnssec-keygen.sbr"

-	-@erase "$(INTDIR)\dnssectool.obj"

-	-@erase "$(INTDIR)\dnssectool.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\dnssec-keygen.pdb"

-	-@erase "$(OUTDIR)\keygen.bsc"

-	-@erase "..\..\..\Build\Debug\dnssec-keygen.exe"

-	-@erase "..\..\..\Build\Debug\dnssec-keygen.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\dnssec-keygen.sbr" \

-	"$(INTDIR)\dnssectool.sbr"

-

-"$(OUTDIR)\keygen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\dnssec-keygen.obj" \

-	"$(INTDIR)\dnssectool.obj"

-

-"..\..\..\Build\Debug\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("keygen.dep")

-!INCLUDE "keygen.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "keygen.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "keygen - Win32 Release" || "$(CFG)" == "keygen - Win32 Debug"

-SOURCE="..\dnssec-keygen.c"

-

-!IF  "$(CFG)" == "keygen - Win32 Release"

-

-

-"$(INTDIR)\dnssec-keygen.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"

-

-

-"$(INTDIR)\dnssec-keygen.obj"	"$(INTDIR)\dnssec-keygen.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dnssectool.c

-

-!IF  "$(CFG)" == "keygen - Win32 Release"

-

-

-"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"

-

-

-"$(INTDIR)\dnssectool.obj"	"$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on keygen.dsp
+!IF "$(CFG)" == ""
+CFG=keygen - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to keygen - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "keygen - Win32 Release" && "$(CFG)" != "keygen - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "keygen - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\dnssec-keygen.exe"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\dnssec-keygen.obj"
+	-@erase "$(INTDIR)\dnssectool.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\dnssec-keygen.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keygen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\dnssec-keygen.obj" \
+	"$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Release\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\dnssec-keygen.exe" "$(OUTDIR)\keygen.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\dnssec-keygen.obj"
+	-@erase "$(INTDIR)\dnssec-keygen.sbr"
+	-@erase "$(INTDIR)\dnssectool.obj"
+	-@erase "$(INTDIR)\dnssectool.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\dnssec-keygen.pdb"
+	-@erase "$(OUTDIR)\keygen.bsc"
+	-@erase "..\..\..\Build\Debug\dnssec-keygen.exe"
+	-@erase "..\..\..\Build\Debug\dnssec-keygen.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\dnssec-keygen.sbr" \
+	"$(INTDIR)\dnssectool.sbr"
+
+"$(OUTDIR)\keygen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\dnssec-keygen.obj" \
+	"$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Debug\dnssec-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("keygen.dep")
+!INCLUDE "keygen.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "keygen.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "keygen - Win32 Release" || "$(CFG)" == "keygen - Win32 Debug"
+SOURCE="..\dnssec-keygen.c"
+
+!IF  "$(CFG)" == "keygen - Win32 Release"
+
+
+"$(INTDIR)\dnssec-keygen.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+
+
+"$(INTDIR)\dnssec-keygen.obj"	"$(INTDIR)\dnssec-keygen.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dnssectool.c
+
+!IF  "$(CFG)" == "keygen - Win32 Release"
+
+
+"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+
+
+"$(INTDIR)\dnssectool.obj"	"$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/dnssec/win32/nsupdate.dsp b/bin/dnssec/win32/nsupdate.dsp
index f8fde836..a203e8cf 100644
--- a/bin/dnssec/win32/nsupdate.dsp
+++ b/bin/dnssec/win32/nsupdate.dsp
@@ -1,103 +1,103 @@
-# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=nsupdate - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "nsupdate.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /u /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "nsupdate - Win32 Release"

-# Name "nsupdate - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\nsupdate.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=nsupdate - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "nsupdate - Win32 Release"
+# Name "nsupdate - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\nsupdate.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dnssec/win32/nsupdate.dsw b/bin/dnssec/win32/nsupdate.dsw
index 5f0ac362..e3b77722 100644
--- a/bin/dnssec/win32/nsupdate.dsw
+++ b/bin/dnssec/win32/nsupdate.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dnssec/win32/signzone.dsp b/bin/dnssec/win32/signzone.dsp
index 172a08fd..cb899ff5 100644
--- a/bin/dnssec/win32/signzone.dsp
+++ b/bin/dnssec/win32/signzone.dsp
@@ -1,107 +1,107 @@
-# Microsoft Developer Studio Project File - Name="signzone" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=signzone - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "signzone.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "signzone - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe"

-

-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "signzone - Win32 Release"

-# Name "signzone - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\dnssec-signzone.c"

-# End Source File

-# Begin Source File

-

-SOURCE=..\dnssectool.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="signzone" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=signzone - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "signzone.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "signzone - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe"
+
+!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "signzone - Win32 Release"
+# Name "signzone - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\dnssec-signzone.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\dnssectool.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dnssec/win32/signzone.dsw b/bin/dnssec/win32/signzone.dsw
index f3314b9e..67f5647f 100644
--- a/bin/dnssec/win32/signzone.dsw
+++ b/bin/dnssec/win32/signzone.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "signzone"=".\signzone.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "signzone"=".\signzone.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/dnssec/win32/signzone.mak b/bin/dnssec/win32/signzone.mak
index dc86bb90..eaf84dbd 100644
--- a/bin/dnssec/win32/signzone.mak
+++ b/bin/dnssec/win32/signzone.mak
@@ -1,227 +1,227 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on signzone.dsp

-!IF "$(CFG)" == ""

-CFG=signzone - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to signzone - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "signzone - Win32 Release" && "$(CFG)" != "signzone - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "signzone - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\dnssec-signzone.exe"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\dnssec-signzone.obj"

-	-@erase "$(INTDIR)\dnssectool.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\dnssec-signzone.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\signzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\dnssec-signzone.obj" \

-	"$(INTDIR)\dnssectool.obj"

-

-"..\..\..\Build\Release\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\dnssec-signzone.exe" "$(OUTDIR)\signzone.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\dnssec-signzone.obj"

-	-@erase "$(INTDIR)\dnssec-signzone.sbr"

-	-@erase "$(INTDIR)\dnssectool.obj"

-	-@erase "$(INTDIR)\dnssectool.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\dnssec-signzone.pdb"

-	-@erase "$(OUTDIR)\signzone.bsc"

-	-@erase "..\..\..\Build\Debug\dnssec-signzone.exe"

-	-@erase "..\..\..\Build\Debug\dnssec-signzone.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\dnssec-signzone.sbr" \

-	"$(INTDIR)\dnssectool.sbr"

-

-"$(OUTDIR)\signzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\dnssec-signzone.obj" \

-	"$(INTDIR)\dnssectool.obj"

-

-"..\..\..\Build\Debug\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("signzone.dep")

-!INCLUDE "signzone.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "signzone.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "signzone - Win32 Release" || "$(CFG)" == "signzone - Win32 Debug"

-SOURCE="..\dnssec-signzone.c"

-

-!IF  "$(CFG)" == "signzone - Win32 Release"

-

-

-"$(INTDIR)\dnssec-signzone.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"

-

-

-"$(INTDIR)\dnssec-signzone.obj"	"$(INTDIR)\dnssec-signzone.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dnssectool.c

-

-!IF  "$(CFG)" == "signzone - Win32 Release"

-

-

-"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"

-

-

-"$(INTDIR)\dnssectool.obj"	"$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on signzone.dsp
+!IF "$(CFG)" == ""
+CFG=signzone - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to signzone - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "signzone - Win32 Release" && "$(CFG)" != "signzone - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "signzone - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\dnssec-signzone.exe"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\dnssec-signzone.obj"
+	-@erase "$(INTDIR)\dnssectool.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\dnssec-signzone.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\signzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\dnssec-signzone.obj" \
+	"$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Release\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\dnssec-signzone.exe" "$(OUTDIR)\signzone.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\dnssec-signzone.obj"
+	-@erase "$(INTDIR)\dnssec-signzone.sbr"
+	-@erase "$(INTDIR)\dnssectool.obj"
+	-@erase "$(INTDIR)\dnssectool.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\dnssec-signzone.pdb"
+	-@erase "$(OUTDIR)\signzone.bsc"
+	-@erase "..\..\..\Build\Debug\dnssec-signzone.exe"
+	-@erase "..\..\..\Build\Debug\dnssec-signzone.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\dnssec-signzone.sbr" \
+	"$(INTDIR)\dnssectool.sbr"
+
+"$(OUTDIR)\signzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\dnssec-signzone.obj" \
+	"$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Debug\dnssec-signzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("signzone.dep")
+!INCLUDE "signzone.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "signzone.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "signzone - Win32 Release" || "$(CFG)" == "signzone - Win32 Debug"
+SOURCE="..\dnssec-signzone.c"
+
+!IF  "$(CFG)" == "signzone - Win32 Release"
+
+
+"$(INTDIR)\dnssec-signzone.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+
+
+"$(INTDIR)\dnssec-signzone.obj"	"$(INTDIR)\dnssec-signzone.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dnssectool.c
+
+!IF  "$(CFG)" == "signzone - Win32 Release"
+
+
+"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+
+
+"$(INTDIR)\dnssectool.obj"	"$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/named/aclconf.c b/bin/named/aclconf.c
index 8b6d0c76..102a8910 100644
--- a/bin/named/aclconf.c
+++ b/bin/named/aclconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.c,v 1.27.12.5 2005/03/17 03:58:25 marka Exp $ */
+/* $Id: aclconf.c,v 1.27.12.7 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -54,10 +54,10 @@ ns_aclconfctx_destroy(ns_aclconfctx_t *ctx) {
  * Find the definition of the named acl whose name is "name".
  */
 static isc_result_t
-get_acl_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
+get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) {
 	isc_result_t result;
-	cfg_obj_t *acls = NULL;
-	cfg_listelt_t *elt;
+	const cfg_obj_t *acls = NULL;
+	const cfg_listelt_t *elt;
 	
 	result = cfg_map_get(cctx, "acl", &acls);
 	if (result != ISC_R_SUCCESS)
@@ -65,7 +65,7 @@ get_acl_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 	for (elt = cfg_list_first(acls);
 	     elt != NULL;
 	     elt = cfg_list_next(elt)) {
-		cfg_obj_t *acl = cfg_listelt_value(elt);
+		const cfg_obj_t *acl = cfg_listelt_value(elt);
 		const char *aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name"));
 		if (strcasecmp(aclname, name) == 0) {
 			*ret = cfg_tuple_get(acl, "value");
@@ -76,15 +76,15 @@ get_acl_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 }
 
 static isc_result_t
-convert_named_acl(cfg_obj_t *nameobj, cfg_obj_t *cctx,
+convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx,
 		  ns_aclconfctx_t *ctx, isc_mem_t *mctx,
 		  dns_acl_t **target)
 {
 	isc_result_t result;
-	cfg_obj_t *cacl = NULL;
+	const cfg_obj_t *cacl = NULL;
 	dns_acl_t *dacl;
 	dns_acl_t loop;
-	char *aclname = cfg_obj_asstring(nameobj);
+	const char *aclname = cfg_obj_asstring(nameobj);
 
 	/* Look for an already-converted version. */
 	for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache);
@@ -113,7 +113,7 @@ convert_named_acl(cfg_obj_t *nameobj, cfg_obj_t *cctx,
 	 */
 	memset(&loop, 0, sizeof(loop));
 	ISC_LINK_INIT(&loop, nextincache);
-	loop.name = aclname;
+	DE_CONST(aclname, loop.name);
 	loop.magic = LOOP_MAGIC;
 	ISC_LIST_APPEND(ctx->named_acl_cache, &loop, nextincache);
 	result = ns_acl_fromconfig(cacl, cctx, ctx, mctx, &dacl);
@@ -131,7 +131,7 @@ convert_named_acl(cfg_obj_t *nameobj, cfg_obj_t *cctx,
 }
 
 static isc_result_t
-convert_keyname(cfg_obj_t *keyobj, isc_mem_t *mctx, dns_name_t *dnsname) {
+convert_keyname(const cfg_obj_t *keyobj, isc_mem_t *mctx, dns_name_t *dnsname) {
 	isc_result_t result;
 	isc_buffer_t buf;
 	dns_fixedname_t fixname;
@@ -154,8 +154,8 @@ convert_keyname(cfg_obj_t *keyobj, isc_mem_t *mctx, dns_name_t *dnsname) {
 }
 
 isc_result_t
-ns_acl_fromconfig(cfg_obj_t *caml,
-		  cfg_obj_t *cctx,
+ns_acl_fromconfig(const cfg_obj_t *caml,
+		  const cfg_obj_t *cctx,
 		  ns_aclconfctx_t *ctx,
 		  isc_mem_t *mctx,
 		  dns_acl_t **target)
@@ -164,7 +164,7 @@ ns_acl_fromconfig(cfg_obj_t *caml,
 	unsigned int count;
 	dns_acl_t *dacl = NULL;
 	dns_aclelement_t *de;
-	cfg_listelt_t *elt;
+	const cfg_listelt_t *elt;
 
 	REQUIRE(target != NULL && *target == NULL);
 
@@ -183,7 +183,7 @@ ns_acl_fromconfig(cfg_obj_t *caml,
 	     elt != NULL;
 	     elt = cfg_list_next(elt))
 	{
-		cfg_obj_t *ce = cfg_listelt_value(elt);
+		const cfg_obj_t *ce = cfg_listelt_value(elt);
 		if (cfg_obj_istuple(ce)) {
 			/* This must be a negated element. */
 			ce = cfg_tuple_get(ce, "value");
@@ -215,7 +215,7 @@ ns_acl_fromconfig(cfg_obj_t *caml,
 				goto cleanup;
 		} else if (cfg_obj_isstring(ce)) {
 			/* ACL name */
-			char *name = cfg_obj_asstring(ce);
+			const char *name = cfg_obj_asstring(ce);
 			if (strcasecmp(name, "localhost") == 0) {
 				de->type = dns_aclelementtype_localhost;
 			} else if (strcasecmp(name, "localnets") == 0) {
diff --git a/bin/named/client.c b/bin/named/client.c
index baecc234..7eca8a58 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.13.4.26 2005/07/27 02:53:14 marka Exp $ */
+/* $Id: client.c,v 1.176.2.13.4.28 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -164,6 +164,12 @@ struct ns_clientmgr {
  * Must be greater than any valid state.
  */
 
+/*
+ * Enable ns_client_dropport() by default.
+ */
+#ifndef NS_CLIENT_DROPPORT
+#define NS_CLIENT_DROPPORT 1
+#endif
 
 static void client_read(ns_client_t *client);
 static void client_accept(ns_client_t *client);
@@ -972,6 +978,34 @@ ns_client_send(ns_client_t *client) {
 	ns_client_next(client, result);
 }
 
+#if NS_CLIENT_DROPPORT
+#define DROPPORT_NO		0
+#define DROPPORT_REQUEST	1
+#define DROPPORT_RESPONSE	2
+/*%
+ * ns_client_dropport determines if certain requests / responses
+ * should be dropped based on the port number.
+ *
+ * Returns:
+ * \li	0:	Don't drop.
+ * \li	1:	Drop request.
+ * \li	2:	Drop (error) response.
+ */
+static int
+ns_client_dropport(in_port_t port) {
+	switch (port) {
+	case 7: /* echo */
+	case 13: /* daytime */
+	case 19: /* chargen */
+	case 37: /* time */
+		return (DROPPORT_REQUEST);
+	case 464: /* kpasswd */
+		return (DROPPORT_RESPONSE);
+	}
+	return (DROPPORT_NO);
+}
+#endif
+
 void
 ns_client_error(ns_client_t *client, isc_result_t result) {
 	dns_rcode_t rcode;
@@ -984,6 +1018,28 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 	message = client->message;
 	rcode = dns_result_torcode(result);
 
+#if NS_CLIENT_DROPPORT
+	/*
+	 * Don't send FORMERR to ports on the drop port list.
+	 */
+	if (rcode == dns_rcode_formerr &&
+	    ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) !=
+	    DROPPORT_NO) {
+		char buf[64];
+		isc_buffer_t b;
+
+		isc_buffer_init(&b, buf, sizeof(buf) - 1);
+		if (dns_rcode_totext(rcode, &b) != ISC_R_SUCCESS)
+			isc_buffer_putstr(&b, "UNKNOWN RCODE");
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped error (%.*s) response: suspicious port",
+			      (int)isc_buffer_usedlength(&b), buf);
+		ns_client_next(client, ISC_R_SUCCESS);
+		return;
+	}
+#endif
+
 	/*
 	 * Message may be an in-progress reply that we had trouble
 	 * with, in which case QR will be set.  We need to clear QR before
@@ -1208,6 +1264,17 @@ client_request(isc_task_t *task, isc_event_t *event) {
 
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 
+#if NS_CLIENT_DROPPORT
+	if (ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) ==
+	    DROPPORT_REQUEST) {
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped request: suspicious port");
+		ns_client_next(client, ISC_R_SUCCESS);
+		goto cleanup;
+	}
+#endif
+
 	ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 		      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3),
 		      "%s request",
diff --git a/bin/named/config.c b/bin/named/config.c
index 99e5ffa7..7b5b99e6 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.11.2.4.8.29 2004/10/05 02:52:26 marka Exp $ */
+/* $Id: config.c,v 1.11.2.4.8.32 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -196,7 +196,7 @@ ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) {
 }
 
 isc_result_t
-ns_config_get(cfg_obj_t **maps, const char *name, cfg_obj_t **obj) {
+ns_config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
 	int i;
 
 	for (i = 0;; i++) {
@@ -208,11 +208,13 @@ ns_config_get(cfg_obj_t **maps, const char *name, cfg_obj_t **obj) {
 }
 
 isc_result_t
-ns_checknames_get(cfg_obj_t **maps, const char *which, cfg_obj_t **obj) {
-	cfg_listelt_t *element;
-	cfg_obj_t *checknames;
-	cfg_obj_t *type;
-	cfg_obj_t *value;
+ns_checknames_get(const cfg_obj_t **maps, const char *which,
+		  const cfg_obj_t **obj)
+{
+	const cfg_listelt_t *element;
+	const cfg_obj_t *checknames;
+	const cfg_obj_t *type;
+	const cfg_obj_t *value;
 	int i;
 
 	for (i = 0;; i++) {
@@ -243,8 +245,8 @@ ns_checknames_get(cfg_obj_t **maps, const char *which, cfg_obj_t **obj) {
 }
 
 int
-ns_config_listcount(cfg_obj_t *list) {
-	cfg_listelt_t *e;
+ns_config_listcount(const cfg_obj_t *list) {
+	const cfg_listelt_t *e;
 	int i = 0;
 
 	for (e = cfg_list_first(list); e != NULL; e = cfg_list_next(e))
@@ -254,9 +256,9 @@ ns_config_listcount(cfg_obj_t *list) {
 }
 
 isc_result_t
-ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
+ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass,
 		   dns_rdataclass_t *classp) {
-	char *str;
+	const char *str;
 	isc_textregion_t r;
 	isc_result_t result;
 
@@ -265,7 +267,7 @@ ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
 		return (ISC_R_SUCCESS);
 	}
 	str = cfg_obj_asstring(classobj);
-	r.base = str;
+	DE_CONST(str, r.base);
 	r.length = strlen(str);
 	result = dns_rdataclass_fromtext(classp, &r);
 	if (result != ISC_R_SUCCESS)
@@ -275,9 +277,9 @@ ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
 }
 
 isc_result_t
-ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
+ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 		   dns_rdatatype_t *typep) {
-	char *str;
+	const char *str;
 	isc_textregion_t r;
 	isc_result_t result;
 
@@ -286,7 +288,7 @@ ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 		return (ISC_R_SUCCESS);
 	}
 	str = cfg_obj_asstring(typeobj);
-	r.base = str;
+	DE_CONST(str, r.base);
 	r.length = strlen(str);
 	result = dns_rdatatype_fromtext(typep, &r);
 	if (result != ISC_R_SUCCESS)
@@ -296,9 +298,9 @@ ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 }
 
 dns_zonetype_t
-ns_config_getzonetype(cfg_obj_t *zonetypeobj) {
+ns_config_getzonetype(const cfg_obj_t *zonetypeobj) {
 	dns_zonetype_t ztype = dns_zone_none;
-	char *str;
+	const char *str;
 
 	str = cfg_obj_asstring(zonetypeobj);
 	if (strcasecmp(str, "master") == 0)
@@ -313,14 +315,14 @@ ns_config_getzonetype(cfg_obj_t *zonetypeobj) {
 }
 
 isc_result_t
-ns_config_getiplist(cfg_obj_t *config, cfg_obj_t *list,
+ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list,
 		    in_port_t defport, isc_mem_t *mctx,
 		    isc_sockaddr_t **addrsp, isc_uint32_t *countp)
 {
 	int count, i = 0;
-	cfg_obj_t *addrlist;
-	cfg_obj_t *portobj;
-	cfg_listelt_t *element;
+	const cfg_obj_t *addrlist;
+	const cfg_obj_t *portobj;
+	const cfg_listelt_t *element;
 	isc_sockaddr_t *addrs;
 	in_port_t port;
 	isc_result_t result;
@@ -380,10 +382,12 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 }
 
 static isc_result_t
-get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
+get_masters_def(const cfg_obj_t *cctx, const char *name,
+		const cfg_obj_t **ret)
+{
 	isc_result_t result;
-	cfg_obj_t *masters = NULL;
-	cfg_listelt_t *elt;
+	const cfg_obj_t *masters = NULL;
+	const cfg_listelt_t *elt;
 
 	result = cfg_map_get(cctx, "masters", &masters);
 	if (result != ISC_R_SUCCESS)
@@ -391,7 +395,7 @@ get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 	for (elt = cfg_list_first(masters);
 	     elt != NULL;
 	     elt = cfg_list_next(elt)) {
-		cfg_obj_t *list;
+		const cfg_obj_t *list;
 		const char *listname;
 
 		list = cfg_listelt_value(elt);
@@ -406,24 +410,24 @@ get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 }
 
 isc_result_t
-ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
-			  isc_sockaddr_t **addrsp, dns_name_t ***keysp,
-			  isc_uint32_t *countp)
+ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
+			  isc_mem_t *mctx, isc_sockaddr_t **addrsp,
+			  dns_name_t ***keysp, isc_uint32_t *countp)
 {
 	isc_uint32_t addrcount = 0, keycount = 0, i = 0;
 	isc_uint32_t listcount = 0, l = 0, j;
 	isc_uint32_t stackcount = 0, pushed = 0;
 	isc_result_t result;
-	cfg_listelt_t *element;
-	cfg_obj_t *addrlist;
-	cfg_obj_t *portobj;
+	const cfg_listelt_t *element;
+	const cfg_obj_t *addrlist;
+	const cfg_obj_t *portobj;
 	in_port_t port;
 	dns_fixedname_t fname;
 	isc_sockaddr_t *addrs = NULL;
 	dns_name_t **keys = NULL;
-	char **lists = NULL;
+	const char **lists = NULL;
 	struct {
-		cfg_listelt_t *element;
+		const cfg_listelt_t *element;
 		in_port_t port;
 	} *stack = NULL;
 
@@ -439,13 +443,14 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
 		if (val > ISC_UINT16_MAX) {
 			cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR,
 				    "port '%u' out of range", val);
-			return (ISC_R_RANGE);
+			result = ISC_R_RANGE;
+			goto cleanup;
 		}
 		port = (in_port_t) val;
 	} else {
 		result = ns_config_getport(config, &port);
 		if (result != ISC_R_SUCCESS)
-			return (result);
+			goto cleanup;
 	}
 
 	result = ISC_R_NOMEMORY;
@@ -456,9 +461,9 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *addr;
-		cfg_obj_t *key;
-		char *keystr;
+		const cfg_obj_t *addr;
+		const cfg_obj_t *key;
+		const char *keystr;
 		isc_buffer_t b;
 
 		addr = cfg_tuple_get(cfg_listelt_value(element),
@@ -466,7 +471,7 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
 		key = cfg_tuple_get(cfg_listelt_value(element), "key");
 
 		if (!cfg_obj_issockaddr(addr)) {
-			char *listname = cfg_obj_asstring(addr);
+			const char *listname = cfg_obj_asstring(addr);
 			isc_result_t tresult;
 
 			/* Grow lists? */
@@ -606,9 +611,9 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, addrs, newsize);
-			isc_mem_put(mctx, addrs, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, addrs, oldsize);
 		addrs = new;
 		addrcount = i;
 
@@ -619,9 +624,9 @@ ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, keys,  newsize);
-			isc_mem_put(mctx, keys, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, keys, oldsize);
 		keys = new;
 		keycount = i;
 	}
@@ -682,10 +687,10 @@ ns_config_putipandkeylist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 }
 
 isc_result_t
-ns_config_getport(cfg_obj_t *config, in_port_t *portp) {
-	cfg_obj_t *maps[3];
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *portobj = NULL;
+ns_config_getport(const cfg_obj_t *config, in_port_t *portp) {
+	const cfg_obj_t *maps[3];
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *portobj = NULL;
 	isc_result_t result;
 	int i;
 
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 5b87fb9c..b6bcc166 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28.2.9.2.6 2004/03/08 09:04:14 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.9.2.10 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -356,6 +356,9 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
 	{
 		ccregion.rstart = isc_buffer_base(&conn->ccmsg.buffer);
 		ccregion.rend = isc_buffer_used(&conn->ccmsg.buffer);
+		if (secret.rstart != NULL)
+			isc_mem_put(listener->mctx, secret.rstart,
+				    REGION_SIZE(secret));
 		secret.rstart = isc_mem_get(listener->mctx, key->secret.length);
 		if (secret.rstart == NULL)
 			goto cleanup;
@@ -371,8 +374,6 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
 			 */
 			if (request != NULL)
 				isccc_sexpr_free(&request);
-			isc_mem_put(listener->mctx, secret.rstart,
-				    REGION_SIZE(secret));
 		} else {
 			log_invalid(&conn->ccmsg, result);
 			goto cleanup;
@@ -649,10 +650,12 @@ ns_controls_shutdown(ns_controls_t *controls) {
 }
 
 static isc_result_t
-cfgkeylist_find(cfg_obj_t *keylist, const char *keyname, cfg_obj_t **objp) {
-	cfg_listelt_t *element;
+cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname,
+	        const cfg_obj_t **objp)
+{
+	const cfg_listelt_t *element;
 	const char *str;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 
 	for (element = cfg_list_first(keylist);
 	     element != NULL;
@@ -671,13 +674,13 @@ cfgkeylist_find(cfg_obj_t *keylist, const char *keyname, cfg_obj_t **objp) {
 }
 
 static isc_result_t
-controlkeylist_fromcfg(cfg_obj_t *keylist, isc_mem_t *mctx,
+controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
 		       controlkeylist_t *keyids)
 {
-	cfg_listelt_t *element;
+	const cfg_listelt_t *element;
 	char *newstr = NULL;
 	const char *str;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 	controlkey_t *key = NULL;
 
 	for (element = cfg_list_first(keylist);
@@ -712,11 +715,11 @@ controlkeylist_fromcfg(cfg_obj_t *keylist, isc_mem_t *mctx,
 }
 
 static void
-register_keys(cfg_obj_t *control, cfg_obj_t *keylist,
+register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
 	      controlkeylist_t *keyids, isc_mem_t *mctx, const char *socktext)
 {
 	controlkey_t *keyid, *next;
-	cfg_obj_t *keydef;
+	const cfg_obj_t *keydef;
 	char secret[1024];
 	isc_buffer_t b;
 	isc_result_t result;
@@ -736,10 +739,10 @@ register_keys(cfg_obj_t *control, cfg_obj_t *keylist,
 			ISC_LIST_UNLINK(*keyids, keyid, link);
 			free_controlkey(keyid, mctx);
 		} else {
-			cfg_obj_t *algobj = NULL;
-			cfg_obj_t *secretobj = NULL;
-			char *algstr = NULL;
-			char *secretstr = NULL;
+			const cfg_obj_t *algobj = NULL;
+			const cfg_obj_t *secretobj = NULL;
+			const char *algstr = NULL;
+			const char *secretstr = NULL;
 
 			(void)cfg_map_get(keydef, "algorithm", &algobj);
 			(void)cfg_map_get(keydef, "secret", &secretobj);
@@ -805,11 +808,11 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
 	isc_result_t result;
 	cfg_parser_t *pctx = NULL;
 	cfg_obj_t *config = NULL;
-	cfg_obj_t *key = NULL;
-	cfg_obj_t *algobj = NULL;
-	cfg_obj_t *secretobj = NULL;
-	char *algstr = NULL;
-	char *secretstr = NULL;
+	const cfg_obj_t *key = NULL;
+	const cfg_obj_t *algobj = NULL;
+	const cfg_obj_t *secretobj = NULL;
+	const char *algstr = NULL;
+	const char *secretstr = NULL;
 	controlkey_t *keyid = NULL;
 	char secret[1024];
 	isc_buffer_t b;
@@ -888,12 +891,13 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
  * valid or both are NULL.
  */
 static void
-get_key_info(cfg_obj_t *config, cfg_obj_t *control,
-	     cfg_obj_t **global_keylistp, cfg_obj_t **control_keylistp)
+get_key_info(const cfg_obj_t *config, const cfg_obj_t *control,
+	     const cfg_obj_t **global_keylistp,
+	     const cfg_obj_t **control_keylistp)
 {
 	isc_result_t result;
-	cfg_obj_t *control_keylist = NULL;
-	cfg_obj_t *global_keylist = NULL;
+	const cfg_obj_t *control_keylist = NULL;
+	const cfg_obj_t *global_keylist = NULL;
 
 	REQUIRE(global_keylistp != NULL && *global_keylistp == NULL);
 	REQUIRE(control_keylistp != NULL && *control_keylistp == NULL);
@@ -912,15 +916,15 @@ get_key_info(cfg_obj_t *config, cfg_obj_t *control,
 }
 
 static void
-update_listener(ns_controls_t *cp,
-		controllistener_t **listenerp, cfg_obj_t *control,
-		cfg_obj_t *config, isc_sockaddr_t *addr,
-		ns_aclconfctx_t *aclconfctx, const char *socktext)
+update_listener(ns_controls_t *cp, controllistener_t **listenerp,
+		const cfg_obj_t *control, const cfg_obj_t *config,
+		isc_sockaddr_t *addr, ns_aclconfctx_t *aclconfctx,
+		const char *socktext)
 {
 	controllistener_t *listener;
-	cfg_obj_t *allow;
-	cfg_obj_t *global_keylist = NULL;
-	cfg_obj_t *control_keylist = NULL;
+	const cfg_obj_t *allow;
+	const cfg_obj_t *global_keylist = NULL;
+	const cfg_obj_t *control_keylist = NULL;
 	dns_acl_t *new_acl = NULL;
 	controlkeylist_t keys;
 	isc_result_t result = ISC_R_SUCCESS;
@@ -977,18 +981,25 @@ update_listener(ns_controls_t *cp,
 		result = get_rndckey(listener->mctx, &listener->keys);
 	}
 
-	if (result != ISC_R_SUCCESS && global_keylist != NULL)
+	if (result != ISC_R_SUCCESS && global_keylist != NULL) {
 		/*
 		 * This message might be a little misleading since the
 		 * "new keys" might in fact be identical to the old ones,
 		 * but tracking whether they are identical just for the
 		 * sake of avoiding this message would be too much trouble.
 		 */
-		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
-			    "couldn't install new keys for "
-			    "command channel %s: %s",
-			    socktext, isc_result_totext(result));
-
+		if (control != NULL)
+			cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
+				    "couldn't install new keys for "
+				    "command channel %s: %s",
+				    socktext, isc_result_totext(result));
+		else
+			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+				      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+				      "couldn't install new keys for "
+				      "command channel %s: %s",
+				      socktext, isc_result_totext(result));
+	}
 
 	/*
 	 * Now, keep the old access list unless a new one can be made.
@@ -1005,26 +1016,33 @@ update_listener(ns_controls_t *cp,
 		dns_acl_detach(&listener->acl);
 		dns_acl_attach(new_acl, &listener->acl);
 		dns_acl_detach(&new_acl);
-	} else
 		/* XXXDCL say the old acl is still used? */
+	} else if (control != NULL)
 		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
 			    "couldn't install new acl for "
 			    "command channel %s: %s",
 			    socktext, isc_result_totext(result));
+	else
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+			      "couldn't install new acl for "
+			      "command channel %s: %s",
+			      socktext, isc_result_totext(result));
 
 	*listenerp = listener;
 }
 
 static void
 add_listener(ns_controls_t *cp, controllistener_t **listenerp,
-	     cfg_obj_t *control, cfg_obj_t *config, isc_sockaddr_t *addr,
-	     ns_aclconfctx_t *aclconfctx, const char *socktext)
+	     const cfg_obj_t *control, const cfg_obj_t *config,
+	     isc_sockaddr_t *addr, ns_aclconfctx_t *aclconfctx,
+	     const char *socktext)
 {
 	isc_mem_t *mctx = cp->server->mctx;
 	controllistener_t *listener;
-	cfg_obj_t *allow;
-	cfg_obj_t *global_keylist = NULL;
-	cfg_obj_t *control_keylist = NULL;
+	const cfg_obj_t *allow;
+	const cfg_obj_t *global_keylist = NULL;
+	const cfg_obj_t *control_keylist = NULL;
 	dns_acl_t *new_acl = NULL;
 	isc_result_t result = ISC_R_SUCCESS;
 
@@ -1135,13 +1153,13 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp,
 }
 
 isc_result_t
-ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
+ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 		      ns_aclconfctx_t *aclconfctx)
 {
 	controllistener_t *listener;
 	controllistenerlist_t new_listeners;
-	cfg_obj_t *controlslist = NULL;
-	cfg_listelt_t *element, *element2;
+	const cfg_obj_t *controlslist = NULL;
+	const cfg_listelt_t *element, *element2;
 	char socktext[ISC_SOCKADDR_FORMATSIZE];
 
 	ISC_LIST_INIT(new_listeners);
@@ -1163,8 +1181,8 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 		for (element = cfg_list_first(controlslist);
 		     element != NULL;
 		     element = cfg_list_next(element)) {
-			cfg_obj_t *controls;
-			cfg_obj_t *inetcontrols = NULL;
+			const cfg_obj_t *controls;
+			const cfg_obj_t *inetcontrols = NULL;
 
 			controls = cfg_listelt_value(element);
 			(void)cfg_map_get(controls, "inet", &inetcontrols);
@@ -1174,9 +1192,9 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 			for (element2 = cfg_list_first(inetcontrols);
 			     element2 != NULL;
 			     element2 = cfg_list_next(element2)) {
-				cfg_obj_t *control;
-				cfg_obj_t *obj;
-				isc_sockaddr_t *addr;
+				const cfg_obj_t *control;
+				const cfg_obj_t *obj;
+				isc_sockaddr_t addr;
 
 				/*
 				 * The parser handles BIND 8 configuration file
@@ -1189,12 +1207,12 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 				control = cfg_listelt_value(element2);
 
 				obj = cfg_tuple_get(control, "address");
-				addr = cfg_obj_assockaddr(obj);
-				if (isc_sockaddr_getport(addr) == 0)
-					isc_sockaddr_setport(addr,
+				addr = *cfg_obj_assockaddr(obj);
+				if (isc_sockaddr_getport(&addr) == 0)
+					isc_sockaddr_setport(&addr,
 							     NS_CONTROL_PORT);
 
-				isc_sockaddr_format(addr, socktext,
+				isc_sockaddr_format(&addr, socktext,
 						    sizeof(socktext));
 
 				isc_log_write(ns_g_lctx,
@@ -1205,7 +1223,7 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 					      socktext);
 
 				update_listener(cp, &listener, control, config,
-						addr, aclconfctx, socktext);
+						&addr, aclconfctx, socktext);
 
 				if (listener != NULL)
 					/*
@@ -1219,7 +1237,7 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 					 * This is a new listener.
 					 */
 					add_listener(cp, &listener, control,
-						     config, addr, aclconfctx,
+						     config, &addr, aclconfctx,
 						     socktext);
 
 				if (listener != NULL)
diff --git a/bin/named/include/named/aclconf.h b/bin/named/include/named/aclconf.h
index 81265727..a5b333a9 100644
--- a/bin/named/include/named/aclconf.h
+++ b/bin/named/include/named/aclconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.h,v 1.12.208.1 2004/03/06 10:21:23 marka Exp $ */
+/* $Id: aclconf.h,v 1.12.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NS_ACLCONF_H
 #define NS_ACLCONF_H 1
@@ -49,8 +49,8 @@ ns_aclconfctx_destroy(ns_aclconfctx_t *ctx);
  */
 
 isc_result_t
-ns_acl_fromconfig(cfg_obj_t *caml,
-		  cfg_obj_t *cctx,
+ns_acl_fromconfig(const cfg_obj_t *caml,
+		  const cfg_obj_t *cctx,
 		  ns_aclconfctx_t *ctx,
 		  isc_mem_t *mctx,
 		  dns_acl_t **target);
diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index b3b4f121..8e5b94a7 100644
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h,v 1.4.12.4 2004/04/20 14:12:10 marka Exp $ */
+/* $Id: config.h,v 1.4.12.6 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1
@@ -29,27 +29,28 @@ isc_result_t
 ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf);
 
 isc_result_t
-ns_config_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
+ns_config_get(const cfg_obj_t **maps, const char* name, const cfg_obj_t **obj);
 
 isc_result_t
-ns_checknames_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
+ns_checknames_get(const cfg_obj_t **maps, const char* name,
+		  const cfg_obj_t **obj);
 
 int
-ns_config_listcount(cfg_obj_t *list);
+ns_config_listcount(const cfg_obj_t *list);
 
 isc_result_t
-ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
+ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass,
 		   dns_rdataclass_t *classp);
 
 isc_result_t
-ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
+ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 		  dns_rdatatype_t *typep);
 
 dns_zonetype_t
-ns_config_getzonetype(cfg_obj_t *zonetypeobj);
+ns_config_getzonetype(const cfg_obj_t *zonetypeobj);
 
 isc_result_t
-ns_config_getiplist(cfg_obj_t *config, cfg_obj_t *list,
+ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list,
 		    in_port_t defport, isc_mem_t *mctx,
 		    isc_sockaddr_t **addrsp, isc_uint32_t *countp);
 
@@ -58,16 +59,16 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 		    isc_uint32_t count);
 
 isc_result_t
-ns_config_getipandkeylist(cfg_obj_t *config, cfg_obj_t *list, isc_mem_t *mctx,
-			  isc_sockaddr_t **addrsp, dns_name_t ***keys,
-			  isc_uint32_t *countp);
+ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
+			  isc_mem_t *mctx, isc_sockaddr_t **addrsp,
+			  dns_name_t ***keys, isc_uint32_t *countp);
 
 void
 ns_config_putipandkeylist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 			  dns_name_t ***keys, isc_uint32_t count);
 
 isc_result_t
-ns_config_getport(cfg_obj_t *config, in_port_t *portp);
+ns_config_getport(const cfg_obj_t *config, in_port_t *portp);
 
 isc_result_t
 ns_config_getkeyalgorithm(const char *str, dns_name_t **name);
diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index bbb7d36c..bdb706e3 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.h,v 1.6.2.2.2.7 2004/09/03 03:43:32 marka Exp $ */
+/* $Id: control.h,v 1.6.2.2.2.9 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
@@ -67,7 +67,7 @@ ns_controls_destroy(ns_controls_t **ctrlsp);
  */
 
 isc_result_t
-ns_controls_configure(ns_controls_t *controls, cfg_obj_t *config,
+ns_controls_configure(ns_controls_t *controls, const cfg_obj_t *config,
 		      ns_aclconfctx_t *aclconfctx);
 /*
  * Configure zero or more command channels into 'controls'
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 2cc85483..b8137e8d 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.59.68.5 2004/03/08 04:04:20 marka Exp $ */
+/* $Id: globals.h,v 1.59.68.7 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
@@ -75,7 +75,7 @@ EXTERN unsigned int		ns_g_debuglevel		INIT(0);
  * Current configuration information.
  */
 EXTERN cfg_obj_t *		ns_g_config		INIT(NULL);
-EXTERN cfg_obj_t *		ns_g_defaults		INIT(NULL);
+EXTERN const cfg_obj_t *	ns_g_defaults		INIT(NULL);
 EXTERN const char *		ns_g_conffile		INIT(NS_SYSCONFDIR
 							     "/named.conf");
 EXTERN const char *		ns_g_keyfile		INIT(NS_SYSCONFDIR
diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h
index a6f7450c..b92ad313 100644
--- a/bin/named/include/named/logconf.h
+++ b/bin/named/include/named/logconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.h,v 1.10.208.1 2004/03/06 10:21:24 marka Exp $ */
+/* $Id: logconf.h,v 1.10.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_LOGCONF_H
 #define NAMED_LOGCONF_H 1
@@ -23,7 +23,7 @@
 #include <isc/log.h>
 
 isc_result_t
-ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt);
+ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt);
 /*
  * Set up the logging configuration in '*logconf' according to
  * the named.conf data in 'logstmt'.
diff --git a/bin/named/include/named/lwresd.h b/bin/named/include/named/lwresd.h
index 7ba857c0..2aa1d55c 100644
--- a/bin/named/include/named/lwresd.h
+++ b/bin/named/include/named/lwresd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.h,v 1.12.208.1 2004/03/06 10:21:25 marka Exp $ */
+/* $Id: lwresd.h,v 1.12.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_LWRESD_H
 #define NAMED_LWRESD_H 1
@@ -56,7 +56,7 @@ struct ns_lwreslistener {
  * Configure lwresd.
  */
 isc_result_t
-ns_lwresd_configure(isc_mem_t *mctx, cfg_obj_t *config);
+ns_lwresd_configure(isc_mem_t *mctx, const cfg_obj_t *config);
 
 isc_result_t
 ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx,
@@ -72,7 +72,8 @@ ns_lwresd_shutdown(void);
  * Manager functions
  */
 isc_result_t
-ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres, ns_lwresd_t **lwresdp);
+ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres,
+		      ns_lwresd_t **lwresdp);
 
 void
 ns_lwdmanager_attach(ns_lwresd_t *source, ns_lwresd_t **targetp);
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 97eb2efc..37526c0b 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.h,v 1.58.2.1.10.11 2004/03/08 04:04:21 marka Exp $ */
+/* $Id: server.h,v 1.58.2.1.10.13 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
@@ -208,6 +208,6 @@ ns_server_dumprecursing(ns_server_t *server);
  * Maintain a list of dispatches that require reserved ports.
  */
 void
-ns_add_reserved_dispatch(ns_server_t *server, isc_sockaddr_t *addr);
+ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr);
 
 #endif /* NAMED_SERVER_H */
diff --git a/bin/named/include/named/sortlist.h b/bin/named/include/named/sortlist.h
index 88a14938..9966686e 100644
--- a/bin/named/include/named/sortlist.h
+++ b/bin/named/include/named/sortlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.h,v 1.4.208.1 2004/03/06 10:21:26 marka Exp $ */
+/* $Id: sortlist.h,v 1.4.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NAMED_SORTLIST_H
 #define NAMED_SORTLIST_H 1
@@ -28,7 +28,7 @@
  * Type for callback functions that rank addresses.
  */
 typedef int 
-(*dns_addressorderfunc_t)(isc_netaddr_t *address, void *arg);
+(*dns_addressorderfunc_t)(const isc_netaddr_t *address, const void *arg);
 
 /*
  * Return value type for setup_sortlist.
@@ -40,7 +40,8 @@ typedef enum {
 } ns_sortlisttype_t;
 
 ns_sortlisttype_t
-ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp);
+ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr,
+		  const void **argp);
 /*
  * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.
  *
@@ -55,14 +56,14 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp);
  */
 
 int
-ns_sortlist_addrorder1(isc_netaddr_t *addr, void *arg);
+ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg);
 /*
  * Find the sort order of 'addr' in 'arg', the matching element
  * of a 1-element top-level sortlist statement.
  */
 
 int
-ns_sortlist_addrorder2(isc_netaddr_t *addr, void *arg);
+ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg);
 /*
  * Find the sort order of 'addr' in 'arg', a topology-like
  * ACL forming the second element in a 2-element top-level
@@ -72,7 +73,7 @@ ns_sortlist_addrorder2(isc_netaddr_t *addr, void *arg);
 void
 ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr,
 			dns_addressorderfunc_t *orderp,
-			void **argp);
+			const void **argp);
 /*
  * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.
  * If a sortlist statement applies, return in '*orderp' a pointer to a function
diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h
index e3710eae..ac72f3e9 100644
--- a/bin/named/include/named/tkeyconf.h
+++ b/bin/named/include/named/tkeyconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.h,v 1.9.208.1 2004/03/06 10:21:26 marka Exp $ */
+/* $Id: tkeyconf.h,v 1.9.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NS_TKEYCONF_H
 #define NS_TKEYCONF_H 1
@@ -28,8 +28,8 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_tkeyctx_fromconfig(cfg_obj_t *options, isc_mem_t *mctx, isc_entropy_t *ectx,
-		      dns_tkeyctx_t **tctxp);
+ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
+		      isc_entropy_t *ectx, dns_tkeyctx_t **tctxp);
 /*
  * 	Create a TKEY context and configure it, including the default DH key
  *	and default domain, according to 'options'.
diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h
index ef4161de..fcb415eb 100644
--- a/bin/named/include/named/tsigconf.h
+++ b/bin/named/include/named/tsigconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.h,v 1.9.208.1 2004/03/06 10:21:26 marka Exp $ */
+/* $Id: tsigconf.h,v 1.9.208.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NS_TSIGCONF_H
 #define NS_TSIGCONF_H 1
@@ -26,7 +26,7 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_tsigkeyring_fromconfig(cfg_obj_t *config, cfg_obj_t *vconfig,
+ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 			  isc_mem_t *mctx, dns_tsig_keyring_t **ringp);
 /*
  * Create a TSIG key ring and configure it according to the 'key'
diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h
index 3b8f200d..3e63053f 100644
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.h,v 1.16.2.2.8.1 2004/03/06 10:21:27 marka Exp $ */
+/* $Id: zoneconf.h,v 1.16.2.2.8.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1
@@ -30,8 +30,9 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
-		  ns_aclconfctx_t *ac, dns_zone_t *zone);
+ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+		  const cfg_obj_t *zconfig, ns_aclconfctx_t *ac,
+		  dns_zone_t *zone);
 /*
  * Configure or reconfigure a zone according to the named.conf
  * data in 'cctx' and 'czone'.
@@ -48,7 +49,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
  */
 
 isc_boolean_t
-ns_zone_reusable(dns_zone_t *zone, cfg_obj_t *zconfig);
+ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig);
 /*
  * If 'zone' can be safely reconfigured according to the configuration
  * data in 'zconfig', return ISC_TRUE.  If the configuration data is so
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index b212892c..c5a10a9b 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.59.2.5.8.15 2004/08/10 04:56:23 jinmei Exp $ */
+/* $Id: interfacemgr.c,v 1.59.2.5.8.17 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -717,9 +717,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 			 * See if the address matches the listen-on statement;
 			 * if not, ignore the interface.
 			 */
-			result = dns_acl_match(&listen_netaddr, NULL,
-					       le->acl, &mgr->aclenv,
-					       &match, NULL);
+			(void)dns_acl_match(&listen_netaddr, NULL, le->acl,
+					    &mgr->aclenv, &match, NULL);
 			if (match <= 0)
 				continue;
 
@@ -745,9 +744,9 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 				for (ele = ISC_LIST_HEAD(ext_listen->elts);
 				     ele != NULL;
 				     ele = ISC_LIST_NEXT(ele, link)) {
-					dns_acl_match(&listen_netaddr, NULL,
-						      ele->acl, NULL,
-						      &match, NULL);
+					(void)dns_acl_match(&listen_netaddr,
+							    NULL, ele->acl,
+							    NULL, &match, NULL);
 					if (match > 0 && ele->port == le->port)
 						break;
 					else
diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 596d4016..1bf3b558 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.c,v 1.30.2.3.10.2 2004/03/06 10:21:18 marka Exp $ */
+/* $Id: logconf.c,v 1.30.2.3.10.4 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -41,13 +41,13 @@
  * in 'ccat' and add it to 'lctx'.
  */
 static isc_result_t
-category_fromconf(cfg_obj_t *ccat, isc_logconfig_t *lctx) {
+category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *lctx) {
 	isc_result_t result;
 	const char *catname;
 	isc_logcategory_t *category;
 	isc_logmodule_t *module;
-	cfg_obj_t *destinations = NULL;
-	cfg_listelt_t *element = NULL;
+	const cfg_obj_t *destinations = NULL;
+	const cfg_listelt_t *element = NULL;
 
 	catname = cfg_obj_asstring(cfg_tuple_get(ccat, "name"));
 	category = isc_log_categorybyname(ns_g_lctx, catname);
@@ -68,8 +68,8 @@ category_fromconf(cfg_obj_t *ccat, isc_logconfig_t *lctx) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *channel = cfg_listelt_value(element);
-		char *channelname = cfg_obj_asstring(channel);
+		const cfg_obj_t *channel = cfg_listelt_value(element);
+		const char *channelname = cfg_obj_asstring(channel);
 
 		result = isc_log_usechannel(lctx, channelname, category,
 					    module);
@@ -89,18 +89,18 @@ category_fromconf(cfg_obj_t *ccat, isc_logconfig_t *lctx) {
  * in 'cchan' and add it to 'lctx'.
  */
 static isc_result_t
-channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
+channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	isc_result_t result;
 	isc_logdestination_t dest;
 	unsigned int type;
 	unsigned int flags = 0;
 	int level;
 	const char *channelname;
-	cfg_obj_t *fileobj = NULL;
-	cfg_obj_t *syslogobj = NULL;
-	cfg_obj_t *nullobj = NULL;
-	cfg_obj_t *stderrobj = NULL;
-	cfg_obj_t *severity = NULL;
+	const cfg_obj_t *fileobj = NULL;
+	const cfg_obj_t *syslogobj = NULL;
+	const cfg_obj_t *nullobj = NULL;
+	const cfg_obj_t *stderrobj = NULL;
+	const cfg_obj_t *severity = NULL;
 	int i;
 
 	channelname = cfg_obj_asstring(cfg_map_getname(channel));
@@ -130,9 +130,10 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	type = ISC_LOG_TONULL;
 	
 	if (fileobj != NULL) {
-		cfg_obj_t *pathobj = cfg_tuple_get(fileobj, "file");
-		cfg_obj_t *sizeobj = cfg_tuple_get(fileobj, "size");
-		cfg_obj_t *versionsobj = cfg_tuple_get(fileobj, "versions");
+		const cfg_obj_t *pathobj = cfg_tuple_get(fileobj, "file");
+		const cfg_obj_t *sizeobj = cfg_tuple_get(fileobj, "size");
+		const cfg_obj_t *versionsobj =
+				 cfg_tuple_get(fileobj, "versions");
 		isc_int32_t versions = ISC_LOG_ROLLNEVER;
 		isc_offset_t size = 0;
 
@@ -157,7 +158,7 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
 		type = ISC_LOG_TOSYSLOG;
 
 		if (cfg_obj_isstring(syslogobj)) {
-			char *facilitystr = cfg_obj_asstring(syslogobj);
+			const char *facilitystr = cfg_obj_asstring(syslogobj);
 			(void)isc_syslog_facilityfromstring(facilitystr,
 							    &facility);
 		}
@@ -174,9 +175,9 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	 * Munge flags.
 	 */
 	{
-		cfg_obj_t *printcat = NULL;
-		cfg_obj_t *printsev = NULL;
-		cfg_obj_t *printtime = NULL;
+		const cfg_obj_t *printcat = NULL;
+		const cfg_obj_t *printsev = NULL;
+		const cfg_obj_t *printtime = NULL;
 
 		(void)cfg_map_get(channel, "print-category", &printcat);
 		(void)cfg_map_get(channel, "print-severity", &printsev);
@@ -193,7 +194,7 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	level = ISC_LOG_INFO;
 	if (cfg_map_get(channel, "severity", &severity) == ISC_R_SUCCESS) {
 		if (cfg_obj_isstring(severity)) {
-			char *str = cfg_obj_asstring(severity);
+			const char *str = cfg_obj_asstring(severity);
 			if (strcasecmp(str, "critical") == 0)
 				level = ISC_LOG_CRITICAL;
 			else if (strcasecmp(str, "error") == 0)
@@ -242,13 +243,14 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
 }
 
 isc_result_t
-ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt) {
+ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt) {
 	isc_result_t result;
-	cfg_obj_t *channels = NULL;
-	cfg_obj_t *categories = NULL;
-	cfg_listelt_t *element;
+	const cfg_obj_t *channels = NULL;
+	const cfg_obj_t *categories = NULL;
+	const cfg_listelt_t *element;
 	isc_boolean_t default_set = ISC_FALSE;
 	isc_boolean_t unmatched_set = ISC_FALSE;
+	const cfg_obj_t *catname;
 
 	CHECK(ns_log_setdefaultchannels(logconf));
 
@@ -257,7 +259,7 @@ ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *channel = cfg_listelt_value(element);
+		const cfg_obj_t *channel = cfg_listelt_value(element);
 		CHECK(channel_fromconf(channel, logconf));
 	}
 
@@ -266,15 +268,15 @@ ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *category = cfg_listelt_value(element);
+		const cfg_obj_t *category = cfg_listelt_value(element);
 		CHECK(category_fromconf(category, logconf));
 		if (!default_set) {
-			cfg_obj_t *catname = cfg_tuple_get(category, "name");
+			catname = cfg_tuple_get(category, "name");
 			if (strcmp(cfg_obj_asstring(catname), "default") == 0)
 				default_set = ISC_TRUE;
 		}
 		if (!unmatched_set) {
-			cfg_obj_t *catname = cfg_tuple_get(category, "name");
+			catname = cfg_tuple_get(category, "name");
 			if (strcmp(cfg_obj_asstring(catname), "unmatched") == 0)
 				unmatched_set = ISC_TRUE;
 		}
diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c
index 030a77ae..539c25bf 100644
--- a/bin/named/lwdgabn.c
+++ b/bin/named/lwdgabn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgabn.c,v 1.13.12.3 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwdgabn.c,v 1.13.12.5 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -120,7 +120,7 @@ sort_addresses(ns_lwdclient_t *client) {
 	rankedaddress *addrs;
 	isc_netaddr_t remote;
 	dns_addressorderfunc_t order;
-	void *arg;
+	const void *arg;
 	ns_lwresd_t *lwresd = client->clientmgr->listener->manager;
 	unsigned int i;
 	isc_result_t result;
diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c
index 66522653..3ad9e9e3 100644
--- a/bin/named/lwdgrbn.c
+++ b/bin/named/lwdgrbn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgrbn.c,v 1.11.208.3 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwdgrbn.c,v 1.11.208.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -358,7 +358,7 @@ lookup_done(isc_task_t *task, isc_event_t *event) {
 	client->sendlength = r.length;
 	result = ns_lwdclient_sendreply(client, &r);
 	if (result != ISC_R_SUCCESS)
-		goto out;
+		goto out2;
 
 	NS_LWDCLIENT_SETSEND(client);
 
@@ -378,7 +378,7 @@ lookup_done(isc_task_t *task, isc_event_t *event) {
 	if (grbn->siglen != NULL)
 		isc_mem_put(cm->mctx, grbn->siglen,
 			    grbn->nsigs * sizeof(lwres_uint16_t));
-
+ out2:
 	if (client->lookup != NULL)
 		dns_lookup_destroy(&client->lookup);
 	if (lwb.base != NULL)
diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index 9da41681..e48822f7 100644
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.37.2.2.2.5 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwresd.c,v 1.37.2.2.2.8 2006/02/28 06:32:53 marka Exp $ */
 
 /*
  * Main program for the Lightweight Resolver Daemon.
@@ -285,14 +285,14 @@ ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx,
  * Handle lwresd manager objects
  */
 isc_result_t
-ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres,
+ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres,
 		     ns_lwresd_t **lwresdp)
 {
 	ns_lwresd_t *lwresd;
 	const char *vname;
 	dns_rdataclass_t vclass;
-	cfg_obj_t *obj, *viewobj, *searchobj;
-	cfg_listelt_t *element;
+	const cfg_obj_t *obj, *viewobj, *searchobj;
+	const cfg_listelt_t *element;
 	isc_result_t result;
 
 	INSIST(lwresdp != NULL && *lwresdp == NULL);
@@ -356,8 +356,8 @@ ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres,
 		     element != NULL;
 		     element = cfg_list_next(element))
 		{
-			cfg_obj_t *search;
-			char *searchstr;
+			const cfg_obj_t *search;
+			const char *searchstr;
 			isc_buffer_t namebuf;
 			dns_fixedname_t fname;
 			dns_name_t *name;
@@ -407,6 +407,7 @@ ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres,
 		ns_lwsearchlist_detach(&lwresd->search);
 	if (lwresd->mctx != NULL)
 		isc_mem_detach(&lwresd->mctx);
+	isc_mem_put(mctx, lwresd, sizeof(ns_lwresd_t));
 	return (result);
 }
 
@@ -744,11 +745,11 @@ configure_listener(isc_sockaddr_t *address, ns_lwresd_t *lwresd,
 }
 
 isc_result_t
-ns_lwresd_configure(isc_mem_t *mctx, cfg_obj_t *config) {
-	cfg_obj_t *lwreslist = NULL;
-	cfg_obj_t *lwres = NULL;
-	cfg_obj_t *listenerslist = NULL;
-	cfg_listelt_t *element = NULL;
+ns_lwresd_configure(isc_mem_t *mctx, const cfg_obj_t *config) {
+	const cfg_obj_t *lwreslist = NULL;
+	const cfg_obj_t *lwres = NULL;
+	const cfg_obj_t *listenerslist = NULL;
+	const cfg_listelt_t *element = NULL;
 	ns_lwreslistener_t *listener;
 	ns_lwreslistenerlist_t newlisteners;
 	isc_result_t result;
diff --git a/bin/named/lwresd.html b/bin/named/lwresd.html
index 439153aa..c12aaa7e 100644
--- a/bin/named/lwresd.html
+++ b/bin/named/lwresd.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwresd.html,v 1.4.2.1.4.8 2005/10/13 02:33:47 marka Exp $ -->
+<!-- $Id: lwresd.html,v 1.4.2.1.4.9 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">lwresd</span> &#8212; lightweight resolver daemon</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">lwresd</code>  [<code class="option">-C <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>] [<code class="option">-f</code>] [<code class="option">-g</code>] [<code class="option">-i <em class="replaceable"><code>pid-file</code></em></code>] [<code class="option">-n <em class="replaceable"><code>#cpus</code></em></code>] [<code class="option">-P <em class="replaceable"><code>port</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-s</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>] [<code class="option">-v</code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525920"></a><h2>DESCRIPTION</h2>
+<a name="id2524485"></a><h2>DESCRIPTION</h2>
 <p>
 	<span><strong class="command">lwresd</strong></span> is the daemon providing name lookup
 	services to clients that use the BIND 9 lightweight resolver
@@ -67,7 +67,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525969"></a><h2>OPTIONS</h2>
+<a name="id2525217"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-C <em class="replaceable"><code>config-file</code></em></span></dt>
 <dd><p>
@@ -159,7 +159,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526237"></a><h2>FILES</h2>
+<a name="id2525485"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="filename">/etc/resolv.conf</code></span></dt>
 <dd><p>
@@ -172,7 +172,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526277"></a><h2>SEE ALSO</h2>
+<a name="id2525525"></a><h2>SEE ALSO</h2>
 <p>
 	<span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
 	<span class="citerefentry"><span class="refentrytitle">lwres</span>(3)</span>,
@@ -180,7 +180,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526315"></a><h2>AUTHOR</h2>
+<a name="id2525563"></a><h2>AUTHOR</h2>
 <p>
 	<span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/named/main.c b/bin/named/main.c
index c155291d..579ab861 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.119.2.3.2.22 2005/04/29 01:04:47 marka Exp $ */
+/* $Id: main.c,v 1.119.2.3.2.24 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -473,7 +473,7 @@ create_managers(void) {
 	result = isc_taskmgr_create(ns_g_mctx, ns_g_cpus, 0, &ns_g_taskmgr);
 	if (result != ISC_R_SUCCESS) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "ns_taskmgr_create() failed: %s",
+				 "isc_taskmgr_create() failed: %s",
 				 isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
@@ -481,7 +481,7 @@ create_managers(void) {
 	result = isc_timermgr_create(ns_g_mctx, &ns_g_timermgr);
 	if (result != ISC_R_SUCCESS) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "ns_timermgr_create() failed: %s",
+				 "isc_timermgr_create() failed: %s",
 				 isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
diff --git a/bin/named/named.8 b/bin/named/named.8
index e072c169..33dcbc47 100644
--- a/bin/named/named.8
+++ b/bin/named/named.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named.8,v 1.17.208.6 2005/10/13 02:33:46 marka Exp $
+.\" $Id: named.8,v 1.17.208.8 2006/01/18 04:59:04 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -176,6 +176,7 @@ RFC 1034,
 RFC 1035,
 \fBrndc\fR(8),
 \fBlwresd\fR(8),
+\fBnamed.conf\fR(5),
 BIND 9 Administrator Reference Manual.
 .SH "AUTHOR"
 .PP
diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index d0b690b1..5e3c5811 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
 .\" 
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named.conf.5,v 1.1.4.6 2005/10/13 02:33:47 marka Exp $
+.\" $Id: named.conf.5,v 1.1.4.7 2006/05/17 02:38:09 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -184,8 +184,8 @@ options {
 	rfc2308\-type1 \fIboolean\fR; // not yet implemented
 	additional\-from\-auth \fIboolean\fR;
 	additional\-from\-cache \fIboolean\fR;
-	query\-source \fIquerysource4\fR;
-	query\-source\-v6 \fIquerysource6\fR;
+	query\-source [ address ( \fIipv4_address\fR | * ) ] [ port ( \fIinteger\fR | * ) ];
+	query\-source\-v6 [ address ( \fIipv6_address\fR | * ) ] [ port ( \fIinteger\fR | * ) ];
 	cleaning\-interval \fIinteger\fR;
 	min\-roots \fIinteger\fR; // not implemented
 	lame\-ttl \fIinteger\fR;
@@ -295,8 +295,8 @@ view \fIstring\fR \fIoptional_class\fR {
 	rfc2308\-type1 \fIboolean\fR; // not yet implemented
 	additional\-from\-auth \fIboolean\fR;
 	additional\-from\-cache \fIboolean\fR;
-	query\-source \fIquerysource4\fR;
-	query\-source\-v6 \fIquerysource6\fR;
+	query\-source [ address ( \fIipv4_address\fR | * ) ] [ port ( \fIinteger\fR | * ) ];
+	query\-source\-v6 [ address ( \fIipv6_address\fR | * ) ] [ port ( \fIinteger\fR | * ) ];
 	cleaning\-interval \fIinteger\fR;
 	min\-roots \fIinteger\fR; // not implemented
 	lame\-ttl \fIinteger\fR;
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 4ba10844..f998dc85 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.1.4.4 2005/05/13 01:22:33 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.1.4.6 2006/05/17 00:34:35 marka Exp $ -->
 
 <refentry>
   <refentryinfo>
@@ -34,6 +34,7 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -230,8 +231,8 @@ options {
 	rfc2308-type1 <replaceable>boolean</replaceable>; // not yet implemented
 	additional-from-auth <replaceable>boolean</replaceable>;
 	additional-from-cache <replaceable>boolean</replaceable>;
-	query-source <replaceable>querysource4</replaceable>;
-	query-source-v6 <replaceable>querysource6</replaceable>;
+	query-source <optional> address ( <replaceable>ipv4_address</replaceable> | * ) </optional> <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
+	query-source-v6 <optional> address ( <replaceable>ipv6_address</replaceable> | * ) </optional> <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
 	cleaning-interval <replaceable>integer</replaceable>;
 	min-roots <replaceable>integer</replaceable>; // not implemented
 	lame-ttl <replaceable>integer</replaceable>;
@@ -357,8 +358,8 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 	rfc2308-type1 <replaceable>boolean</replaceable>; // not yet implemented
 	additional-from-auth <replaceable>boolean</replaceable>;
 	additional-from-cache <replaceable>boolean</replaceable>;
-	query-source <replaceable>querysource4</replaceable>;
-	query-source-v6 <replaceable>querysource6</replaceable>;
+	query-source <optional> address ( <replaceable>ipv4_address</replaceable> | * ) </optional> <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
+	query-source-v6 <optional> address ( <replaceable>ipv6_address</replaceable> | * ) </optional> <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
 	cleaning-interval <replaceable>integer</replaceable>;
 	min-roots <replaceable>integer</replaceable>; // not implemented
 	lame-ttl <replaceable>integer</replaceable>;
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 8b3b517d..9c55c006 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - 
  - Permission to use, copy, modify, and distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named.conf.html,v 1.1.4.10 2005/10/13 02:33:48 marka Exp $ -->
+<!-- $Id: named.conf.html,v 1.1.4.12 2006/05/17 02:38:09 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -21,7 +21,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><code class="filename">named.conf</code> &#8212; configuration file for named</p>
@@ -31,7 +31,7 @@
 <div class="cmdsynopsis"><p><code class="command">named.conf</code> </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525889"></a><h2>DESCRIPTION</h2>
+<a name="id2524457"></a><h2>DESCRIPTION</h2>
 <p>
 	<code class="filename">named.conf</code> is the configuration file for
 	<span><strong class="command">named</strong></span>.  Statements are enclosed
@@ -50,14 +50,14 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525917"></a><h2>ACL</h2>
+<a name="id2524486"></a><h2>ACL</h2>
 <div class="literallayout"><p><br>
 acl <em class="replaceable"><code>string</code></em> { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 <br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525933"></a><h2>KEY</h2>
+<a name="id2525185"></a><h2>KEY</h2>
 <div class="literallayout"><p><br>
 key <em class="replaceable"><code>domain_name</code></em> {<br>
 	algorithm <em class="replaceable"><code>string</code></em>;<br>
@@ -66,7 +66,7 @@ key <em class="replaceable"><code>domain_name</code></em> {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525953"></a><h2>MASTERS</h2>
+<a name="id2525204"></a><h2>MASTERS</h2>
 <div class="literallayout"><p><br>
 masters <em class="replaceable"><code>string</code></em> [<span class="optional"> port <em class="replaceable"><code>integer</code></em> </span>] {<br>
 	( <em class="replaceable"><code>masters</code></em> | <em class="replaceable"><code>ipv4_address</code></em> [<span class="optional">port <em class="replaceable"><code>integer</code></em></span>] |<br>
@@ -75,7 +75,7 @@ masters <em class="replaceable"><code>string</code></em> [<span class="optional"
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525998"></a><h2>SERVER</h2>
+<a name="id2525250"></a><h2>SERVER</h2>
 <div class="literallayout"><p><br>
 server ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> ) {<br>
 	bogus <em class="replaceable"><code>boolean</code></em>;<br>
@@ -95,7 +95,7 @@ server ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="rep
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526056"></a><h2>TRUSTED-KEYS</h2>
+<a name="id2525307"></a><h2>TRUSTED-KEYS</h2>
 <div class="literallayout"><p><br>
 trusted-keys {<br>
 	<em class="replaceable"><code>domain_name</code></em> <em class="replaceable"><code>flags</code></em> <em class="replaceable"><code>protocol</code></em> <em class="replaceable"><code>algorithm</code></em> <em class="replaceable"><code>key</code></em>; ... <br>
@@ -103,7 +103,7 @@ trusted-keys {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526082"></a><h2>CONTROLS</h2>
+<a name="id2525333"></a><h2>CONTROLS</h2>
 <div class="literallayout"><p><br>
 controls {<br>
 	inet ( <em class="replaceable"><code>ipv4_address</code></em> | <em class="replaceable"><code>ipv6_address</code></em> | * )<br>
@@ -115,7 +115,7 @@ controls {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526117"></a><h2>LOGGING</h2>
+<a name="id2525368"></a><h2>LOGGING</h2>
 <div class="literallayout"><p><br>
 logging {<br>
 	channel <em class="replaceable"><code>string</code></em> {<br>
@@ -133,7 +133,7 @@ logging {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526155"></a><h2>LWRES</h2>
+<a name="id2525406"></a><h2>LWRES</h2>
 <div class="literallayout"><p><br>
 lwres {<br>
 	listen-on [<span class="optional"> port <em class="replaceable"><code>integer</code></em> </span>] {<br>
@@ -146,7 +146,7 @@ lwres {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526197"></a><h2>OPTIONS</h2>
+<a name="id2525448"></a><h2>OPTIONS</h2>
 <div class="literallayout"><p><br>
 options {<br>
 	avoid-v4-udp-ports { <em class="replaceable"><code>port</code></em>; ... };<br>
@@ -202,8 +202,8 @@ options {<br>
 	rfc2308-type1 <em class="replaceable"><code>boolean</code></em>; // not yet implemented<br>
 	additional-from-auth <em class="replaceable"><code>boolean</code></em>;<br>
 	additional-from-cache <em class="replaceable"><code>boolean</code></em>;<br>
-	query-source <em class="replaceable"><code>querysource4</code></em>;<br>
-	query-source-v6 <em class="replaceable"><code>querysource6</code></em>;<br>
+	query-source [<span class="optional"> address ( <em class="replaceable"><code>ipv4_address</code></em> | * ) </span>] [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
+	query-source-v6 [<span class="optional"> address ( <em class="replaceable"><code>ipv6_address</code></em> | * ) </span>] [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
 	cleaning-interval <em class="replaceable"><code>integer</code></em>;<br>
 	min-roots <em class="replaceable"><code>integer</code></em>; // not implemented<br>
 	lame-ttl <em class="replaceable"><code>integer</code></em>;<br>
@@ -289,7 +289,7 @@ options {<br>
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526858"></a><h2>VIEW</h2>
+<a name="id2526129"></a><h2>VIEW</h2>
 <div class="literallayout"><p><br>
 view <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>optional_class</code></em> {<br>
 	match-clients { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
@@ -328,8 +328,8 @@ view <em class="replaceable"><code>string</code></em> <em class="replaceable"><c
 	rfc2308-type1 <em class="replaceable"><code>boolean</code></em>; // not yet implemented<br>
 	additional-from-auth <em class="replaceable"><code>boolean</code></em>;<br>
 	additional-from-cache <em class="replaceable"><code>boolean</code></em>;<br>
-	query-source <em class="replaceable"><code>querysource4</code></em>;<br>
-	query-source-v6 <em class="replaceable"><code>querysource6</code></em>;<br>
+	query-source [<span class="optional"> address ( <em class="replaceable"><code>ipv4_address</code></em> | * ) </span>] [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
+	query-source-v6 [<span class="optional"> address ( <em class="replaceable"><code>ipv6_address</code></em> | * ) </span>] [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
 	cleaning-interval <em class="replaceable"><code>integer</code></em>;<br>
 	min-roots <em class="replaceable"><code>integer</code></em>; // not implemented<br>
 	lame-ttl <em class="replaceable"><code>integer</code></em>;<br>
@@ -407,7 +407,7 @@ view <em class="replaceable"><code>string</code></em> <em class="replaceable"><c
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527269"></a><h2>ZONE</h2>
+<a name="id2526558"></a><h2>ZONE</h2>
 <div class="literallayout"><p><br>
 zone <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>optional_class</code></em> {<br>
 	type ( master | slave | stub | hint |<br>
@@ -483,13 +483,13 @@ zone <em class="replaceable"><code>string</code></em> <em class="replaceable"><c
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527606"></a><h2>FILES</h2>
+<a name="id2526964"></a><h2>FILES</h2>
 <p>
 <code class="filename">/etc/named.conf</code>
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527619"></a><h2>SEE ALSO</h2>
+<a name="id2526977"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
 <span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 47ccf54b..f7cae12b 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.5.98.5 2005/05/13 01:22:33 marka Exp $ -->
+<!-- $Id: named.docbook,v 1.5.98.7 2006/01/17 23:49:30 marka Exp $ -->
 
 <refentry>
   <refentryinfo>
@@ -35,6 +35,7 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -365,6 +366,10 @@
 	  <refentrytitle>lwresd</refentrytitle>
 	  <manvolnum>8</manvolnum>
         </citerefentry>,
+	<citerefentry>
+	  <refentrytitle>named.conf</refentrytitle>
+	  <manvolnum>5</manvolnum>
+	</citerefentry>,
 	<citetitle>BIND 9 Administrator Reference Manual</citetitle>.
     </para>
   </refsect1>
diff --git a/bin/named/named.html b/bin/named/named.html
index f266e70a..18b48c31 100644
--- a/bin/named/named.html
+++ b/bin/named/named.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: named.html,v 1.4.2.1.4.9 2005/10/13 02:33:47 marka Exp $ -->
+<!-- $Id: named.html,v 1.4.2.1.4.12 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">named</span> &#8212; Internet domain name server</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">named</code>  [<code class="option">-4</code>] [<code class="option">-6</code>] [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>] [<code class="option">-f</code>] [<code class="option">-g</code>] [<code class="option">-n <em class="replaceable"><code>#cpus</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-s</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>] [<code class="option">-v</code>] [<code class="option">-x <em class="replaceable"><code>cache-file</code></em></code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525923"></a><h2>DESCRIPTION</h2>
+<a name="id2524491"></a><h2>DESCRIPTION</h2>
 <p>
 	<span><strong class="command">named</strong></span> is a Domain Name System (DNS) server,
 	part of the BIND 9 distribution from ISC.  For more
@@ -46,7 +46,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525948"></a><h2>OPTIONS</h2>
+<a name="id2525200"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-4</span></dt>
 <dd><p>
@@ -177,7 +177,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526297"></a><h2>SIGNALS</h2>
+<a name="id2525548"></a><h2>SIGNALS</h2>
 <p>
 	In routine operation, signals should not be used to control
 	the nameserver; <span><strong class="command">rndc</strong></span> should be used
@@ -198,7 +198,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526412"></a><h2>CONFIGURATION</h2>
+<a name="id2525664"></a><h2>CONFIGURATION</h2>
 <p>
 	The <span><strong class="command">named</strong></span> configuration file is too complex
 	to describe in detail here.  A complete description is
@@ -207,7 +207,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526429"></a><h2>FILES</h2>
+<a name="id2525681"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="filename">/etc/named.conf</code></span></dt>
 <dd><p>
@@ -220,18 +220,19 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526469"></a><h2>SEE ALSO</h2>
+<a name="id2525720"></a><h2>SEE ALSO</h2>
 <p>
 	<em class="citetitle">RFC 1033</em>,
 	<em class="citetitle">RFC 1034</em>,
 	<em class="citetitle">RFC 1035</em>,
 	<span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
 	<span class="citerefentry"><span class="refentrytitle">lwresd</span>(8)</span>,
+	<span class="citerefentry"><span class="refentrytitle">named.conf</span>(5)</span>,
 	<em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526512"></a><h2>AUTHOR</h2>
+<a name="id2525772"></a><h2>AUTHOR</h2>
 <p>
 	<span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/named/query.c b/bin/named/query.c
index 75102fd1..4fe866cf 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.41 2006/05/18 03:15:46 marka Exp $ */
 
 #include <config.h>
 
@@ -2091,17 +2091,31 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
 		result = isc_quota_attach(&ns_g_server->recursionquota,
 					  &client->recursionquota);
 		if  (result == ISC_R_SOFTQUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "recursive-clients soft limit exceeded, "
-				      "aborting oldest query");
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "recursive-clients soft limit "
+					      "exceeded, aborting oldest query");
+			}
 			ns_client_killoldestquery(client);
 			result = ISC_R_SUCCESS;
 		} else if (result == ISC_R_QUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "no more recursive clients: %s",
-				      isc_result_totext(result));
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "no more recursive clients: %s",
+					      isc_result_totext(result));
+			}
 			ns_client_killoldestquery(client);
 		}
 		if (result == ISC_R_SUCCESS && !client->mortal &&
@@ -2182,7 +2196,7 @@ do { \
  *	ISC_R_NOTIMPLEMENTED	The rdata is not a known address type.
  */
 static isc_result_t
-rdata_tonetaddr(dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
+rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
 	struct in_addr ina;
 	struct in6_addr in6a;
 	
@@ -2208,7 +2222,7 @@ rdata_tonetaddr(dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
  * sortlist statement.
  */
 static int
-query_sortlist_order_2element(dns_rdata_t *rdata, void *arg) {
+query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) {
 	isc_netaddr_t netaddr;
 
 	if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS)
@@ -2221,7 +2235,7 @@ query_sortlist_order_2element(dns_rdata_t *rdata, void *arg) {
  * of a 1-element top-level sortlist statement.
  */
 static int
-query_sortlist_order_1element(dns_rdata_t *rdata, void *arg) {
+query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) {
 	isc_netaddr_t netaddr;
 
 	if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS)
@@ -2237,7 +2251,7 @@ static void
 setup_query_sortlist(ns_client_t *client) {
 	isc_netaddr_t netaddr;
 	dns_rdatasetorderfunc_t order = NULL;
-	void *order_arg = NULL;
+	const void *order_arg = NULL;
 	
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 	switch (ns_sortlist_setup(client->view->sortlist,
@@ -2469,7 +2483,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 	/*
 	 * First we must find the right database.
 	 */
-	options = 0;
+	options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
 	if (dns_rdatatype_atparent(qtype) &&
 	    !dns_name_equal(client->query.qname, dns_rootname))
 		options |= DNS_GETDB_NOEXACT;
@@ -2509,9 +2523,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		}
 	}
 	if (result != ISC_R_SUCCESS) {
-		if (result == DNS_R_REFUSED)
-			QUERY_ERROR(DNS_R_REFUSED);
-		else
+		if (result == DNS_R_REFUSED) {
+			if (!PARTIALANSWER(client))
+				QUERY_ERROR(DNS_R_REFUSED);
+		} else
 			QUERY_ERROR(DNS_R_SERVFAIL);
 		goto cleanup;
 	}
@@ -2998,6 +3013,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		query_maybeputqname(client);
 		client->query.qname = tname;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	case DNS_R_DNAME:
 		/*
@@ -3115,6 +3132,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		client->query.qname = fname;
 		fname = NULL;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	default:
 		/*
diff --git a/bin/named/server.c b/bin/named/server.c
index b9d30d02..f29321e5 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339.2.15.2.65 2005/07/27 02:53:15 marka Exp $ */
+/* $Id: server.c,v 1.339.2.15.2.70 2006/05/24 04:30:24 marka Exp $ */
 
 #include <config.h>
 
@@ -167,25 +167,25 @@ static void
 ns_server_reload(isc_task_t *task, isc_event_t *event);
 
 static isc_result_t
-ns_listenelt_fromconfig(cfg_obj_t *listener, cfg_obj_t *config,
+ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config,
 			ns_aclconfctx_t *actx,
 			isc_mem_t *mctx, ns_listenelt_t **target);
 static isc_result_t
-ns_listenlist_fromconfig(cfg_obj_t *listenlist, cfg_obj_t *config,
+ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config,
 			 ns_aclconfctx_t *actx,
 			 isc_mem_t *mctx, ns_listenlist_t **target);
 
 static isc_result_t
-configure_forward(cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
-		  cfg_obj_t *forwarders, cfg_obj_t *forwardtype);
+configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
+		  const cfg_obj_t *forwarders, const cfg_obj_t *forwardtype);
 
 static isc_result_t
-configure_alternates(cfg_obj_t *config, dns_view_t *view,
-		     cfg_obj_t *alternates);
+configure_alternates(const cfg_obj_t *config, dns_view_t *view,
+		     const cfg_obj_t *alternates);
 
 static isc_result_t
-configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
-	       isc_mem_t *mctx, dns_view_t *view,
+configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
+	       const cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view,
 	       ns_aclconfctx_t *aclconf);
 
 static void
@@ -197,13 +197,13 @@ end_reserved_dispatches(ns_server_t *server, isc_boolean_t all);
  * (for a global default).
  */
 static isc_result_t
-configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config,
+configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config,
 		   const char *aclname, ns_aclconfctx_t *actx,
 		   isc_mem_t *mctx, dns_acl_t **aclp)
 {
 	isc_result_t result;
-	cfg_obj_t *maps[3];
-	cfg_obj_t *aclobj = NULL;
+	const cfg_obj_t *maps[3];
+	const cfg_obj_t *aclobj = NULL;
 	int i = 0;
 
 	if (*aclp != NULL)
@@ -211,14 +211,14 @@ configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config,
 	if (vconfig != NULL)
 		maps[i++] = cfg_tuple_get(vconfig, "options");
 	if (config != NULL) {
-		cfg_obj_t *options = NULL;
+		const cfg_obj_t *options = NULL;
 		(void)cfg_map_get(config, "options", &options);
 		if (options != NULL)
 			maps[i++] = options;
 	}
 	maps[i] = NULL;
 
-	result = ns_config_get(maps, aclname, &aclobj);
+	(void)ns_config_get(maps, aclname, &aclobj);
 	if (aclobj == NULL)
 		/*
 		 * No value available.  *aclp == NULL.
@@ -231,13 +231,13 @@ configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config,
 }
 
 static isc_result_t
-configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key,
+configure_view_dnsseckey(const cfg_obj_t *vconfig, const cfg_obj_t *key,
 			 dns_keytable_t *keytable, isc_mem_t *mctx)
 {
 	dns_rdataclass_t viewclass;
 	dns_rdata_dnskey_t keystruct;
 	isc_uint32_t flags, proto, alg;
-	char *keystr, *keynamestr;
+	const char *keystr, *keynamestr;
 	unsigned char keydata[4096];
 	isc_buffer_t keydatabuf;
 	unsigned char rrdata[4096];
@@ -258,7 +258,7 @@ configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key,
 	if (vconfig == NULL)
 		viewclass = dns_rdataclass_in;
 	else {
-		cfg_obj_t *classobj = cfg_tuple_get(vconfig, "class");
+		const cfg_obj_t *classobj = cfg_tuple_get(vconfig, "class");
 		CHECK(ns_config_getclass(classobj, dns_rdataclass_in,
 					 &viewclass));
 	}
@@ -334,15 +334,15 @@ configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key,
  * from 'vconfig' and 'config'.  The variable to be configured is '*target'.
  */
 static isc_result_t
-configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config,
+configure_view_dnsseckeys(const cfg_obj_t *vconfig, const cfg_obj_t *config,
 			  isc_mem_t *mctx, dns_keytable_t **target)
 {
 	isc_result_t result;
-	cfg_obj_t *keys = NULL;
-	cfg_obj_t *voptions = NULL;
-	cfg_listelt_t *element, *element2;
-	cfg_obj_t *keylist;
-	cfg_obj_t *key;
+	const cfg_obj_t *keys = NULL;
+	const cfg_obj_t *voptions = NULL;
+	const cfg_listelt_t *element, *element2;
+	const cfg_obj_t *keylist;
+	const cfg_obj_t *key;
 	dns_keytable_t *keytable = NULL;
 
 	CHECK(dns_keytable_create(mctx, &keytable));
@@ -381,10 +381,10 @@ configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config,
 }
 
 static isc_result_t
-mustbesecure(cfg_obj_t *mbs, dns_resolver_t *resolver)
+mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver)
 {
-	cfg_listelt_t *element;
-	cfg_obj_t *obj;
+	const cfg_listelt_t *element;
+	const cfg_obj_t *obj;
 	const char *str;
 	dns_fixedname_t fixed;
 	dns_name_t *name;
@@ -418,14 +418,14 @@ mustbesecure(cfg_obj_t *mbs, dns_resolver_t *resolver)
  * Get a dispatch appropriate for the resolver of a given view.
  */
 static isc_result_t
-get_view_querysource_dispatch(cfg_obj_t **maps,
+get_view_querysource_dispatch(const cfg_obj_t **maps,
 			      int af, dns_dispatch_t **dispatchp)
 {
 	isc_result_t result;
 	dns_dispatch_t *disp;
 	isc_sockaddr_t sa;
 	unsigned int attrs, attrmask;
-	cfg_obj_t *obj = NULL;
+	const cfg_obj_t *obj = NULL;
 
 	/*
 	 * Make compiler happy.
@@ -436,7 +436,6 @@ get_view_querysource_dispatch(cfg_obj_t **maps,
 	case AF_INET:
 		result = ns_config_get(maps, "query-source", &obj);
 		INSIST(result == ISC_R_SUCCESS);
-
 		break;
 	case AF_INET6:
 		result = ns_config_get(maps, "query-source-v6", &obj);
@@ -517,10 +516,10 @@ get_view_querysource_dispatch(cfg_obj_t **maps,
 }
 
 static isc_result_t
-configure_order(dns_order_t *order, cfg_obj_t *ent) {
+configure_order(dns_order_t *order, const cfg_obj_t *ent) {
 	dns_rdataclass_t rdclass;
 	dns_rdatatype_t rdtype;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 	dns_fixedname_t fixed;
 	unsigned int mode = 0;
 	const char *str;
@@ -567,7 +566,7 @@ configure_order(dns_order_t *order, cfg_obj_t *ent) {
 	/*
 	 * "*" should match everything including the root (BIND 8 compat).
 	 * As dns_name_matcheswildcard(".", "*.") returns FALSE add a
-	 * explict entry for "." when the name is "*".
+	 * explicit entry for "." when the name is "*".
 	 */
 	if (addroot) {
 		result = dns_order_add(order, dns_rootname,
@@ -581,12 +580,12 @@ configure_order(dns_order_t *order, cfg_obj_t *ent) {
 }
 
 static isc_result_t
-configure_peer(cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
-	isc_sockaddr_t *sa;
+configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+	const isc_sockaddr_t *sa;
 	isc_netaddr_t na;
 	dns_peer_t *peer;
-	cfg_obj_t *obj;
-	char *str;
+	const cfg_obj_t *obj;
+	const char *str;
 	isc_result_t result;
 
 	sa = cfg_obj_assockaddr(cfg_map_getname(cpeer));
@@ -664,10 +663,10 @@ configure_peer(cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
 }
 
 static isc_result_t
-disable_algorithms(cfg_obj_t *disabled, dns_resolver_t *resolver) {
+disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
 	isc_result_t result;
-	cfg_obj_t *algorithms;
-	cfg_listelt_t *element;
+	const cfg_obj_t *algorithms;
+	const cfg_listelt_t *element;
 	const char *str;
 	dns_fixedname_t fixed;
 	dns_name_t *name;
@@ -688,7 +687,7 @@ disable_algorithms(cfg_obj_t *disabled, dns_resolver_t *resolver) {
 		isc_textregion_t r;
 		dns_secalg_t alg;
 
-		r.base = cfg_obj_asstring(cfg_listelt_value(element));
+		DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base);
 		r.length = strlen(r.base);
 
 		result = dns_secalg_fromtext(&alg, &r);
@@ -717,21 +716,21 @@ disable_algorithms(cfg_obj_t *disabled, dns_resolver_t *resolver) {
  * global defaults in 'config' used exclusively.
  */
 static isc_result_t
-configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
-	       isc_mem_t *mctx, ns_aclconfctx_t *actx,
+configure_view(dns_view_t *view, const cfg_obj_t *config,
+	       const cfg_obj_t *vconfig, isc_mem_t *mctx, ns_aclconfctx_t *actx,
 	       isc_boolean_t need_hints)
 {
-	cfg_obj_t *maps[4];
-	cfg_obj_t *cfgmaps[3];
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *voptions = NULL;
-	cfg_obj_t *forwardtype;
-	cfg_obj_t *forwarders;
-	cfg_obj_t *alternates;
-	cfg_obj_t *zonelist;
-	cfg_obj_t *disabled;
-	cfg_obj_t *obj;
-	cfg_listelt_t *element;
+	const cfg_obj_t *maps[4];
+	const cfg_obj_t *cfgmaps[3];
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *voptions = NULL;
+	const cfg_obj_t *forwardtype;
+	const cfg_obj_t *forwarders;
+	const cfg_obj_t *alternates;
+	const cfg_obj_t *zonelist;
+	const cfg_obj_t *disabled;
+	const cfg_obj_t *obj;
+	const cfg_listelt_t *element;
 	in_port_t port;
 	dns_cache_t *cache = NULL;
 	isc_result_t result;
@@ -792,7 +791,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *zconfig = cfg_listelt_value(element);
+		const cfg_obj_t *zconfig = cfg_listelt_value(element);
 		CHECK(configure_zone(config, zconfig, vconfig, mctx, view,
 				     actx));
 	}
@@ -1018,8 +1017,8 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	 * Configure the view's peer list.
 	 */
 	{
-		cfg_obj_t *peers = NULL;
-		cfg_listelt_t *element;
+		const cfg_obj_t *peers = NULL;
+		const cfg_listelt_t *element;
 		dns_peerlist_t *newpeers = NULL;
 
 		(void)ns_config_get(cfgmaps, "server", &peers);
@@ -1028,7 +1027,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 		     element != NULL;
 		     element = cfg_list_next(element))
 		{
-			cfg_obj_t *cpeer = cfg_listelt_value(element);
+			const cfg_obj_t *cpeer = cfg_listelt_value(element);
 			dns_peer_t *peer;
 
 			CHECK(configure_peer(cpeer, mctx, &peer));
@@ -1043,8 +1042,8 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	 *	Configure the views rrset-order.
 	 */
 	{
-		cfg_obj_t *rrsetorder = NULL;
-		cfg_listelt_t *element;
+		const cfg_obj_t *rrsetorder = NULL;
+		const cfg_listelt_t *element;
 
 		(void)ns_config_get(maps, "rrset-order", &rrsetorder);
 		CHECK(dns_order_create(mctx, &order));
@@ -1052,7 +1051,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 		     element != NULL;
 		     element = cfg_list_next(element))
 		{
-			cfg_obj_t *ent = cfg_listelt_value(element);
+			const cfg_obj_t *ent = cfg_listelt_value(element);
 
 			CHECK(configure_order(order, ent));
 		}
@@ -1078,7 +1077,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	 * Configure the "match-recursive-only" option.
 	 */
 	obj = NULL;
-	(void) ns_config_get(maps, "match-recursive-only", &obj);
+	(void)ns_config_get(maps, "match-recursive-only", &obj);
 	if (obj != NULL && cfg_obj_asboolean(obj))
 		view->matchrecursiveonly = ISC_TRUE;
 	else
@@ -1275,8 +1274,8 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 			dns_fixedname_t fixed;
 			dns_name_t *name;
 			isc_buffer_t b;
-			char *str;
-			cfg_obj_t *exclude;
+			const char *str;
+			const cfg_obj_t *exclude;
 
 			dns_fixedname_init(&fixed);
 			name = dns_fixedname_name(&fixed);
@@ -1330,12 +1329,12 @@ configure_hints(dns_view_t *view, const char *filename) {
 }
 
 static isc_result_t
-configure_alternates(cfg_obj_t *config, dns_view_t *view,
-		     cfg_obj_t *alternates)
+configure_alternates(const cfg_obj_t *config, dns_view_t *view,
+		     const cfg_obj_t *alternates)
 {
-	cfg_obj_t *portobj;
-	cfg_obj_t *addresses;
-	cfg_listelt_t *element;
+	const cfg_obj_t *portobj;
+	const cfg_obj_t *addresses;
+	const cfg_listelt_t *element;
 	isc_result_t result = ISC_R_SUCCESS;
 	in_port_t port;
 
@@ -1368,14 +1367,14 @@ configure_alternates(cfg_obj_t *config, dns_view_t *view,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *alternate = cfg_listelt_value(element);
+		const cfg_obj_t *alternate = cfg_listelt_value(element);
 		isc_sockaddr_t sa;
 
 		if (!cfg_obj_issockaddr(alternate)) {
 			dns_fixedname_t fixed;
 			dns_name_t *name;
-			char *str = cfg_obj_asstring(cfg_tuple_get(alternate,
-								   "name"));
+			const char *str = cfg_obj_asstring(cfg_tuple_get(
+							   alternate, "name"));
 			isc_buffer_t buffer;
 			in_port_t myport = port;
 
@@ -1415,12 +1414,12 @@ configure_alternates(cfg_obj_t *config, dns_view_t *view,
 }
 
 static isc_result_t
-configure_forward(cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
-		  cfg_obj_t *forwarders, cfg_obj_t *forwardtype)
+configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
+		  const cfg_obj_t *forwarders, const cfg_obj_t *forwardtype)
 {
-	cfg_obj_t *portobj;
-	cfg_obj_t *faddresses;
-	cfg_listelt_t *element;
+	const cfg_obj_t *portobj;
+	const cfg_obj_t *faddresses;
+	const cfg_listelt_t *element;
 	dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none;
 	isc_sockaddrlist_t addresses;
 	isc_sockaddr_t *sa;
@@ -1458,7 +1457,7 @@ configure_forward(cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *forwarder = cfg_listelt_value(element);
+		const cfg_obj_t *forwarder = cfg_listelt_value(element);
 		sa = isc_mem_get(view->mctx, sizeof(isc_sockaddr_t));
 		if (sa == NULL) {
 			result = ISC_R_NOMEMORY;
@@ -1481,7 +1480,7 @@ configure_forward(cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
 		if (forwardtype == NULL)
 			fwdpolicy = dns_fwdpolicy_first;
 		else {
-			char *forwardstr = cfg_obj_asstring(forwardtype);
+			const char *forwardstr = cfg_obj_asstring(forwardtype);
 			if (strcasecmp(forwardstr, "first") == 0)
 				fwdpolicy = dns_fwdpolicy_first;
 			else if (strcasecmp(forwardstr, "only") == 0)
@@ -1523,14 +1522,16 @@ configure_forward(cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
  * The view created is attached to '*viewp'.
  */
 static isc_result_t
-create_view(cfg_obj_t *vconfig, dns_viewlist_t *viewlist, dns_view_t **viewp) {
+create_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist,
+	    dns_view_t **viewp)
+{
 	isc_result_t result;
 	const char *viewname;
 	dns_rdataclass_t viewclass;
 	dns_view_t *view = NULL;
 
 	if (vconfig != NULL) {
-		cfg_obj_t *classobj = NULL;
+		const cfg_obj_t *classobj = NULL;
 
 		viewname = cfg_obj_asstring(cfg_tuple_get(vconfig, "name"));
 		classobj = cfg_tuple_get(vconfig, "class");
@@ -1560,19 +1561,19 @@ create_view(cfg_obj_t *vconfig, dns_viewlist_t *viewlist, dns_view_t **viewp) {
  * Configure or reconfigure a zone.
  */
 static isc_result_t
-configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
-	       isc_mem_t *mctx, dns_view_t *view,
+configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
+	       const cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view,
 	       ns_aclconfctx_t *aclconf)
 {
 	dns_view_t *pview = NULL;	/* Production view */
 	dns_zone_t *zone = NULL;	/* New or reused zone */
 	dns_zone_t *dupzone = NULL;
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *zoptions = NULL;
-	cfg_obj_t *typeobj = NULL;
-	cfg_obj_t *forwarders = NULL;
-	cfg_obj_t *forwardtype = NULL;
-	cfg_obj_t *only = NULL;
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *zoptions = NULL;
+	const cfg_obj_t *typeobj = NULL;
+	const cfg_obj_t *forwarders = NULL;
+	const cfg_obj_t *forwardtype = NULL;
+	const cfg_obj_t *only = NULL;
 	isc_result_t result;
 	isc_result_t tresult;
 	isc_buffer_t buffer;
@@ -1629,7 +1630,7 @@ configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
 	 * configure it and return.
 	 */
 	if (strcasecmp(ztypestr, "hint") == 0) {
-		cfg_obj_t *fileobj = NULL;
+		const cfg_obj_t *fileobj = NULL;
 		if (cfg_map_get(zoptions, "file", &fileobj) != ISC_R_SUCCESS) {
 			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 				      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
@@ -1639,7 +1640,7 @@ configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
 			goto cleanup;
 		}
 		if (dns_name_equal(origin, dns_rootname)) {
-			char *hintsfile = cfg_obj_asstring(fileobj);
+			const char *hintsfile = cfg_obj_asstring(fileobj);
 
 			result = configure_hints(view, hintsfile);
 			if (result != ISC_R_SUCCESS) {
@@ -1795,9 +1796,10 @@ configure_zone(cfg_obj_t *config, cfg_obj_t *zconfig, cfg_obj_t *vconfig,
  * Configure a single server quota.
  */
 static void
-configure_server_quota(cfg_obj_t **maps, const char *name, isc_quota_t *quota)
+configure_server_quota(const cfg_obj_t **maps, const char *name,
+		       isc_quota_t *quota)
 {
-	cfg_obj_t *obj = NULL;
+	const cfg_obj_t *obj = NULL;
 	isc_result_t result;
 
 	result = ns_config_get(maps, name, &obj);
@@ -1810,9 +1812,9 @@ configure_server_quota(cfg_obj_t **maps, const char *name, isc_quota_t *quota)
  * parsed.  This can be extended to support other options if necessary.
  */
 static isc_result_t
-directory_callback(const char *clausename, cfg_obj_t *obj, void *arg) {
+directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) {
 	isc_result_t result;
-	char *directory;
+	const char *directory;
 
 	REQUIRE(strcasecmp("directory", clausename) == 0);
 
@@ -1891,8 +1893,7 @@ add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr) {
 
  clean:
 	INSIST(lelt == NULL);
-	if (src_acl != NULL)
-		dns_acl_detach(&src_acl);
+	dns_acl_detach(&src_acl);
 
 	return (result);
 }
@@ -2049,7 +2050,7 @@ setstring(ns_server_t *server, char **field, const char *value) {
  * or NULL if whether 'obj' is a string or void value, respectively.
  */
 static isc_result_t
-setoptstring(ns_server_t *server, char **field, cfg_obj_t *obj) {
+setoptstring(ns_server_t *server, char **field, const cfg_obj_t *obj) {
 	if (cfg_obj_isvoid(obj))
 		return (setstring(server, field, NULL));
 	else
@@ -2057,11 +2058,12 @@ setoptstring(ns_server_t *server, char **field, cfg_obj_t *obj) {
 }
 
 static void
-set_limit(cfg_obj_t **maps, const char *configname, const char *description,
-	  isc_resource_t resourceid, isc_resourcevalue_t defaultvalue)
+set_limit(const cfg_obj_t **maps, const char *configname,
+	  const char *description, isc_resource_t resourceid,
+	  isc_resourcevalue_t defaultvalue)
 {
-	cfg_obj_t *obj = NULL;
-	char *resource;
+	const cfg_obj_t *obj = NULL;
+	const char *resource;
 	isc_resourcevalue_t value;
 	isc_result_t result;
 
@@ -2092,7 +2094,7 @@ set_limit(cfg_obj_t **maps, const char *configname, const char *description,
 		  ns_g_init ## resource)
 
 static void
-set_limits(cfg_obj_t **maps) {
+set_limits(const cfg_obj_t **maps) {
 	SETLIMIT("stacksize", stacksize, "stack size");
 	SETLIMIT("datasize", datasize, "data size");
 	SETLIMIT("coresize", coresize, "core size");
@@ -2101,15 +2103,15 @@ set_limits(cfg_obj_t **maps) {
 
 static isc_result_t
 portlist_fromconf(dns_portlist_t *portlist, unsigned int family,
-		  cfg_obj_t *ports)
+		  const cfg_obj_t *ports)
 {
-	cfg_listelt_t *element;
+	const cfg_listelt_t *element;
 	isc_result_t result = ISC_R_SUCCESS;
 
 	for (element = cfg_list_first(ports);
 	     element != NULL;
 	     element = cfg_list_next(element)) {
-		cfg_obj_t *obj = cfg_listelt_value(element);
+		const cfg_obj_t *obj = cfg_listelt_value(element);
 		in_port_t port = (in_port_t)cfg_obj_asuint32(obj);
 		
 		result = dns_portlist_add(portlist, family, port);
@@ -2126,13 +2128,13 @@ load_configuration(const char *filename, ns_server_t *server,
 	isc_result_t result;
 	cfg_parser_t *parser = NULL;
 	cfg_obj_t *config;
-	cfg_obj_t *options;
-	cfg_obj_t *views;
-	cfg_obj_t *obj;
-	cfg_obj_t *v4ports, *v6ports;
-	cfg_obj_t *maps[3];
-	cfg_obj_t *builtin_views;
-	cfg_listelt_t *element;
+	const cfg_obj_t *options;
+	const cfg_obj_t *views;
+	const cfg_obj_t *obj;
+	const cfg_obj_t *v4ports, *v6ports;
+	const cfg_obj_t *maps[3];
+	const cfg_obj_t *builtin_views;
+	const cfg_listelt_t *element;
 	dns_view_t *view = NULL;
 	dns_view_t *view_next;
 	dns_viewlist_t viewlist;
@@ -2319,7 +2321,7 @@ load_configuration(const char *filename, ns_server_t *server,
 	 * statement.
 	 */
 	{
-		cfg_obj_t *clistenon = NULL;
+		const cfg_obj_t *clistenon = NULL;
 		ns_listenlist_t *listenon = NULL;
 
 		clistenon = NULL;
@@ -2353,7 +2355,7 @@ load_configuration(const char *filename, ns_server_t *server,
 	 * Ditto for IPv6.
 	 */
 	{
-		cfg_obj_t *clistenon = NULL;
+		const cfg_obj_t *clistenon = NULL;
 		ns_listenlist_t *listenon = NULL;
 
 		if (options != NULL)
@@ -2438,7 +2440,7 @@ load_configuration(const char *filename, ns_server_t *server,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *vconfig = cfg_listelt_value(element);
+		const cfg_obj_t *vconfig = cfg_listelt_value(element);
 		view = NULL;
 
 		CHECK(create_view(vconfig, &viewlist, &view));
@@ -2478,7 +2480,7 @@ load_configuration(const char *filename, ns_server_t *server,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *vconfig = cfg_listelt_value(element);
+		const cfg_obj_t *vconfig = cfg_listelt_value(element);
 		CHECK(create_view(vconfig, &viewlist, &view));
 		CHECK(configure_view(view, config, vconfig, ns_g_mctx,
 				     &aclconfctx, ISC_FALSE));
@@ -2582,7 +2584,7 @@ load_configuration(const char *filename, ns_server_t *server,
 			      "ignoring config file logging "
 			      "statement due to -g option");
 	} else {
-		cfg_obj_t *logobj = NULL;
+		const cfg_obj_t *logobj = NULL;
 		isc_logconfig_t *logc = NULL;
 
 		CHECKM(isc_logconfig_create(ns_g_lctx, &logc),
@@ -2621,8 +2623,8 @@ load_configuration(const char *filename, ns_server_t *server,
 	 * compatibility.
 	 */
 	if (first_time) {
-		cfg_obj_t *logobj = NULL;
-		cfg_obj_t *categories = NULL;
+		const cfg_obj_t *logobj = NULL;
+		const cfg_obj_t *categories = NULL;
 
 		obj = NULL;
 		if (ns_config_get(maps, "querylog", &obj) == ISC_R_SUCCESS) {
@@ -2634,13 +2636,13 @@ load_configuration(const char *filename, ns_server_t *server,
 				(void)cfg_map_get(logobj, "category",
 						  &categories);
 			if (categories != NULL) {
-				cfg_listelt_t *element;
+				const cfg_listelt_t *element;
 				for (element = cfg_list_first(categories);
 				     element != NULL;
 				     element = cfg_list_next(element))
 				{
-					cfg_obj_t *catobj;
-					char *str;
+					const cfg_obj_t *catobj;
+					const char *str;
 
 					obj = cfg_listelt_value(element);
 					catobj = cfg_tuple_get(obj, "name");
@@ -3133,7 +3135,7 @@ end_reserved_dispatches(ns_server_t *server, isc_boolean_t all) {
 }
 
 void
-ns_add_reserved_dispatch(ns_server_t *server, isc_sockaddr_t *addr) {
+ns_add_reserved_dispatch(ns_server_t *server, const isc_sockaddr_t *addr) {
 	ns_dispatch_t *dispatch;
 	in_port_t port;
 	char addrbuf[ISC_SOCKADDR_FORMATSIZE];
@@ -3458,20 +3460,29 @@ isc_result_t
 ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
 	isc_result_t result;
 	dns_zone_t *zone = NULL;
-	const unsigned char msg[] = "zone refresh queued";
+	const unsigned char msg1[] = "zone refresh queued";
+	const unsigned char msg2[] = "not a slave or stub zone";
+	dns_zonetype_t type;
 
 	result = zone_from_args(server, args, &zone);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	if (zone == NULL)
 		return (ISC_R_UNEXPECTEDEND);
-	
-	dns_zone_refresh(zone);
-	dns_zone_detach(&zone);
-	if (sizeof(msg) <= isc_buffer_availablelength(text))
-		isc_buffer_putmem(text, msg, sizeof(msg));
 
-	return (ISC_R_SUCCESS);
+	type = dns_zone_gettype(zone);
+	if (type == dns_zone_slave || type == dns_zone_stub) {
+		dns_zone_refresh(zone);
+		dns_zone_detach(&zone);
+		if (sizeof(msg1) <= isc_buffer_availablelength(text))
+			isc_buffer_putmem(text, msg1, sizeof(msg1));
+		return (ISC_R_SUCCESS);
+	}
+		
+	dns_zone_detach(&zone);
+	if (sizeof(msg2) <= isc_buffer_availablelength(text))
+		isc_buffer_putmem(text, msg2, sizeof(msg2));
+	return (ISC_R_FAILURE);
 }	
 
 isc_result_t
@@ -3486,12 +3497,12 @@ ns_server_togglequerylog(ns_server_t *server) {
 }
 
 static isc_result_t
-ns_listenlist_fromconfig(cfg_obj_t *listenlist, cfg_obj_t *config,
+ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config,
 			 ns_aclconfctx_t *actx,
 			 isc_mem_t *mctx, ns_listenlist_t **target)
 {
 	isc_result_t result;
-	cfg_listelt_t *element;
+	const cfg_listelt_t *element;
 	ns_listenlist_t *dlist = NULL;
 
 	REQUIRE(target != NULL && *target == NULL);
@@ -3505,7 +3516,7 @@ ns_listenlist_fromconfig(cfg_obj_t *listenlist, cfg_obj_t *config,
 	     element = cfg_list_next(element))
 	{
 		ns_listenelt_t *delt = NULL;
-		cfg_obj_t *listener = cfg_listelt_value(element);
+		const cfg_obj_t *listener = cfg_listelt_value(element);
 		result = ns_listenelt_fromconfig(listener, config, actx,
 						 mctx, &delt);
 		if (result != ISC_R_SUCCESS)
@@ -3525,12 +3536,12 @@ ns_listenlist_fromconfig(cfg_obj_t *listenlist, cfg_obj_t *config,
  * data structure.
  */
 static isc_result_t
-ns_listenelt_fromconfig(cfg_obj_t *listener, cfg_obj_t *config,
+ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config,
 			ns_aclconfctx_t *actx,
 			isc_mem_t *mctx, ns_listenelt_t **target)
 {
 	isc_result_t result;
-	cfg_obj_t *portobj;
+	const cfg_obj_t *portobj;
 	in_port_t port;
 	ns_listenelt_t *delt = NULL;
 	REQUIRE(target != NULL && *target == NULL);
@@ -3823,6 +3834,11 @@ ns_server_dumpdb(ns_server_t *server, char *args) {
 	char *ptr;
 	const char *sep;
 
+	/* Skip the command name. */
+	ptr = next_token(&args, " \t");
+	if (ptr == NULL)
+		return (ISC_R_UNEXPECTEDEND);
+
 	dctx = isc_mem_get(server->mctx, sizeof(*dctx));
 	if (dctx == NULL)
 		return (ISC_R_NOMEMORY);
@@ -3845,11 +3861,6 @@ ns_server_dumpdb(ns_server_t *server, char *args) {
 	CHECKMF(isc_stdio_open(server->dumpfile, "w", &dctx->fp),
 		"could not open dump file", server->dumpfile);
 
-	/* Skip the command name. */
-	ptr = next_token(&args, " \t");
-	if (ptr == NULL)
-		return (ISC_R_UNEXPECTEDEND);
-
 	sep = (args == NULL) ? "" : ": ";
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 		      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
diff --git a/bin/named/sortlist.c b/bin/named/sortlist.c
index 0098fe77..0feba3bb 100644
--- a/bin/named/sortlist.c
+++ b/bin/named/sortlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.c,v 1.5.12.4 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: sortlist.c,v 1.5.12.6 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -30,7 +30,9 @@
 #include <named/sortlist.h>
 
 ns_sortlisttype_t
-ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp) {
+ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr,
+		  const void **argp)
+{
 	unsigned int i;
 
 	if (acl == NULL)
@@ -44,7 +46,7 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp) {
 		dns_aclelement_t *e = &acl->elements[i];
 		dns_aclelement_t *try_elt;
 		dns_aclelement_t *order_elt = NULL;
-		dns_aclelement_t *matched_elt = NULL;
+		const dns_aclelement_t *matched_elt = NULL;
 
 		if (e->type == dns_aclelementtype_nestedacl) {
 			dns_acl_t *inner = e->u.nestedacl;
@@ -106,8 +108,8 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp) {
 }
 
 int
-ns_sortlist_addrorder2(isc_netaddr_t *addr, void *arg) {
-	dns_acl_t *sortacl = (dns_acl_t *) arg;
+ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) {
+	const dns_acl_t *sortacl = (const dns_acl_t *) arg;
 	int match;
 
 	(void)dns_acl_match(addr, NULL, sortacl,
@@ -122,8 +124,8 @@ ns_sortlist_addrorder2(isc_netaddr_t *addr, void *arg) {
 }
 
 int
-ns_sortlist_addrorder1(isc_netaddr_t *addr, void *arg) {
-	dns_aclelement_t *matchelt = (dns_aclelement_t *) arg;
+ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) {
+	const dns_aclelement_t *matchelt = (const dns_aclelement_t *) arg;
 	if (dns_aclelement_match(addr, NULL, matchelt,
 				 &ns_g_server->aclenv,
 				 NULL)) {
@@ -136,7 +138,7 @@ ns_sortlist_addrorder1(isc_netaddr_t *addr, void *arg) {
 void
 ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr,
 		       dns_addressorderfunc_t *orderp,
-		       void **argp)
+		       const void **argp)
 {
 	ns_sortlisttype_t sortlisttype;
 
diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index 7fc13f3d..f23c1dba 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.c,v 1.19.208.2 2004/06/11 00:30:51 marka Exp $ */
+/* $Id: tkeyconf.c,v 1.19.208.4 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -42,17 +42,17 @@
 
 
 isc_result_t
-ns_tkeyctx_fromconfig(cfg_obj_t *options, isc_mem_t *mctx, isc_entropy_t *ectx,
-		       dns_tkeyctx_t **tctxp)
+ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
+		      isc_entropy_t *ectx, dns_tkeyctx_t **tctxp)
 {
 	isc_result_t result;
 	dns_tkeyctx_t *tctx = NULL;
-	char *s;
+	const char *s;
 	isc_uint32_t n;
 	dns_fixedname_t fname;
 	dns_name_t *name;
 	isc_buffer_t b;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 	int type;
 
 	result = dns_tkeyctx_create(mctx, ectx, &tctx);
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 38524c37..a90438d8 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.c,v 1.21.208.4 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: tsigconf.c,v 1.21.208.6 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -35,10 +35,12 @@
 #include <named/tsigconf.h>
 
 static isc_result_t
-add_initial_keys(cfg_obj_t *list, dns_tsig_keyring_t *ring, isc_mem_t *mctx) {
-	cfg_listelt_t *element;
-	cfg_obj_t *key = NULL;
-	char *keyid = NULL;
+add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring,
+		 isc_mem_t *mctx)
+{
+	const cfg_listelt_t *element;
+	const cfg_obj_t *key = NULL;
+	const char *keyid = NULL;
 	unsigned char *secret = NULL;
 	int secretalloc = 0;
 	int secretlen = 0;
@@ -49,14 +51,14 @@ add_initial_keys(cfg_obj_t *list, dns_tsig_keyring_t *ring, isc_mem_t *mctx) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *algobj = NULL;
-		cfg_obj_t *secretobj = NULL;
+		const cfg_obj_t *algobj = NULL;
+		const cfg_obj_t *secretobj = NULL;
 		dns_name_t keyname;
 		dns_name_t *alg;
-		char *algstr;
+		const char *algstr;
 		char keynamedata[1024];
 		isc_buffer_t keynamesrc, keynamebuf;
-		char *secretstr;
+		const char *secretstr;
 		isc_buffer_t secretbuf;
 
 		key = cfg_listelt_value(element);
@@ -129,11 +131,11 @@ add_initial_keys(cfg_obj_t *list, dns_tsig_keyring_t *ring, isc_mem_t *mctx) {
 }
 
 isc_result_t
-ns_tsigkeyring_fromconfig(cfg_obj_t *config, cfg_obj_t *vconfig,
+ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 			  isc_mem_t *mctx, dns_tsig_keyring_t **ringp)
 {
-	cfg_obj_t *maps[3];
-	cfg_obj_t *keylist;
+	const cfg_obj_t *maps[3];
+	const cfg_obj_t *keylist;
 	dns_tsig_keyring_t *ring = NULL;
 	isc_result_t result;
 	int i;
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index f306f146..361d1b63 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.46.2.4.8.22 2005/05/20 01:37:19 marka Exp $ */
+/* $Id: os.c,v 1.46.2.4.8.24 2006/02/03 23:51:37 marka Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
@@ -497,6 +497,13 @@ ns_os_changeuser(void) {
 #if defined(HAVE_LINUX_CAPABILITY_H) && !defined(HAVE_LINUXTHREADS)
 	linux_minprivs();
 #endif
+#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_DUMPABLE)
+	/*
+	 * Restore the ability of named to drop core after the setuid()
+	 * call has disabled it.
+	 */
+	prctl(PR_SET_DUMPABLE,1,0,0,0);
+#endif
 }
 
 void
diff --git a/bin/named/update.c b/bin/named/update.c
index 6c2d7597..fa0ddb01 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.88.2.5.2.27 2005/10/08 00:21:06 marka Exp $ */
+/* $Id: update.c,v 1.88.2.5.2.29 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -36,6 +36,7 @@
 #include <dns/rdataclass.h>
 #include <dns/rdataset.h>
 #include <dns/rdatasetiter.h>
+#include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
 #include <dns/soa.h>
 #include <dns/ssu.h>
@@ -1517,7 +1518,8 @@ next_active(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
  */
 static isc_result_t
 add_nsec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
-	dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
+	 dns_dbversion_t *ver, dns_name_t *name, dns_ttl_t nsecttl,
+	 dns_diff_t *diff)
 {
 	isc_result_t result;
 	dns_dbnode_t *node = NULL;
@@ -1552,8 +1554,7 @@ add_nsec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 	 * Add the new NSEC and record the change.
 	 */
 	CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_ADD, name,
-				   3600,	/* XXXRTH */
-				   &rdata, &tuple));
+				   nsecttl, &rdata, &tuple));
 	CHECK(do_one_tuple(&tuple, db, ver, diff));
 	INSIST(tuple == NULL);
 
@@ -1678,6 +1679,11 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 	unsigned int nkeys = 0;
 	unsigned int i;
 	isc_stdtime_t now, inception, expire;
+	dns_ttl_t nsecttl;
+	dns_rdata_soa_t soa;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	dns_rdataset_t rdataset;
+	dns_dbnode_t *node = NULL;
 
 	dns_diff_init(client->mctx, &diffnames);
 	dns_diff_init(client->mctx, &affected);
@@ -1699,6 +1705,20 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 	expire = now + sigvalidityinterval;
 
 	/*
+	 * Get the NSEC's TTL from the SOA MINIMUM field.
+	 */
+	CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node));
+	dns_rdataset_init(&rdataset);
+	CHECK(dns_db_findrdataset(db, node, newver, dns_rdatatype_soa, 0,
+                                  (isc_stdtime_t) 0, &rdataset, NULL));
+	CHECK(dns_rdataset_first(&rdataset));
+	dns_rdataset_current(&rdataset, &rdata);
+	CHECK(dns_rdata_tostruct(&rdata, &soa, NULL));
+	nsecttl = soa.minimum;
+	dns_rdataset_disassociate(&rdataset);
+	dns_db_detachnode(db, &node);
+
+	/*
 	 * Find all RRsets directly affected by the update, and
 	 * update their RRSIGs.  Also build a list of names affected
 	 * by the update in "diffnames".
@@ -1901,8 +1921,8 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 			 * there is other data, and if there is other data,
 			 * there are other RRSIGs.
 			 */
-			CHECK(add_nsec(client, zone, db, newver,
-				      &t->name, &nsec_diff));
+			CHECK(add_nsec(client, zone, db, newver, &t->name,
+				       nsecttl, &nsec_diff));
 		}
 	}
 
diff --git a/bin/named/win32/named.dsp b/bin/named/win32/named.dsp
index 8125b66e..454b1eda 100644
--- a/bin/named/win32/named.dsp
+++ b/bin/named/win32/named.dsp
@@ -1,327 +1,327 @@
-# Microsoft Developer Studio Project File - Name="named" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=named - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "named.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named.exe"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /map /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "named - Win32 Release"

-# Name "named - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\aclconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\builtin.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\client.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\config.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\control.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\controlconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\interfacemgr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\listenlist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\log.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\logconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwaddr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwdclient.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwderror.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwdgabn.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwdgnba.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwdgrbn.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwdnoop.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwresd.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwsearch.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\main.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\notify.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ntservice.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\os.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\query.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\server.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\sortlist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\tkeyconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\tsigconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\update.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\xfrout.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\zoneconf.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\named\aclconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\client.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\config.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\globals.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\interfacemgr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\listenlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\log.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\logconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\lwaddr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\lwdclient.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\lwresd.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\lwsearch.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\main.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\notify.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\named\ntservice.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\omapi.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\named\os.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\query.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\server.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\sortlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\tkeyconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\tsigconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\update.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\xfrout.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\named\zoneconf.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="named" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=named - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "named.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named.exe"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /map /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "named - Win32 Release"
+# Name "named - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\aclconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\builtin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\client.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\control.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\controlconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\interfacemgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\listenlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\logconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwdclient.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwderror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwdgabn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwdgnba.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwdgrbn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwdnoop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwresd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwsearch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\notify.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ntservice.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\query.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\server.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sortlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\tkeyconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\tsigconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\update.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\xfrout.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\zoneconf.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\named\aclconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\client.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\interfacemgr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\listenlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\logconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\lwaddr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\lwdclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\lwresd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\lwsearch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\main.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\notify.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\named\ntservice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\omapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\named\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\query.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\server.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\sortlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\tkeyconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\tsigconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\update.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\xfrout.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\named\zoneconf.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/named/win32/named.dsw b/bin/named/win32/named.dsw
index c2913efc..a1a4f340 100644
--- a/bin/named/win32/named.dsw
+++ b/bin/named/win32/named.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "named"=".\named.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "named"=".\named.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/named/win32/named.mak b/bin/named/win32/named.mak
index 1c2721c5..d32c8720 100644
--- a/bin/named/win32/named.mak
+++ b/bin/named/win32/named.mak
@@ -1,1077 +1,1077 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on named.dsp

-!IF "$(CFG)" == ""

-CFG=named - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to named - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "named - Win32 Release" && "$(CFG)" != "named - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\named.exe"

-

-!ELSE 

-

-ALL : "libisccfg - Win32 Release" "libisccc - Win32 Release" "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\aclconf.obj"

-	-@erase "$(INTDIR)\builtin.obj"

-	-@erase "$(INTDIR)\client.obj"

-	-@erase "$(INTDIR)\config.obj"

-	-@erase "$(INTDIR)\control.obj"

-	-@erase "$(INTDIR)\controlconf.obj"

-	-@erase "$(INTDIR)\interfacemgr.obj"

-	-@erase "$(INTDIR)\listenlist.obj"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\logconf.obj"

-	-@erase "$(INTDIR)\lwaddr.obj"

-	-@erase "$(INTDIR)\lwdclient.obj"

-	-@erase "$(INTDIR)\lwderror.obj"

-	-@erase "$(INTDIR)\lwdgabn.obj"

-	-@erase "$(INTDIR)\lwdgnba.obj"

-	-@erase "$(INTDIR)\lwdgrbn.obj"

-	-@erase "$(INTDIR)\lwdnoop.obj"

-	-@erase "$(INTDIR)\lwresd.obj"

-	-@erase "$(INTDIR)\lwsearch.obj"

-	-@erase "$(INTDIR)\main.obj"

-	-@erase "$(INTDIR)\notify.obj"

-	-@erase "$(INTDIR)\ntservice.obj"

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\query.obj"

-	-@erase "$(INTDIR)\server.obj"

-	-@erase "$(INTDIR)\sortlist.obj"

-	-@erase "$(INTDIR)\tkeyconf.obj"

-	-@erase "$(INTDIR)\tsigconf.obj"

-	-@erase "$(INTDIR)\update.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\xfrout.obj"

-	-@erase "$(INTDIR)\zoneconf.obj"

-	-@erase "..\..\..\Build\Release\named.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named.pdb" /machine:I386 /out:"../../../Build/Release/named.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\aclconf.obj" \

-	"$(INTDIR)\client.obj" \

-	"$(INTDIR)\config.obj" \

-	"$(INTDIR)\control.obj" \

-	"$(INTDIR)\controlconf.obj" \

-	"$(INTDIR)\interfacemgr.obj" \

-	"$(INTDIR)\listenlist.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\logconf.obj" \

-	"$(INTDIR)\lwaddr.obj" \

-	"$(INTDIR)\lwdclient.obj" \

-	"$(INTDIR)\lwderror.obj" \

-	"$(INTDIR)\lwdgabn.obj" \

-	"$(INTDIR)\lwdgnba.obj" \

-	"$(INTDIR)\lwdgrbn.obj" \

-	"$(INTDIR)\lwdnoop.obj" \

-	"$(INTDIR)\lwresd.obj" \

-	"$(INTDIR)\lwsearch.obj" \

-	"$(INTDIR)\main.obj" \

-	"$(INTDIR)\notify.obj" \

-	"$(INTDIR)\ntservice.obj" \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\query.obj" \

-	"$(INTDIR)\server.obj" \

-	"$(INTDIR)\sortlist.obj" \

-	"$(INTDIR)\tkeyconf.obj" \

-	"$(INTDIR)\tsigconf.obj" \

-	"$(INTDIR)\update.obj" \

-	"$(INTDIR)\xfrout.obj" \

-	"$(INTDIR)\zoneconf.obj" \

-	"$(INTDIR)\builtin.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Release\liblwres.lib" \

-	"..\..\..\lib\isccc\win32\Release\libisccc.lib" \

-	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib"

-

-"..\..\..\Build\Release\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"

-

-!ELSE 

-

-ALL : "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\aclconf.obj"

-	-@erase "$(INTDIR)\aclconf.sbr"

-	-@erase "$(INTDIR)\builtin.obj"

-	-@erase "$(INTDIR)\builtin.sbr"

-	-@erase "$(INTDIR)\client.obj"

-	-@erase "$(INTDIR)\client.sbr"

-	-@erase "$(INTDIR)\config.obj"

-	-@erase "$(INTDIR)\config.sbr"

-	-@erase "$(INTDIR)\control.obj"

-	-@erase "$(INTDIR)\control.sbr"

-	-@erase "$(INTDIR)\controlconf.obj"

-	-@erase "$(INTDIR)\controlconf.sbr"

-	-@erase "$(INTDIR)\interfacemgr.obj"

-	-@erase "$(INTDIR)\interfacemgr.sbr"

-	-@erase "$(INTDIR)\listenlist.obj"

-	-@erase "$(INTDIR)\listenlist.sbr"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\log.sbr"

-	-@erase "$(INTDIR)\logconf.obj"

-	-@erase "$(INTDIR)\logconf.sbr"

-	-@erase "$(INTDIR)\lwaddr.obj"

-	-@erase "$(INTDIR)\lwaddr.sbr"

-	-@erase "$(INTDIR)\lwdclient.obj"

-	-@erase "$(INTDIR)\lwdclient.sbr"

-	-@erase "$(INTDIR)\lwderror.obj"

-	-@erase "$(INTDIR)\lwderror.sbr"

-	-@erase "$(INTDIR)\lwdgabn.obj"

-	-@erase "$(INTDIR)\lwdgabn.sbr"

-	-@erase "$(INTDIR)\lwdgnba.obj"

-	-@erase "$(INTDIR)\lwdgnba.sbr"

-	-@erase "$(INTDIR)\lwdgrbn.obj"

-	-@erase "$(INTDIR)\lwdgrbn.sbr"

-	-@erase "$(INTDIR)\lwdnoop.obj"

-	-@erase "$(INTDIR)\lwdnoop.sbr"

-	-@erase "$(INTDIR)\lwresd.obj"

-	-@erase "$(INTDIR)\lwresd.sbr"

-	-@erase "$(INTDIR)\lwsearch.obj"

-	-@erase "$(INTDIR)\lwsearch.sbr"

-	-@erase "$(INTDIR)\main.obj"

-	-@erase "$(INTDIR)\main.sbr"

-	-@erase "$(INTDIR)\notify.obj"

-	-@erase "$(INTDIR)\notify.sbr"

-	-@erase "$(INTDIR)\ntservice.obj"

-	-@erase "$(INTDIR)\ntservice.sbr"

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\os.sbr"

-	-@erase "$(INTDIR)\query.obj"

-	-@erase "$(INTDIR)\query.sbr"

-	-@erase "$(INTDIR)\server.obj"

-	-@erase "$(INTDIR)\server.sbr"

-	-@erase "$(INTDIR)\sortlist.obj"

-	-@erase "$(INTDIR)\sortlist.sbr"

-	-@erase "$(INTDIR)\tkeyconf.obj"

-	-@erase "$(INTDIR)\tkeyconf.sbr"

-	-@erase "$(INTDIR)\tsigconf.obj"

-	-@erase "$(INTDIR)\tsigconf.sbr"

-	-@erase "$(INTDIR)\update.obj"

-	-@erase "$(INTDIR)\update.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\xfrout.obj"

-	-@erase "$(INTDIR)\xfrout.sbr"

-	-@erase "$(INTDIR)\zoneconf.obj"

-	-@erase "$(INTDIR)\zoneconf.sbr"

-	-@erase "$(OUTDIR)\named.bsc"

-	-@erase "$(OUTDIR)\named.map"

-	-@erase "$(OUTDIR)\named.pdb"

-	-@erase "..\..\..\Build\Debug\named.exe"

-	-@erase "..\..\..\Build\Debug\named.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\aclconf.sbr" \

-	"$(INTDIR)\client.sbr" \

-	"$(INTDIR)\config.sbr" \

-	"$(INTDIR)\control.sbr" \

-	"$(INTDIR)\controlconf.sbr" \

-	"$(INTDIR)\interfacemgr.sbr" \

-	"$(INTDIR)\listenlist.sbr" \

-	"$(INTDIR)\log.sbr" \

-	"$(INTDIR)\logconf.sbr" \

-	"$(INTDIR)\lwaddr.sbr" \

-	"$(INTDIR)\lwdclient.sbr" \

-	"$(INTDIR)\lwderror.sbr" \

-	"$(INTDIR)\lwdgabn.sbr" \

-	"$(INTDIR)\lwdgnba.sbr" \

-	"$(INTDIR)\lwdgrbn.sbr" \

-	"$(INTDIR)\lwdnoop.sbr" \

-	"$(INTDIR)\lwresd.sbr" \

-	"$(INTDIR)\lwsearch.sbr" \

-	"$(INTDIR)\main.sbr" \

-	"$(INTDIR)\notify.sbr" \

-	"$(INTDIR)\ntservice.sbr" \

-	"$(INTDIR)\os.sbr" \

-	"$(INTDIR)\query.sbr" \

-	"$(INTDIR)\server.sbr" \

-	"$(INTDIR)\sortlist.sbr" \

-	"$(INTDIR)\tkeyconf.sbr" \

-	"$(INTDIR)\tsigconf.sbr" \

-	"$(INTDIR)\update.sbr" \

-	"$(INTDIR)\xfrout.sbr" \

-	"$(INTDIR)\zoneconf.sbr" \

-	"$(INTDIR)\builtin.sbr"

-

-"$(OUTDIR)\named.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named.pdb" /map:"$(INTDIR)\named.map" /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\aclconf.obj" \

-	"$(INTDIR)\client.obj" \

-	"$(INTDIR)\config.obj" \

-	"$(INTDIR)\control.obj" \

-	"$(INTDIR)\controlconf.obj" \

-	"$(INTDIR)\interfacemgr.obj" \

-	"$(INTDIR)\listenlist.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\logconf.obj" \

-	"$(INTDIR)\lwaddr.obj" \

-	"$(INTDIR)\lwdclient.obj" \

-	"$(INTDIR)\lwderror.obj" \

-	"$(INTDIR)\lwdgabn.obj" \

-	"$(INTDIR)\lwdgnba.obj" \

-	"$(INTDIR)\lwdgrbn.obj" \

-	"$(INTDIR)\lwdnoop.obj" \

-	"$(INTDIR)\lwresd.obj" \

-	"$(INTDIR)\lwsearch.obj" \

-	"$(INTDIR)\main.obj" \

-	"$(INTDIR)\notify.obj" \

-	"$(INTDIR)\ntservice.obj" \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\query.obj" \

-	"$(INTDIR)\server.obj" \

-	"$(INTDIR)\sortlist.obj" \

-	"$(INTDIR)\tkeyconf.obj" \

-	"$(INTDIR)\tsigconf.obj" \

-	"$(INTDIR)\update.obj" \

-	"$(INTDIR)\xfrout.obj" \

-	"$(INTDIR)\zoneconf.obj" \

-	"$(INTDIR)\builtin.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \

-	"..\..\..\lib\lwres\win32\Debug\liblwres.lib" \

-	"..\..\..\lib\isccc\win32\Debug\libisccc.lib" \

-	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib"

-

-"..\..\..\Build\Debug\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("named.dep")

-!INCLUDE "named.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "named.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "named - Win32 Release" || "$(CFG)" == "named - Win32 Debug"

-SOURCE=..\aclconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\aclconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\aclconf.obj"	"$(INTDIR)\aclconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\builtin.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\builtin.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\builtin.obj"	"$(INTDIR)\builtin.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\client.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\client.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\client.obj"	"$(INTDIR)\client.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\config.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\config.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\config.obj"	"$(INTDIR)\config.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\control.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\control.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\control.obj"	"$(INTDIR)\control.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\controlconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\controlconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\controlconf.obj"	"$(INTDIR)\controlconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\interfacemgr.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\interfacemgr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\interfacemgr.obj"	"$(INTDIR)\interfacemgr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\listenlist.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\listenlist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\listenlist.obj"	"$(INTDIR)\listenlist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\log.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\logconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\logconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\logconf.obj"	"$(INTDIR)\logconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwaddr.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwaddr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwaddr.obj"	"$(INTDIR)\lwaddr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwdclient.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwdclient.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwdclient.obj"	"$(INTDIR)\lwdclient.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwderror.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwderror.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwderror.obj"	"$(INTDIR)\lwderror.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwdgabn.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwdgabn.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwdgabn.obj"	"$(INTDIR)\lwdgabn.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwdgnba.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwdgnba.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwdgnba.obj"	"$(INTDIR)\lwdgnba.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwdgrbn.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwdgrbn.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwdgrbn.obj"	"$(INTDIR)\lwdgrbn.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwdnoop.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwdnoop.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwdnoop.obj"	"$(INTDIR)\lwdnoop.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwresd.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwresd.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwresd.obj"	"$(INTDIR)\lwresd.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwsearch.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\lwsearch.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\lwsearch.obj"	"$(INTDIR)\lwsearch.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\main.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\main.obj"	"$(INTDIR)\main.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\notify.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\notify.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\notify.obj"	"$(INTDIR)\notify.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\ntservice.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\ntservice.obj"	"$(INTDIR)\ntservice.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\os.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\query.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\query.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\query.obj"	"$(INTDIR)\query.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\server.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\server.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\server.obj"	"$(INTDIR)\server.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\sortlist.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\sortlist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\sortlist.obj"	"$(INTDIR)\sortlist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\tkeyconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\tkeyconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\tkeyconf.obj"	"$(INTDIR)\tkeyconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\tsigconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\tsigconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\tsigconf.obj"	"$(INTDIR)\tsigconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\update.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\update.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\update.obj"	"$(INTDIR)\update.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\xfrout.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\xfrout.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\xfrout.obj"	"$(INTDIR)\xfrout.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\zoneconf.c

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-

-"$(INTDIR)\zoneconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-

-"$(INTDIR)\zoneconf.obj"	"$(INTDIR)\zoneconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"liblwres - Win32 Release" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"liblwres - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"liblwres - Win32 Debug" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"liblwres - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\lwres\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"libisccc - Win32 Release" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"libisccc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"libisccc - Win32 Debug" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"libisccc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "named - Win32 Release"

-

-"libisccfg - Win32 Release" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 

-   cd "..\..\..\bin\named\win32"

-

-"libisccfg - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ELSEIF  "$(CFG)" == "named - Win32 Debug"

-

-"libisccfg - Win32 Debug" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 

-   cd "..\..\..\bin\named\win32"

-

-"libisccfg - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\named\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on named.dsp
+!IF "$(CFG)" == ""
+CFG=named - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to named - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "named - Win32 Release" && "$(CFG)" != "named - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\named.exe"
+
+!ELSE 
+
+ALL : "libisccfg - Win32 Release" "libisccc - Win32 Release" "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\aclconf.obj"
+	-@erase "$(INTDIR)\builtin.obj"
+	-@erase "$(INTDIR)\client.obj"
+	-@erase "$(INTDIR)\config.obj"
+	-@erase "$(INTDIR)\control.obj"
+	-@erase "$(INTDIR)\controlconf.obj"
+	-@erase "$(INTDIR)\interfacemgr.obj"
+	-@erase "$(INTDIR)\listenlist.obj"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\logconf.obj"
+	-@erase "$(INTDIR)\lwaddr.obj"
+	-@erase "$(INTDIR)\lwdclient.obj"
+	-@erase "$(INTDIR)\lwderror.obj"
+	-@erase "$(INTDIR)\lwdgabn.obj"
+	-@erase "$(INTDIR)\lwdgnba.obj"
+	-@erase "$(INTDIR)\lwdgrbn.obj"
+	-@erase "$(INTDIR)\lwdnoop.obj"
+	-@erase "$(INTDIR)\lwresd.obj"
+	-@erase "$(INTDIR)\lwsearch.obj"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\notify.obj"
+	-@erase "$(INTDIR)\ntservice.obj"
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\query.obj"
+	-@erase "$(INTDIR)\server.obj"
+	-@erase "$(INTDIR)\sortlist.obj"
+	-@erase "$(INTDIR)\tkeyconf.obj"
+	-@erase "$(INTDIR)\tsigconf.obj"
+	-@erase "$(INTDIR)\update.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\xfrout.obj"
+	-@erase "$(INTDIR)\zoneconf.obj"
+	-@erase "..\..\..\Build\Release\named.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named.pdb" /machine:I386 /out:"../../../Build/Release/named.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\aclconf.obj" \
+	"$(INTDIR)\client.obj" \
+	"$(INTDIR)\config.obj" \
+	"$(INTDIR)\control.obj" \
+	"$(INTDIR)\controlconf.obj" \
+	"$(INTDIR)\interfacemgr.obj" \
+	"$(INTDIR)\listenlist.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\logconf.obj" \
+	"$(INTDIR)\lwaddr.obj" \
+	"$(INTDIR)\lwdclient.obj" \
+	"$(INTDIR)\lwderror.obj" \
+	"$(INTDIR)\lwdgabn.obj" \
+	"$(INTDIR)\lwdgnba.obj" \
+	"$(INTDIR)\lwdgrbn.obj" \
+	"$(INTDIR)\lwdnoop.obj" \
+	"$(INTDIR)\lwresd.obj" \
+	"$(INTDIR)\lwsearch.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\notify.obj" \
+	"$(INTDIR)\ntservice.obj" \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\query.obj" \
+	"$(INTDIR)\server.obj" \
+	"$(INTDIR)\sortlist.obj" \
+	"$(INTDIR)\tkeyconf.obj" \
+	"$(INTDIR)\tsigconf.obj" \
+	"$(INTDIR)\update.obj" \
+	"$(INTDIR)\xfrout.obj" \
+	"$(INTDIR)\zoneconf.obj" \
+	"$(INTDIR)\builtin.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Release\liblwres.lib" \
+	"..\..\..\lib\isccc\win32\Release\libisccc.lib" \
+	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib"
+
+"..\..\..\Build\Release\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"
+
+!ELSE 
+
+ALL : "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\aclconf.obj"
+	-@erase "$(INTDIR)\aclconf.sbr"
+	-@erase "$(INTDIR)\builtin.obj"
+	-@erase "$(INTDIR)\builtin.sbr"
+	-@erase "$(INTDIR)\client.obj"
+	-@erase "$(INTDIR)\client.sbr"
+	-@erase "$(INTDIR)\config.obj"
+	-@erase "$(INTDIR)\config.sbr"
+	-@erase "$(INTDIR)\control.obj"
+	-@erase "$(INTDIR)\control.sbr"
+	-@erase "$(INTDIR)\controlconf.obj"
+	-@erase "$(INTDIR)\controlconf.sbr"
+	-@erase "$(INTDIR)\interfacemgr.obj"
+	-@erase "$(INTDIR)\interfacemgr.sbr"
+	-@erase "$(INTDIR)\listenlist.obj"
+	-@erase "$(INTDIR)\listenlist.sbr"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\log.sbr"
+	-@erase "$(INTDIR)\logconf.obj"
+	-@erase "$(INTDIR)\logconf.sbr"
+	-@erase "$(INTDIR)\lwaddr.obj"
+	-@erase "$(INTDIR)\lwaddr.sbr"
+	-@erase "$(INTDIR)\lwdclient.obj"
+	-@erase "$(INTDIR)\lwdclient.sbr"
+	-@erase "$(INTDIR)\lwderror.obj"
+	-@erase "$(INTDIR)\lwderror.sbr"
+	-@erase "$(INTDIR)\lwdgabn.obj"
+	-@erase "$(INTDIR)\lwdgabn.sbr"
+	-@erase "$(INTDIR)\lwdgnba.obj"
+	-@erase "$(INTDIR)\lwdgnba.sbr"
+	-@erase "$(INTDIR)\lwdgrbn.obj"
+	-@erase "$(INTDIR)\lwdgrbn.sbr"
+	-@erase "$(INTDIR)\lwdnoop.obj"
+	-@erase "$(INTDIR)\lwdnoop.sbr"
+	-@erase "$(INTDIR)\lwresd.obj"
+	-@erase "$(INTDIR)\lwresd.sbr"
+	-@erase "$(INTDIR)\lwsearch.obj"
+	-@erase "$(INTDIR)\lwsearch.sbr"
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\main.sbr"
+	-@erase "$(INTDIR)\notify.obj"
+	-@erase "$(INTDIR)\notify.sbr"
+	-@erase "$(INTDIR)\ntservice.obj"
+	-@erase "$(INTDIR)\ntservice.sbr"
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\os.sbr"
+	-@erase "$(INTDIR)\query.obj"
+	-@erase "$(INTDIR)\query.sbr"
+	-@erase "$(INTDIR)\server.obj"
+	-@erase "$(INTDIR)\server.sbr"
+	-@erase "$(INTDIR)\sortlist.obj"
+	-@erase "$(INTDIR)\sortlist.sbr"
+	-@erase "$(INTDIR)\tkeyconf.obj"
+	-@erase "$(INTDIR)\tkeyconf.sbr"
+	-@erase "$(INTDIR)\tsigconf.obj"
+	-@erase "$(INTDIR)\tsigconf.sbr"
+	-@erase "$(INTDIR)\update.obj"
+	-@erase "$(INTDIR)\update.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\xfrout.obj"
+	-@erase "$(INTDIR)\xfrout.sbr"
+	-@erase "$(INTDIR)\zoneconf.obj"
+	-@erase "$(INTDIR)\zoneconf.sbr"
+	-@erase "$(OUTDIR)\named.bsc"
+	-@erase "$(OUTDIR)\named.map"
+	-@erase "$(OUTDIR)\named.pdb"
+	-@erase "..\..\..\Build\Debug\named.exe"
+	-@erase "..\..\..\Build\Debug\named.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\aclconf.sbr" \
+	"$(INTDIR)\client.sbr" \
+	"$(INTDIR)\config.sbr" \
+	"$(INTDIR)\control.sbr" \
+	"$(INTDIR)\controlconf.sbr" \
+	"$(INTDIR)\interfacemgr.sbr" \
+	"$(INTDIR)\listenlist.sbr" \
+	"$(INTDIR)\log.sbr" \
+	"$(INTDIR)\logconf.sbr" \
+	"$(INTDIR)\lwaddr.sbr" \
+	"$(INTDIR)\lwdclient.sbr" \
+	"$(INTDIR)\lwderror.sbr" \
+	"$(INTDIR)\lwdgabn.sbr" \
+	"$(INTDIR)\lwdgnba.sbr" \
+	"$(INTDIR)\lwdgrbn.sbr" \
+	"$(INTDIR)\lwdnoop.sbr" \
+	"$(INTDIR)\lwresd.sbr" \
+	"$(INTDIR)\lwsearch.sbr" \
+	"$(INTDIR)\main.sbr" \
+	"$(INTDIR)\notify.sbr" \
+	"$(INTDIR)\ntservice.sbr" \
+	"$(INTDIR)\os.sbr" \
+	"$(INTDIR)\query.sbr" \
+	"$(INTDIR)\server.sbr" \
+	"$(INTDIR)\sortlist.sbr" \
+	"$(INTDIR)\tkeyconf.sbr" \
+	"$(INTDIR)\tsigconf.sbr" \
+	"$(INTDIR)\update.sbr" \
+	"$(INTDIR)\xfrout.sbr" \
+	"$(INTDIR)\zoneconf.sbr" \
+	"$(INTDIR)\builtin.sbr"
+
+"$(OUTDIR)\named.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named.pdb" /map:"$(INTDIR)\named.map" /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\aclconf.obj" \
+	"$(INTDIR)\client.obj" \
+	"$(INTDIR)\config.obj" \
+	"$(INTDIR)\control.obj" \
+	"$(INTDIR)\controlconf.obj" \
+	"$(INTDIR)\interfacemgr.obj" \
+	"$(INTDIR)\listenlist.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\logconf.obj" \
+	"$(INTDIR)\lwaddr.obj" \
+	"$(INTDIR)\lwdclient.obj" \
+	"$(INTDIR)\lwderror.obj" \
+	"$(INTDIR)\lwdgabn.obj" \
+	"$(INTDIR)\lwdgnba.obj" \
+	"$(INTDIR)\lwdgrbn.obj" \
+	"$(INTDIR)\lwdnoop.obj" \
+	"$(INTDIR)\lwresd.obj" \
+	"$(INTDIR)\lwsearch.obj" \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\notify.obj" \
+	"$(INTDIR)\ntservice.obj" \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\query.obj" \
+	"$(INTDIR)\server.obj" \
+	"$(INTDIR)\sortlist.obj" \
+	"$(INTDIR)\tkeyconf.obj" \
+	"$(INTDIR)\tsigconf.obj" \
+	"$(INTDIR)\update.obj" \
+	"$(INTDIR)\xfrout.obj" \
+	"$(INTDIR)\zoneconf.obj" \
+	"$(INTDIR)\builtin.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib" \
+	"..\..\..\lib\lwres\win32\Debug\liblwres.lib" \
+	"..\..\..\lib\isccc\win32\Debug\libisccc.lib" \
+	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib"
+
+"..\..\..\Build\Debug\named.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("named.dep")
+!INCLUDE "named.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "named.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "named - Win32 Release" || "$(CFG)" == "named - Win32 Debug"
+SOURCE=..\aclconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\aclconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\aclconf.obj"	"$(INTDIR)\aclconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\builtin.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\builtin.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\builtin.obj"	"$(INTDIR)\builtin.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\client.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\client.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\client.obj"	"$(INTDIR)\client.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\config.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\config.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\config.obj"	"$(INTDIR)\config.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\control.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\control.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\control.obj"	"$(INTDIR)\control.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\controlconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\controlconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\controlconf.obj"	"$(INTDIR)\controlconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\interfacemgr.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\interfacemgr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\interfacemgr.obj"	"$(INTDIR)\interfacemgr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\listenlist.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\listenlist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\listenlist.obj"	"$(INTDIR)\listenlist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\log.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\logconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\logconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\logconf.obj"	"$(INTDIR)\logconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwaddr.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwaddr.obj"	"$(INTDIR)\lwaddr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwdclient.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwdclient.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwdclient.obj"	"$(INTDIR)\lwdclient.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwderror.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwderror.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwderror.obj"	"$(INTDIR)\lwderror.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwdgabn.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwdgabn.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwdgabn.obj"	"$(INTDIR)\lwdgabn.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwdgnba.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwdgnba.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwdgnba.obj"	"$(INTDIR)\lwdgnba.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwdgrbn.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwdgrbn.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwdgrbn.obj"	"$(INTDIR)\lwdgrbn.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwdnoop.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwdnoop.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwdnoop.obj"	"$(INTDIR)\lwdnoop.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwresd.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwresd.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwresd.obj"	"$(INTDIR)\lwresd.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwsearch.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\lwsearch.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\lwsearch.obj"	"$(INTDIR)\lwsearch.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\main.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\main.obj"	"$(INTDIR)\main.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\notify.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\notify.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\notify.obj"	"$(INTDIR)\notify.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\ntservice.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\ntservice.obj"	"$(INTDIR)\ntservice.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\os.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\query.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\query.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\query.obj"	"$(INTDIR)\query.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\server.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\server.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\server.obj"	"$(INTDIR)\server.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\sortlist.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\sortlist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\sortlist.obj"	"$(INTDIR)\sortlist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\tkeyconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\tkeyconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\tkeyconf.obj"	"$(INTDIR)\tkeyconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\tsigconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\tsigconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\tsigconf.obj"	"$(INTDIR)\tsigconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\update.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\update.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\update.obj"	"$(INTDIR)\update.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\xfrout.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\xfrout.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\xfrout.obj"	"$(INTDIR)\xfrout.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\zoneconf.c
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+
+"$(INTDIR)\zoneconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+
+"$(INTDIR)\zoneconf.obj"	"$(INTDIR)\zoneconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"liblwres - Win32 Release" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"liblwres - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"liblwres - Win32 Debug" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"liblwres - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\lwres\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"libisccc - Win32 Release" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"libisccc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"libisccc - Win32 Debug" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"libisccc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "named - Win32 Release"
+
+"libisccfg - Win32 Release" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   cd "..\..\..\bin\named\win32"
+
+"libisccfg - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+
+"libisccfg - Win32 Debug" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   cd "..\..\..\bin\named\win32"
+
+"libisccfg - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\named\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 41ce69d6..66ef9050 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.87.2.4.10.15 2005/09/06 02:12:39 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.4.10.19 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -55,15 +55,15 @@
  * Convenience function for configuring a single zone ACL.
  */
 static isc_result_t
-configure_zone_acl(cfg_obj_t *zconfig, cfg_obj_t *vconfig, cfg_obj_t *config,
-		   const char *aclname, ns_aclconfctx_t *actx,
-		   dns_zone_t *zone, 
+configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
+		   const cfg_obj_t *config, const char *aclname,
+		   ns_aclconfctx_t *actx, dns_zone_t *zone, 
 		   void (*setzacl)(dns_zone_t *, dns_acl_t *),
 		   void (*clearzacl)(dns_zone_t *))
 {
 	isc_result_t result;
-	cfg_obj_t *maps[4];
-	cfg_obj_t *aclobj = NULL;
+	const cfg_obj_t *maps[4];
+	const cfg_obj_t *aclobj = NULL;
 	int i = 0;
 	dns_acl_t *dacl = NULL;
 
@@ -72,7 +72,7 @@ configure_zone_acl(cfg_obj_t *zconfig, cfg_obj_t *vconfig, cfg_obj_t *config,
 	if (vconfig != NULL)
 		maps[i++] = cfg_tuple_get(vconfig, "options");
 	if (config != NULL) {
-		cfg_obj_t *options = NULL;
+		const cfg_obj_t *options = NULL;
 		(void)cfg_map_get(config, "options", &options);
 		if (options != NULL)
 			maps[i++] = options;
@@ -98,16 +98,18 @@ configure_zone_acl(cfg_obj_t *zconfig, cfg_obj_t *vconfig, cfg_obj_t *config,
  * Parse the zone update-policy statement.
  */
 static isc_result_t
-configure_zone_ssutable(cfg_obj_t *zconfig, dns_zone_t *zone) {
-	cfg_obj_t *updatepolicy = NULL;
-	cfg_listelt_t *element, *element2;
+configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone) {
+	const cfg_obj_t *updatepolicy = NULL;
+	const cfg_listelt_t *element, *element2;
 	dns_ssutable_t *table = NULL;
 	isc_mem_t *mctx = dns_zone_getmctx(zone);
 	isc_result_t result;
 
 	(void)cfg_map_get(zconfig, "update-policy", &updatepolicy);
-	if (updatepolicy == NULL)
+	if (updatepolicy == NULL) {
+		dns_zone_setssutable(zone, NULL);
 		return (ISC_R_SUCCESS);
+	}
 
 	result = dns_ssutable_create(mctx, &table);
 	if (result != ISC_R_SUCCESS)
@@ -117,13 +119,13 @@ configure_zone_ssutable(cfg_obj_t *zconfig, dns_zone_t *zone) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *stmt = cfg_listelt_value(element);
-		cfg_obj_t *mode = cfg_tuple_get(stmt, "mode");
-		cfg_obj_t *identity = cfg_tuple_get(stmt, "identity");
-		cfg_obj_t *matchtype = cfg_tuple_get(stmt, "matchtype");
-		cfg_obj_t *dname = cfg_tuple_get(stmt, "name");
-		cfg_obj_t *typelist = cfg_tuple_get(stmt, "types");
-		char *str;
+		const cfg_obj_t *stmt = cfg_listelt_value(element);
+		const cfg_obj_t *mode = cfg_tuple_get(stmt, "mode");
+		const cfg_obj_t *identity = cfg_tuple_get(stmt, "identity");
+		const cfg_obj_t *matchtype = cfg_tuple_get(stmt, "matchtype");
+		const cfg_obj_t *dname = cfg_tuple_get(stmt, "name");
+		const cfg_obj_t *typelist = cfg_tuple_get(stmt, "types");
+		const char *str;
 		isc_boolean_t grant = ISC_FALSE;
 		unsigned int mtype = DNS_SSUMATCHTYPE_NAME;
 		dns_fixedname_t fname, fident;
@@ -191,14 +193,14 @@ configure_zone_ssutable(cfg_obj_t *zconfig, dns_zone_t *zone) {
 		     element2 != NULL;
 		     element2 = cfg_list_next(element2))
 		{
-			cfg_obj_t *typeobj;
+			const cfg_obj_t *typeobj;
 			isc_textregion_t r;
 
 			INSIST(i < n);
 
 			typeobj = cfg_listelt_value(element2);
 			str = cfg_obj_asstring(typeobj);
-			r.base = str;
+			DE_CONST(str, r.base);
 			r.length = strlen(str);
 
 			result = dns_rdatatype_fromtext(&types[i++], &r);
@@ -237,8 +239,8 @@ configure_zone_ssutable(cfg_obj_t *zconfig, dns_zone_t *zone) {
  * Convert a config file zone type into a server zone type.
  */
 static inline dns_zonetype_t
-zonetype_fromconfig(cfg_obj_t *map) {
-	cfg_obj_t *obj = NULL;
+zonetype_fromconfig(const cfg_obj_t *map) {
+	const cfg_obj_t *obj = NULL;
 	isc_result_t result;
 
 	result = cfg_map_get(map, "type", &obj);
@@ -293,7 +295,9 @@ strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) {
 }
 
 static void
-checknames(dns_zonetype_t ztype, cfg_obj_t **maps, cfg_obj_t **objp) {
+checknames(dns_zonetype_t ztype, const cfg_obj_t **maps,
+	   const cfg_obj_t **objp)
+{
 	const char *zone = NULL;
 	isc_result_t result;
 
@@ -308,17 +312,18 @@ checknames(dns_zonetype_t ztype, cfg_obj_t **maps, cfg_obj_t **objp) {
 }
 
 isc_result_t
-ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
-		  ns_aclconfctx_t *ac, dns_zone_t *zone)
+ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+		  const cfg_obj_t *zconfig, ns_aclconfctx_t *ac,
+		  dns_zone_t *zone)
 {
 	isc_result_t result;
-	char *zname;
+	const char *zname;
 	dns_rdataclass_t zclass;
 	dns_rdataclass_t vclass;
-	cfg_obj_t *maps[5];
-	cfg_obj_t *zoptions = NULL;
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *obj;
+	const cfg_obj_t *maps[5];
+	const cfg_obj_t *zoptions = NULL;
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *obj;
 	const char *filename = NULL;
 	dns_notifytype_t notifytype = dns_notifytype_yes;
 	isc_sockaddr_t *addrs;
@@ -428,7 +433,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 		else
 			dialup = dns_dialuptype_no;
 	} else {
-		char *dialupstr = cfg_obj_asstring(obj);
+		const char *dialupstr = cfg_obj_asstring(obj);
 		if (strcasecmp(dialupstr, "notify") == 0)
 			dialup = dns_dialuptype_notify;
 		else if (strcasecmp(dialupstr, "notify-passive") == 0)
@@ -462,7 +467,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 			else
 				notifytype = dns_notifytype_no;
 		} else {
-			char *notifystr = cfg_obj_asstring(obj);
+			const char *notifystr = cfg_obj_asstring(obj);
 			if (strcasecmp(notifystr, "explicit") == 0)
 				notifytype = dns_notifytype_explicit;
 			else
@@ -612,6 +617,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 	switch (ztype) {
 	case dns_zone_slave:
 	case dns_zone_stub:
+		count = 0;
 		obj = NULL;
 		result = cfg_map_get(zoptions, "masters", &obj);
 		if (obj != NULL) {
@@ -715,9 +721,9 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 }
 
 isc_boolean_t
-ns_zone_reusable(dns_zone_t *zone, cfg_obj_t *zconfig) {
-	cfg_obj_t *zoptions = NULL;
-	cfg_obj_t *obj = NULL;
+ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) {
+	const cfg_obj_t *zoptions = NULL;
+	const cfg_obj_t *obj = NULL;
 	const char *cfilename;
 	const char *zfilename;
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 7c728b6d..a7062cbc 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.103.2.15.2.20 2005/03/17 03:58:26 marka Exp $ */
+/* $Id: nsupdate.c,v 1.103.2.15.2.22 2006/01/07 00:23:33 marka Exp $ */
 
 #include <config.h>
 
@@ -1665,7 +1665,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		result = dns_request_createvia3(requestmgr, soaquery,
 						localaddr, addr, 0, NULL,
 						FIND_TIMEOUT * 20,
-						FIND_TIMEOUT * 20, 3,
+						FIND_TIMEOUT, 3,
 						global_task, recvsoa, reqinfo,
 						&request);
 		check_result(result, "dns_request_createvia");
diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index 74ba2fbe..1b88d05d 100644
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: nsupdate.html,v 1.9.2.3.2.12 2005/10/13 02:33:49 marka Exp $ -->
+<!-- $Id: nsupdate.html,v 1.9.2.3.2.14 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>nsupdate &#8212; Dynamic DNS update utility</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [[<code class="option">-y <em class="replaceable"><code>keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-v</code>] [filename]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525896"></a><h2>DESCRIPTION</h2>
+<a name="id2524461"></a><h2>DESCRIPTION</h2>
 <p>
 <span><strong class="command">nsupdate</strong></span>
 is used to submit Dynamic DNS Update requests as defined in RFC2136
@@ -160,7 +160,7 @@ and number of UDP retries.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526121"></a><h2>INPUT FORMAT</h2>
+<a name="id2525369"></a><h2>INPUT FORMAT</h2>
 <p>
 <span><strong class="command">nsupdate</strong></span>
 reads input from
@@ -370,7 +370,7 @@ Lines beginning with a semicolon are comments and are ignored.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526749"></a><h2>EXAMPLES</h2>
+<a name="id2525997"></a><h2>EXAMPLES</h2>
 <p>
 The examples below show how
 <span><strong class="command">nsupdate</strong></span>
@@ -423,7 +423,7 @@ RRSIG, DNSKEY and NSEC records.)
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526793"></a><h2>FILES</h2>
+<a name="id2526041"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="constant">/etc/resolv.conf</code></span></dt>
 <dd><p>
@@ -442,7 +442,7 @@ base-64 encoding of HMAC-MD5 key created by
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525155"></a><h2>SEE ALSO</h2>
+<a name="id2524881"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">RFC2136</span></span>,
 <span class="citerefentry"><span class="refentrytitle">RFC3007</span></span>,
@@ -456,7 +456,7 @@ base-64 encoding of HMAC-MD5 key created by
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525226"></a><h2>BUGS</h2>
+<a name="id2524952"></a><h2>BUGS</h2>
 <p>
 The TSIG key is redundantly stored in two separate files.
 This is a consequence of nsupdate using the DST library
diff --git a/bin/nsupdate/win32/nsupdate.dsp b/bin/nsupdate/win32/nsupdate.dsp
index 16ad0837..a5ab2466 100644
--- a/bin/nsupdate/win32/nsupdate.dsp
+++ b/bin/nsupdate/win32/nsupdate.dsp
@@ -1,103 +1,103 @@
-# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=nsupdate - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "nsupdate.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /u /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "nsupdate - Win32 Release"

-# Name "nsupdate - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\nsupdate.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=nsupdate - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "nsupdate - Win32 Release"
+# Name "nsupdate - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\nsupdate.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/nsupdate/win32/nsupdate.dsw b/bin/nsupdate/win32/nsupdate.dsw
index 5f0ac362..e3b77722 100644
--- a/bin/nsupdate/win32/nsupdate.dsw
+++ b/bin/nsupdate/win32/nsupdate.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/nsupdate/win32/nsupdate.mak b/bin/nsupdate/win32/nsupdate.mak
index 7f4c543b..abf2ca32 100644
--- a/bin/nsupdate/win32/nsupdate.mak
+++ b/bin/nsupdate/win32/nsupdate.mak
@@ -1,276 +1,276 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on nsupdate.dsp

-!IF "$(CFG)" == ""

-CFG=nsupdate - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to nsupdate - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "nsupdate - Win32 Release" && "$(CFG)" != "nsupdate - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\nsupdate.exe"

-

-!ELSE 

-

-ALL : "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nsupdate.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\nsupdate.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\nsupdate.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsupdate.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsupdate.pdb" /machine:I386 /out:"../../../Build/Release/nsupdate.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\nsupdate.obj" \

-	"..\..\..\lib\dns\win32\Release\libdns.lib" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib"

-

-"..\..\..\Build\Release\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"

-

-!ELSE 

-

-ALL : "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\nsupdate.obj"

-	-@erase "$(INTDIR)\nsupdate.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\nsupdate.bsc"

-	-@erase "$(OUTDIR)\nsupdate.pdb"

-	-@erase "..\..\..\Build\Debug\nsupdate.exe"

-	-@erase "..\..\..\Build\Debug\nsupdate.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\nsupdate.sbr"

-

-"$(OUTDIR)\nsupdate.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsupdate.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\nsupdate.obj" \

-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib"

-

-"..\..\..\Build\Debug\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("nsupdate.dep")

-!INCLUDE "nsupdate.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "nsupdate.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "nsupdate - Win32 Release" || "$(CFG)" == "nsupdate - Win32 Debug"

-SOURCE=..\nsupdate.c

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-

-"$(INTDIR)\nsupdate.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-

-"$(INTDIR)\nsupdate.obj"	"$(INTDIR)\nsupdate.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "nsupdate - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\nsupdate\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\nsupdate\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on nsupdate.dsp
+!IF "$(CFG)" == ""
+CFG=nsupdate - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to nsupdate - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "nsupdate - Win32 Release" && "$(CFG)" != "nsupdate - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\nsupdate.exe"
+
+!ELSE 
+
+ALL : "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nsupdate.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\nsupdate.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\nsupdate.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsupdate.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsupdate.pdb" /machine:I386 /out:"../../../Build/Release/nsupdate.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\nsupdate.obj" \
+	"..\..\..\lib\dns\win32\Release\libdns.lib" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib"
+
+"..\..\..\Build\Release\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"
+
+!ELSE 
+
+ALL : "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\nsupdate.obj"
+	-@erase "$(INTDIR)\nsupdate.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\nsupdate.bsc"
+	-@erase "$(OUTDIR)\nsupdate.pdb"
+	-@erase "..\..\..\Build\Debug\nsupdate.exe"
+	-@erase "..\..\..\Build\Debug\nsupdate.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\nsupdate.sbr"
+
+"$(OUTDIR)\nsupdate.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsupdate.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\nsupdate.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib"
+
+"..\..\..\Build\Debug\nsupdate.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("nsupdate.dep")
+!INCLUDE "nsupdate.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "nsupdate.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "nsupdate - Win32 Release" || "$(CFG)" == "nsupdate - Win32 Debug"
+SOURCE=..\nsupdate.c
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+
+"$(INTDIR)\nsupdate.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+
+"$(INTDIR)\nsupdate.obj"	"$(INTDIR)\nsupdate.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "nsupdate - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\nsupdate\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\nsupdate\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/rndc/rndc-confgen.html b/bin/rndc/rndc-confgen.html
index ca754008..efe843ec 100644
--- a/bin/rndc/rndc-confgen.html
+++ b/bin/rndc/rndc-confgen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc-confgen.html,v 1.3.2.5.2.11 2005/10/13 02:33:51 marka Exp $ -->
+<!-- $Id: rndc-confgen.html,v 1.3.2.5.2.12 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">rndc-confgen</span> &#8212; rndc key generation tool</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc-confgen</code>  [<code class="option">-a</code>] [<code class="option">-b <em class="replaceable"><code>keysize</code></em></code>] [<code class="option">-c <em class="replaceable"><code>keyfile</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s <em class="replaceable"><code>address</code></em></code>] [<code class="option">-t <em class="replaceable"><code>chrootdir</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525911"></a><h2>DESCRIPTION</h2>
+<a name="id2524476"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">rndc-confgen</strong></span> generates configuration files
 	for <span><strong class="command">rndc</strong></span>.  It can be used as a
@@ -48,7 +48,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525957"></a><h2>OPTIONS</h2>
+<a name="id2525205"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a</span></dt>
 <dd>
@@ -148,7 +148,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526270"></a><h2>EXAMPLES</h2>
+<a name="id2525518"></a><h2>EXAMPLES</h2>
 <p>
         To allow <span><strong class="command">rndc</strong></span> to be used with
 	no manual configuration, run
@@ -167,7 +167,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526314"></a><h2>SEE ALSO</h2>
+<a name="id2525562"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc.conf</span>(5)</span>,
@@ -176,7 +176,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526357"></a><h2>AUTHOR</h2>
+<a name="id2525605"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 63e8f23b..6b36c40c 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.77.2.5.2.15 2005/03/17 03:58:27 marka Exp $ */
+/* $Id: rndc.c,v 1.77.2.5.2.17 2006/03/02 00:37:20 marka Exp $ */
 
 /*
  * Principal Author: DCL
@@ -378,17 +378,17 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
 {
 	isc_result_t result;
 	const char *conffile = admin_conffile;
-	cfg_obj_t *defkey = NULL;
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *servers = NULL;
-	cfg_obj_t *server = NULL;
-	cfg_obj_t *keys = NULL;
-	cfg_obj_t *key = NULL;
-	cfg_obj_t *defport = NULL;
-	cfg_obj_t *secretobj = NULL;
-	cfg_obj_t *algorithmobj = NULL;
+	const cfg_obj_t *defkey = NULL;
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *servers = NULL;
+	const cfg_obj_t *server = NULL;
+	const cfg_obj_t *keys = NULL;
+	const cfg_obj_t *key = NULL;
+	const cfg_obj_t *defport = NULL;
+	const cfg_obj_t *secretobj = NULL;
+	const cfg_obj_t *algorithmobj = NULL;
 	cfg_obj_t *config = NULL;
-	cfg_listelt_t *elt;
+	const cfg_listelt_t *elt;
 	const char *secretstr;
 	const char *algorithm;
 	static char secretarray[1024];
@@ -420,7 +420,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
 	if (key_only && servername == NULL)
 		servername = "127.0.0.1";
 	else if (servername == NULL && options != NULL) {
-		cfg_obj_t *defserverobj = NULL;
+		const cfg_obj_t *defserverobj = NULL;
 		(void)cfg_map_get(options, "default-server", &defserverobj);
 		if (defserverobj != NULL)
 			servername = cfg_obj_asstring(defserverobj);
diff --git a/bin/rndc/rndc.conf.html b/bin/rndc/rndc.conf.html
index 05db0eca..3dfbb74b 100644
--- a/bin/rndc/rndc.conf.html
+++ b/bin/rndc/rndc.conf.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc.conf.html,v 1.5.2.1.4.10 2005/10/13 02:33:51 marka Exp $ -->
+<!-- $Id: rndc.conf.html,v 1.5.2.1.4.12 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><code class="filename">rndc.conf</code> &#8212; rndc configuration file</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc.conf</code> </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525833"></a><h2>DESCRIPTION</h2>
+<a name="id2524057"></a><h2>DESCRIPTION</h2>
 <p>
         <code class="filename">rndc.conf</code> is the configuration file
 	for <span><strong class="command">rndc</strong></span>, the BIND 9 name server control
@@ -105,7 +105,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525968"></a><h2>EXAMPLE</h2>
+<a name="id2525216"></a><h2>EXAMPLE</h2>
 <pre class="programlisting">
     options {
         default-server  localhost;
@@ -151,7 +151,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526028"></a><h2>NAME SERVER CONFIGURATION</h2>
+<a name="id2525276"></a><h2>NAME SERVER CONFIGURATION</h2>
 <p>
         The name server must be configured to accept rndc connections and
 	to recognize the key specified in the <code class="filename">rndc.conf</code>
@@ -161,7 +161,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526049"></a><h2>SEE ALSO</h2>
+<a name="id2525297"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc-confgen</span>(8)</span>,
@@ -170,7 +170,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526091"></a><h2>AUTHOR</h2>
+<a name="id2525339"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html
index d23f4682..16d9593e 100644
--- a/bin/rndc/rndc.html
+++ b/bin/rndc/rndc.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: rndc.html,v 1.7.2.1.4.10 2005/10/13 02:33:50 marka Exp $ -->
+<!-- $Id: rndc.html,v 1.7.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p><span class="application">rndc</span> &#8212; name server control utility</p>
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc</code>  [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-k <em class="replaceable"><code>key-file</code></em></code>] [<code class="option">-s <em class="replaceable"><code>server</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-V</code>] [<code class="option">-y <em class="replaceable"><code>key_id</code></em></code>] {command}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525886"></a><h2>DESCRIPTION</h2>
+<a name="id2524452"></a><h2>DESCRIPTION</h2>
 <p>
         <span><strong class="command">rndc</strong></span> controls the operation of a name
 	server.  It supersedes the <span><strong class="command">ndc</strong></span> utility
@@ -61,7 +61,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525927"></a><h2>OPTIONS</h2>
+<a name="id2524492"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-c <em class="replaceable"><code>config-file</code></em></span></dt>
 <dd><p>
@@ -123,7 +123,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526109"></a><h2>LIMITATIONS</h2>
+<a name="id2525357"></a><h2>LIMITATIONS</h2>
 <p>
         <span><strong class="command">rndc</strong></span> does not yet support all the commands of
 	the BIND 8 <span><strong class="command">ndc</strong></span> utility.
@@ -137,7 +137,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526138"></a><h2>SEE ALSO</h2>
+<a name="id2525386"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">rndc.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -147,7 +147,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526190"></a><h2>AUTHOR</h2>
+<a name="id2525438"></a><h2>AUTHOR</h2>
 <p>
         <span class="corpauthor">Internet Systems Consortium</span>
     </p>
diff --git a/bin/rndc/win32/confgen.dsp b/bin/rndc/win32/confgen.dsp
index 0525b477..26097e44 100644
--- a/bin/rndc/win32/confgen.dsp
+++ b/bin/rndc/win32/confgen.dsp
@@ -1,115 +1,115 @@
-# Microsoft Developer Studio Project File - Name="rndcconfgen" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=rndcconfgen - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "confgen.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe"

-

-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "rndcconfgen - Win32 Release"

-# Name "rndcconfgen - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\os.c

-# End Source File

-# Begin Source File

-

-SOURCE="..\rndc-confgen.c"

-# End Source File

-# Begin Source File

-

-SOURCE=..\util.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\util.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="rndcconfgen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=rndcconfgen - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "confgen.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe"
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rndcconfgen - Win32 Release"
+# Name "rndcconfgen - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\os.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\rndc-confgen.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\util.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\util.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/rndc/win32/confgen.dsw b/bin/rndc/win32/confgen.dsw
index 1b1f8884..126090eb 100644
--- a/bin/rndc/win32/confgen.dsw
+++ b/bin/rndc/win32/confgen.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "confgen"=".\confgen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "confgen"=".\confgen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/rndc/win32/confgen.mak b/bin/rndc/win32/confgen.mak
index 7bb53be3..eb9c7569 100644
--- a/bin/rndc/win32/confgen.mak
+++ b/bin/rndc/win32/confgen.mak
@@ -1,216 +1,216 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on confgen.dsp

-!IF "$(CFG)" == ""

-CFG=rndcconfgen - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to rndcconfgen - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "rndcconfgen - Win32 Release" && "$(CFG)" != "rndcconfgen - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\rndc-confgen.exe"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\rndc-confgen.obj"

-	-@erase "$(INTDIR)\util.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\rndc-confgen.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\confgen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rndc-confgen.pdb" /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\rndc-confgen.obj" \

-	"$(INTDIR)\util.obj"

-

-"..\..\..\Build\Release\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\rndc-confgen.exe" "$(OUTDIR)\confgen.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\os.sbr"

-	-@erase "$(INTDIR)\rndc-confgen.obj"

-	-@erase "$(INTDIR)\rndc-confgen.sbr"

-	-@erase "$(INTDIR)\util.obj"

-	-@erase "$(INTDIR)\util.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\confgen.bsc"

-	-@erase "$(OUTDIR)\rndc-confgen.pdb"

-	-@erase "..\..\..\Build\Debug\rndc-confgen.exe"

-	-@erase "..\..\..\Build\Debug\rndc-confgen.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\os.sbr" \

-	"$(INTDIR)\rndc-confgen.sbr" \

-	"$(INTDIR)\util.sbr"

-

-"$(OUTDIR)\confgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc-confgen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\rndc-confgen.obj" \

-	"$(INTDIR)\util.obj"

-

-"..\..\..\Build\Debug\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("confgen.dep")

-!INCLUDE "confgen.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "confgen.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "rndcconfgen - Win32 Release" || "$(CFG)" == "rndcconfgen - Win32 Debug"

-SOURCE=.\os.c

-

-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"

-

-

-"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"

-

-

-"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE="..\rndc-confgen.c"

-

-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"

-

-

-"$(INTDIR)\rndc-confgen.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"

-

-

-"$(INTDIR)\rndc-confgen.obj"	"$(INTDIR)\rndc-confgen.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\util.c

-

-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"

-

-

-"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"

-

-

-"$(INTDIR)\util.obj"	"$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on confgen.dsp
+!IF "$(CFG)" == ""
+CFG=rndcconfgen - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to rndcconfgen - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "rndcconfgen - Win32 Release" && "$(CFG)" != "rndcconfgen - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "confgen.mak" CFG="rndcconfgen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\rndc-confgen.exe"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\rndc-confgen.obj"
+	-@erase "$(INTDIR)\util.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\rndc-confgen.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\confgen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rndc-confgen.pdb" /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\rndc-confgen.obj" \
+	"$(INTDIR)\util.obj"
+
+"..\..\..\Build\Release\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\rndc-confgen.exe" "$(OUTDIR)\confgen.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\os.sbr"
+	-@erase "$(INTDIR)\rndc-confgen.obj"
+	-@erase "$(INTDIR)\rndc-confgen.sbr"
+	-@erase "$(INTDIR)\util.obj"
+	-@erase "$(INTDIR)\util.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\confgen.bsc"
+	-@erase "$(OUTDIR)\rndc-confgen.pdb"
+	-@erase "..\..\..\Build\Debug\rndc-confgen.exe"
+	-@erase "..\..\..\Build\Debug\rndc-confgen.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\os.sbr" \
+	"$(INTDIR)\rndc-confgen.sbr" \
+	"$(INTDIR)\util.sbr"
+
+"$(OUTDIR)\confgen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc-confgen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\rndc-confgen.obj" \
+	"$(INTDIR)\util.obj"
+
+"..\..\..\Build\Debug\rndc-confgen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("confgen.dep")
+!INCLUDE "confgen.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "confgen.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "rndcconfgen - Win32 Release" || "$(CFG)" == "rndcconfgen - Win32 Debug"
+SOURCE=.\os.c
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+
+"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+
+"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE="..\rndc-confgen.c"
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+
+"$(INTDIR)\rndc-confgen.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+
+"$(INTDIR)\rndc-confgen.obj"	"$(INTDIR)\rndc-confgen.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\util.c
+
+!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+
+
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+
+
+"$(INTDIR)\util.obj"	"$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/rndc/win32/rndc.dsp b/bin/rndc/win32/rndc.dsp
index 549e9352..e457400b 100644
--- a/bin/rndc/win32/rndc.dsp
+++ b/bin/rndc/win32/rndc.dsp
@@ -1,111 +1,111 @@
-# Microsoft Developer Studio Project File - Name="rndc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=rndc - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "rndc.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe"

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "rndc - Win32 Release"

-# Name "rndc - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\rndc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\util.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\util.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="rndc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=rndc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "rndc.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe"
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rndc - Win32 Release"
+# Name "rndc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\rndc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\util.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\util.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/rndc/win32/rndc.dsw b/bin/rndc/win32/rndc.dsw
index 97d3e438..ceeaa8d3 100644
--- a/bin/rndc/win32/rndc.dsw
+++ b/bin/rndc/win32/rndc.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "rndc"=".\rndc.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "rndc"=".\rndc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/rndc/win32/rndc.mak b/bin/rndc/win32/rndc.mak
index 5ecda17e..18224fb9 100644
--- a/bin/rndc/win32/rndc.mak
+++ b/bin/rndc/win32/rndc.mak
@@ -1,328 +1,328 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on rndc.dsp

-!IF "$(CFG)" == ""

-CFG=rndc - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to rndc - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "rndc - Win32 Release" && "$(CFG)" != "rndc - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\rndc.exe"

-

-!ELSE 

-

-ALL : "libbind9 - Win32 Release" "libisccfg - Win32 Release" "libisccc - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\rndc.exe"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\rndc.obj"

-	-@erase "$(INTDIR)\util.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\..\..\Build\Release\rndc.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rndc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\rndc.obj" \

-	"$(INTDIR)\util.obj" \

-	"..\..\..\lib\isc\win32\Release\libisc.lib" \

-	"..\..\..\lib\isccc\win32\Release\libisccc.lib" \

-	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \

-	"..\..\..\lib\bind9\win32\Release\libbind9.lib"

-

-"..\..\..\Build\Release\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"

-

-!ELSE 

-

-ALL : "libbind9 - Win32 Debug" "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\rndc.obj"

-	-@erase "$(INTDIR)\rndc.sbr"

-	-@erase "$(INTDIR)\util.obj"

-	-@erase "$(INTDIR)\util.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\rndc.bsc"

-	-@erase "$(OUTDIR)\rndc.pdb"

-	-@erase "..\..\..\Build\Debug\rndc.exe"

-	-@erase "..\..\..\Build\Debug\rndc.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\rndc.sbr" \

-	"$(INTDIR)\util.sbr"

-

-"$(OUTDIR)\rndc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\rndc.obj" \

-	"$(INTDIR)\util.obj" \

-	"..\..\..\lib\isc\win32\Debug\libisc.lib" \

-	"..\..\..\lib\isccc\win32\Debug\libisccc.lib" \

-	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \

-	"..\..\..\lib\bind9\win32\Debug\libbind9.lib"

-

-"..\..\..\Build\Debug\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("rndc.dep")

-!INCLUDE "rndc.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "rndc.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "rndc - Win32 Release" || "$(CFG)" == "rndc - Win32 Debug"

-SOURCE=..\rndc.c

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-

-"$(INTDIR)\rndc.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-

-"$(INTDIR)\rndc.obj"	"$(INTDIR)\rndc.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\util.c

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-

-"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-

-"$(INTDIR)\util.obj"	"$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-"libisccc - Win32 Release" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisccc - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-"libisccc - Win32 Debug" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisccc - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isccc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-"libisccfg - Win32 Release" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisccfg - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-"libisccfg - Win32 Debug" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libisccfg - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "rndc - Win32 Release"

-

-"libbind9 - Win32 Release" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libbind9 - Win32 ReleaseCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"

-

-"libbind9 - Win32 Debug" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 

-   cd "..\..\..\bin\rndc\win32"

-

-"libbind9 - Win32 DebugCLEAN" : 

-   cd "..\..\..\lib\bind9\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\..\bin\rndc\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on rndc.dsp
+!IF "$(CFG)" == ""
+CFG=rndc - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to rndc - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "rndc - Win32 Release" && "$(CFG)" != "rndc - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\rndc.exe"
+
+!ELSE 
+
+ALL : "libbind9 - Win32 Release" "libisccfg - Win32 Release" "libisccc - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\rndc.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\rndc.obj"
+	-@erase "$(INTDIR)\util.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\..\..\Build\Release\rndc.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rndc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\rndc.obj" \
+	"$(INTDIR)\util.obj" \
+	"..\..\..\lib\isc\win32\Release\libisc.lib" \
+	"..\..\..\lib\isccc\win32\Release\libisccc.lib" \
+	"..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \
+	"..\..\..\lib\bind9\win32\Release\libbind9.lib"
+
+"..\..\..\Build\Release\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"
+
+!ELSE 
+
+ALL : "libbind9 - Win32 Debug" "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\rndc.obj"
+	-@erase "$(INTDIR)\rndc.sbr"
+	-@erase "$(INTDIR)\util.obj"
+	-@erase "$(INTDIR)\util.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\rndc.bsc"
+	-@erase "$(OUTDIR)\rndc.pdb"
+	-@erase "..\..\..\Build\Debug\rndc.exe"
+	-@erase "..\..\..\Build\Debug\rndc.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\rndc.sbr" \
+	"$(INTDIR)\util.sbr"
+
+"$(OUTDIR)\rndc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\rndc.obj" \
+	"$(INTDIR)\util.obj" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib" \
+	"..\..\..\lib\isccc\win32\Debug\libisccc.lib" \
+	"..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \
+	"..\..\..\lib\bind9\win32\Debug\libbind9.lib"
+
+"..\..\..\Build\Debug\rndc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("rndc.dep")
+!INCLUDE "rndc.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "rndc.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "rndc - Win32 Release" || "$(CFG)" == "rndc - Win32 Debug"
+SOURCE=..\rndc.c
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+
+"$(INTDIR)\rndc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+
+"$(INTDIR)\rndc.obj"	"$(INTDIR)\rndc.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\util.c
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+
+"$(INTDIR)\util.obj"	"$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+"libisccc - Win32 Release" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisccc - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+"libisccc - Win32 Debug" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisccc - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isccc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+"libisccfg - Win32 Release" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisccfg - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+"libisccfg - Win32 Debug" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libisccfg - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "rndc - Win32 Release"
+
+"libbind9 - Win32 Release" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libbind9 - Win32 ReleaseCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+
+"libbind9 - Win32 Debug" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   cd "..\..\..\bin\rndc\win32"
+
+"libbind9 - Win32 DebugCLEAN" : 
+   cd "..\..\..\lib\bind9\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\rndc\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/bin/tests/compress_test.c b/bin/tests/compress_test.c
index 41df7ad0..57c11697 100644
--- a/bin/tests/compress_test.c
+++ b/bin/tests/compress_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress_test.c,v 1.24.12.4 2004/03/08 04:04:25 marka Exp $ */
+/* $Id: compress_test.c,v 1.24.12.6 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -131,7 +131,7 @@ test(unsigned int allowed, dns_name_t *name1, dns_name_t *name2,
 		case DNS_COMPRESS_NONE: s = "DNS_COMPRESS_NONE"; break;
 		case DNS_COMPRESS_GLOBAL14: s = "DNS_COMPRESS_GLOBAL14"; break;
 		/* case DNS_COMPRESS_ALL: s = "DNS_COMPRESS_ALL"; break; */
-		default: s = "UNKOWN"; break;
+		default: s = "UNKNOWN"; break;
 		}
 		fprintf(stdout, "Allowed = %s\n", s);
 	}
diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index 031386d4..5d62ac2f 100644
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.29.206.3 2004/10/25 01:36:06 marka Exp $ */
+/* $Id: t_db.c,v 1.29.206.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -403,8 +403,10 @@ test_dns_db_zc_x(const char *filename, dns_dbtype_t dbtype,
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, tokens);
 			if (cnt == 4) {
diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c
index b891a35e..4d9ad30d 100644
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/dst/dst_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.37.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: dst_test.c,v 1.37.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -236,23 +236,34 @@ main(void) {
 	isc_buffer_t b;
 	dns_fixedname_t fname;
 	dns_name_t *name;
+	isc_result_t result;
 
-	isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(0, 0, &mctx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 
 	current = isc_mem_get(mctx, 256);
+	if (current == NULL)
+		return (1);
 	getcwd(current, 256);
 
 	dns_result_register();
 
-	isc_entropy_create(mctx, &ectx);
-	isc_entropy_createfilesource(ectx, "randomfile");
+	result = isc_entropy_create(mctx, &ectx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
+	result = isc_entropy_createfilesource(ectx, "randomfile");
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
 
 	dns_fixedname_init(&fname);
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
 	io(name, 54622, DST_ALG_RSAMD5, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 	   mctx);
@@ -262,7 +273,9 @@ main(void) {
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dh(name, 18602, name, 48957, mctx);
 
 	generate(DST_ALG_RSAMD5, mctx);
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index da654a37..4bf0dd97 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.47.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: t_dst.c,v 1.47.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -405,7 +405,13 @@ t1(void) {
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 			mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 	t_info("testing use of stored keys [2]\n");
@@ -421,7 +427,13 @@ t1(void) {
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 
 	dh(name, 18602, name, 48957, mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 
@@ -674,7 +686,14 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, keyname, strlen(keyname));
 	isc_buffer_add(&b, strlen(keyname));
-	dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+			isc_result_totext(isc_result));
+		(void) free(data);
+		++*nprobs;
+		return;
+	}
 	isc_result = dst_key_fromfile(name, id, alg, type, NULL, mctx, &key);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("dst_key_fromfile failed %s\n",
diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index 4bf4adab..65f459e6 100644
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_master.c,v 1.30.206.3 2004/03/08 04:04:29 marka Exp $ */
+/* $Id: t_master.c,v 1.30.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -153,8 +153,10 @@ test_master_x(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace(*p & 0xff)) || (*p == '#'))
+			if ((isspace(*p & 0xff)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of data file, origin, zclass, expected result.
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index aae3d390..551d49b1 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.32.2.2.8.3 2004/03/08 21:06:23 marka Exp $ */
+/* $Id: t_names.c,v 1.32.2.2.8.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -566,8 +566,10 @@ t_dns_name_isabsolute(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -677,8 +679,10 @@ t_dns_name_hash(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -831,8 +835,10 @@ t_dns_name_fullcompare(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -949,8 +955,10 @@ t_dns_name_compare(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1049,8 +1057,10 @@ t_dns_name_rdatacompare(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1145,8 +1155,10 @@ t_dns_name_issubdomain(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1226,8 +1238,10 @@ t_dns_name_countlabels(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -1336,8 +1350,10 @@ t_dns_name_getlabel(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1464,8 +1480,10 @@ t_dns_name_getlabelsequence(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1552,8 +1570,10 @@ t_dns_name_fromregion(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1600,8 +1620,10 @@ t_dns_name_toregion(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1735,8 +1757,10 @@ t_dns_name_fromtext(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1869,8 +1893,10 @@ t_dns_name_totext(void) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -2028,8 +2054,10 @@ t_dns_name_fromwire_x(const char *testfile, size_t buflen) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -2221,8 +2249,10 @@ t_dns_name_towire_x(const char *testfile, size_t buflen) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index 0f84e9d0..8e0dbd0b 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_rbt.c,v 1.23.206.4 2004/10/25 01:36:07 marka Exp $ */
+/* $Id: t_rbt.c,v 1.23.206.6 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -127,6 +127,7 @@ create_name(char *s, isc_mem_t *mctx, dns_name_t **dns_name) {
 	isc_result_t	result;
 	isc_buffer_t	source;
 	isc_buffer_t	target;
+	dns_name_t	*name;
 
 	nfails = 0;
 
@@ -141,22 +142,26 @@ create_name(char *s, isc_mem_t *mctx, dns_name_t **dns_name) {
 		 * The buffer for the actual name will immediately follow the
 		 * name structure.
 		 */
-		*dns_name = isc_mem_get(mctx, sizeof(**dns_name) + DNSNAMELEN);
-		if (*dns_name == NULL) {
+		name = isc_mem_get(mctx, sizeof(*name) + DNSNAMELEN);
+		if (name == NULL) {
 			t_info("isc_mem_get failed\n");
 			++nfails;
-		}
+		} else {
 
-		dns_name_init(*dns_name, NULL);
-		isc_buffer_init(&target, *dns_name + 1, DNSNAMELEN);
+			dns_name_init(name, NULL);
+			isc_buffer_init(&target, name + 1, DNSNAMELEN);
 
-		result = dns_name_fromtext(*dns_name, &source, dns_rootname,
-					   ISC_FALSE, &target);
+			result = dns_name_fromtext(name, &source, dns_rootname,
+						   ISC_FALSE, &target);
 
-		if (result != ISC_R_SUCCESS) {
-			++nfails;
-			t_info("dns_name_fromtext(%s) failed %s\n",
-			       s, dns_result_totext(result));
+			if (result != ISC_R_SUCCESS) {
+				++nfails;
+				t_info("dns_name_fromtext(%s) failed %s\n",
+				       s, dns_result_totext(result));
+				 isc_mem_put(mctx, name,
+					     sizeof(*name) + DNSNAMELEN);
+			} else
+				*dns_name = name;
 		}
 	} else {
 		++nfails;
@@ -182,15 +187,17 @@ t1_add(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result) {
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			if (T_debug)
 				t_info("dns_rbt_addname succeeded\n");
 			*dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
+			if (*dns_result != ISC_R_SUCCESS) {
+				delete_name(dns_name, mctx);
+				t_info("dns_rbt_addname failed %s\n",
+		       		       dns_result_totext(*dns_result));
+				++nprobs;
+			}
 		} else {
-			t_info("dns_rbt_addname failed %s\n",
-		       			dns_result_totext(*dns_result));
-			delete_name(dns_name, mctx);
 			++nprobs;
 		}
 	} else {
@@ -208,8 +215,7 @@ t1_delete(char *name, dns_rbt_t *rbt, isc_mem_t *mctx,
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			*dns_result = dns_rbt_deletename(rbt, dns_name,
 							 ISC_FALSE);
 			delete_name(dns_name, mctx);
@@ -234,8 +240,7 @@ t1_search(char *name, dns_rbt_t *rbt, isc_mem_t *mctx,
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_searchname);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_searchname) == 0) {
 			dns_fixedname_init(&dns_fixedname);
 			dns_foundname = dns_fixedname_name(&dns_fixedname);
 			data = NULL;
@@ -281,7 +286,7 @@ rbt_init(char *filename, dns_rbt_t **rbt, isc_mem_t *mctx) {
 		 * Skip any comment lines.
 		 */
 		if ((*p == '#') || (*p == '\0') || (*p == ' ')) {
-			free(p);
+			(void)free(p);
 			continue;
 		}
 
@@ -362,8 +367,7 @@ test_rbt_gen(char *filename, char *command, char *testname,
 	if (strcmp(command, "create") == 0) {
 		result = T_PASS;
 	} else if (strcmp(command, "add") == 0) {
-		dns_result = create_name(testname, mctx, &dns_name);
-		if (dns_result == ISC_R_SUCCESS) {
+		if (create_name(testname, mctx, &dns_name) == 0) {
 			dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
 
 			if (dns_result != ISC_R_SUCCESS)
@@ -466,8 +470,10 @@ test_dns_rbt_x(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of db file, command, testname,
@@ -976,8 +982,10 @@ test_dns_rbtnodechain_init(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 10) {
@@ -1163,8 +1171,10 @@ test_dns_rbtnodechain_first(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1354,8 +1364,10 @@ test_dns_rbtnodechain_last(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1560,8 +1572,10 @@ test_dns_rbtnodechain_next(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1765,8 +1779,10 @@ test_dns_rbtnodechain_prev(const char *filename) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c
index 49a526f6..2d1a5ebc 100644
--- a/bin/tests/rdata_test.c
+++ b/bin/tests/rdata_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata_test.c,v 1.35.12.9 2005/03/17 03:58:28 marka Exp $ */
+/* $Id: rdata_test.c,v 1.35.12.11 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -304,7 +304,7 @@ viastruct(dns_rdata_t *rdata, isc_mem_t *mctx,
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else
@@ -561,7 +561,7 @@ viastruct(dns_rdata_t *rdata, isc_mem_t *mctx,
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else {
@@ -572,7 +572,7 @@ viastruct(dns_rdata_t *rdata, isc_mem_t *mctx,
 		result = dns_rdata_fromstruct(rdata2, rdc, rdt, sp, b);
 		if (result != ISC_R_SUCCESS)
 			fprintf(stdout,
-				"viastruct: fromstuct %d %d return %s\n",
+				"viastruct: fromstruct %d %d return %s\n",
 				rdata->type, rdata->rdclass,
 				dns_result_totext(result));
 		else if (rdata->length != rdata2->length ||
diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 79cd8c08..a43c8e25 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.33.12.8 2005/09/06 02:12:40 marka Exp $
+# $Id: tests.sh,v 1.33.12.10 2006/02/26 23:49:48 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -428,7 +428,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-echo "I:checking privately secure wilcard to nxdomain works ($n)"
+echo "I:checking privately secure wildcard to nxdomain works ($n)"
 ret=0
 $DIG $DIGOPTS +noauth a.wild.private.secure.example. SOA @10.53.0.2 \
 	> dig.out.ns2.test$n || ret=1
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 60b6743b..c9a5ef01 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keycreate.c,v 1.7.12.5 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keycreate.c,v 1.7.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -144,7 +144,9 @@ sendquery(isc_task_t *task, isc_event_t *event) {
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	dns_fixedname_init(&keyname);
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 8f3cb809..dcdac375 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keydelete.c,v 1.4.206.3 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keydelete.c,v 1.4.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -118,7 +118,9 @@ sendquery(isc_task_t *task, isc_event_t *event) {
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	query = NULL;
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 6a44873d..13021b05 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.29.12.9 2005/07/19 07:08:36 marka Exp $ */
+/* $Id: t_tasks.c,v 1.29.12.11 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -2131,6 +2131,7 @@ t13(void) {
 #define T14_NTASKS 10
 #define T14_EXCLTASK 6
 
+int t14_exclusiveerror = ISC_R_SUCCESS;
 int t14_error = 0;
 int t14_done = 0;
 
@@ -2146,8 +2147,12 @@ t14_callback(isc_task_t *task, isc_event_t *event) {
 	t_info("task enter %d\n", taskno);	
 	if (taskno == T14_EXCLTASK) {
 		int	i;
-		isc_task_beginexclusive(task);
-		t_info("task %d got exclusive access\n", taskno);			
+		t14_exclusiveerror = isc_task_beginexclusive(task);
+		if (t14_exclusiveerror == ISC_R_SUCCESS)
+			t_info("task %d got exclusive access\n", taskno);
+		else
+			t_info("task %d failed to got exclusive access: %d\n",
+				taskno, t14_exclusiveerror);
 		for (i = 0; i < T14_NTASKS; i++) {
    		        t_info("task %d state %d\n", i , t14_active[i]);
 			if (t14_active[i])
@@ -2251,8 +2256,11 @@ t_tasks14(void) {
 
 	isc_taskmgr_destroy(&manager);
 
-	if (t14_error) {
-		t_info("mutual access occurred\n");
+	if (t14_exclusiveerror != ISC_R_SUCCESS || t14_error) {
+		if (t14_exclusiveerror != ISC_R_SUCCESS)
+			t_info("isc_task_beginexclusive() failed\n");
+		if (t14_error)
+			t_info("mutual access occurred\n");
 		return(T_FAIL);
 	}
 
diff --git a/bin/win32/BINDInstall/BINDInstall.dsp b/bin/win32/BINDInstall/BINDInstall.dsp
index 02d9bcfc..9f04b97b 100644
--- a/bin/win32/BINDInstall/BINDInstall.dsp
+++ b/bin/win32/BINDInstall/BINDInstall.dsp
@@ -1,177 +1,177 @@
-# Microsoft Developer Studio Project File - Name="BINDInstall" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Application" 0x0101

-

-CFG=BINDInstall - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "BINDInstall.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")

-!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-# PROP BASE Use_MFC 5

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 6

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /TP /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

-# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe"

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-# PROP BASE Use_MFC 5

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 6

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR /Yu"stdafx.h" /FD /TP /GZ /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "BINDInstall - Win32 Release"

-# Name "BINDInstall - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\AccountInfo.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BINDInstall.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BINDInstallDlg.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DirBrowse.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\lib\isc\win32\ntgroups.c

-# SUBTRACT CPP /YX /Yc /Yu

-# End Source File

-# Begin Source File

-

-SOURCE=.\StdAfx.cpp

-# ADD CPP /Yc"stdafx.h"

-# End Source File

-# Begin Source File

-

-SOURCE=.\VersionInfo.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Accountinfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BINDInstall.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BINDInstallDlg.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DirBrowse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\lib\isc\win32\include\isc\ntgroups.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\StdAfx.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\VersionInfo.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# Begin Source File

-

-SOURCE=.\res\BINDInstall.ico

-# End Source File

-# Begin Source File

-

-SOURCE=.\res\BINDInstall.rc2

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\BINDInstall.rc

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="BINDInstall" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=BINDInstall - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BINDInstall.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+# PROP BASE Use_MFC 5
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /TP /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
+# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe"
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+# PROP BASE Use_MFC 5
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR /Yu"stdafx.h" /FD /TP /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BINDInstall - Win32 Release"
+# Name "BINDInstall - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\AccountInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BINDInstall.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BINDInstallDlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DirBrowse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\isc\win32\ntgroups.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\VersionInfo.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Accountinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BINDInstall.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BINDInstallDlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\DirBrowse.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\isc\win32\include\isc\ntgroups.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\VersionInfo.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\res\BINDInstall.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\BINDInstall.rc2
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\BINDInstall.rc
+# End Source File
+# End Target
+# End Project
diff --git a/bin/win32/BINDInstall/BINDInstall.dsw b/bin/win32/BINDInstall/BINDInstall.dsw
index c949bc7b..d16a45cc 100644
--- a/bin/win32/BINDInstall/BINDInstall.dsw
+++ b/bin/win32/BINDInstall/BINDInstall.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "BINDInstall"=.\BINDInstall.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BINDInstall"=.\BINDInstall.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/win32/BINDInstall/BINDInstall.mak b/bin/win32/BINDInstall/BINDInstall.mak
index b38ada67..f479a243 100644
--- a/bin/win32/BINDInstall/BINDInstall.mak
+++ b/bin/win32/BINDInstall/BINDInstall.mak
@@ -1,331 +1,331 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on BINDInstall.dsp

-!IF "$(CFG)" == ""

-CFG=BINDInstall - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to BINDInstall - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "BINDInstall - Win32 Release" && "$(CFG)" != "BINDInstall - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")

-!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\BINDInstall.exe"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\AccountInfo.obj"

-	-@erase "$(INTDIR)\BINDInstall.obj"

-	-@erase "$(INTDIR)\BINDInstall.pch"

-	-@erase "$(INTDIR)\BINDInstall.res"

-	-@erase "$(INTDIR)\BINDInstallDlg.obj"

-	-@erase "$(INTDIR)\DirBrowse.obj"

-	-@erase "$(INTDIR)\ntgroups.obj"

-	-@erase "$(INTDIR)\StdAfx.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\VersionInfo.obj"

-	-@erase "..\..\..\Build\Release\BINDInstall.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG" /d "_AFXDLL" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\AccountInfo.obj" \

-	"$(INTDIR)\BINDInstall.obj" \

-	"$(INTDIR)\BINDInstallDlg.obj" \

-	"$(INTDIR)\DirBrowse.obj" \

-	"$(INTDIR)\ntgroups.obj" \

-	"$(INTDIR)\StdAfx.obj" \

-	"$(INTDIR)\VersionInfo.obj" \

-	"$(INTDIR)\BINDInstall.res"

-

-"..\..\..\Build\Release\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\BINDInstall.exe" "$(OUTDIR)\BINDInstall.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\AccountInfo.obj"

-	-@erase "$(INTDIR)\AccountInfo.sbr"

-	-@erase "$(INTDIR)\BINDInstall.obj"

-	-@erase "$(INTDIR)\BINDInstall.pch"

-	-@erase "$(INTDIR)\BINDInstall.res"

-	-@erase "$(INTDIR)\BINDInstall.sbr"

-	-@erase "$(INTDIR)\BINDInstallDlg.obj"

-	-@erase "$(INTDIR)\BINDInstallDlg.sbr"

-	-@erase "$(INTDIR)\DirBrowse.obj"

-	-@erase "$(INTDIR)\DirBrowse.sbr"

-	-@erase "$(INTDIR)\ntgroups.obj"

-	-@erase "$(INTDIR)\ntgroups.sbr"

-	-@erase "$(INTDIR)\StdAfx.obj"

-	-@erase "$(INTDIR)\StdAfx.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\VersionInfo.obj"

-	-@erase "$(INTDIR)\VersionInfo.sbr"

-	-@erase "$(OUTDIR)\BINDInstall.bsc"

-	-@erase "..\..\..\Build\Debug\BINDInstall.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG" /d "_AFXDLL" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\AccountInfo.sbr" \

-	"$(INTDIR)\BINDInstall.sbr" \

-	"$(INTDIR)\BINDInstallDlg.sbr" \

-	"$(INTDIR)\DirBrowse.sbr" \

-	"$(INTDIR)\ntgroups.sbr" \

-	"$(INTDIR)\StdAfx.sbr" \

-	"$(INTDIR)\VersionInfo.sbr"

-

-"$(OUTDIR)\BINDInstall.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\AccountInfo.obj" \

-	"$(INTDIR)\BINDInstall.obj" \

-	"$(INTDIR)\BINDInstallDlg.obj" \

-	"$(INTDIR)\DirBrowse.obj" \

-	"$(INTDIR)\ntgroups.obj" \

-	"$(INTDIR)\StdAfx.obj" \

-	"$(INTDIR)\VersionInfo.obj" \

-	"$(INTDIR)\BINDInstall.res"

-

-"..\..\..\Build\Debug\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("BINDInstall.dep")

-!INCLUDE "BINDInstall.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "BINDInstall.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "BINDInstall - Win32 Release" || "$(CFG)" == "BINDInstall - Win32 Debug"

-SOURCE=.\AccountInfo.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-

-"$(INTDIR)\AccountInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-

-"$(INTDIR)\AccountInfo.obj"	"$(INTDIR)\AccountInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ENDIF 

-

-SOURCE=.\BINDInstall.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-

-"$(INTDIR)\BINDInstall.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-

-"$(INTDIR)\BINDInstall.obj"	"$(INTDIR)\BINDInstall.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ENDIF 

-

-SOURCE=.\BINDInstallDlg.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-

-"$(INTDIR)\BINDInstallDlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-

-"$(INTDIR)\BINDInstallDlg.obj"	"$(INTDIR)\BINDInstallDlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ENDIF 

-

-SOURCE=.\DirBrowse.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-

-"$(INTDIR)\DirBrowse.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-

-"$(INTDIR)\DirBrowse.obj"	"$(INTDIR)\DirBrowse.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ENDIF 

-

-SOURCE=..\..\..\lib\isc\win32\ntgroups.c

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 

-

-"$(INTDIR)\ntgroups.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 

-

-"$(INTDIR)\ntgroups.obj"	"$(INTDIR)\ntgroups.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ENDIF 

-

-SOURCE=.\StdAfx.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 

-

-"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 

-

-"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\StdAfx.sbr"	"$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ENDIF 

-

-SOURCE=.\VersionInfo.cpp

-

-!IF  "$(CFG)" == "BINDInstall - Win32 Release"

-

-

-"$(INTDIR)\VersionInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

-

-

-"$(INTDIR)\VersionInfo.obj"	"$(INTDIR)\VersionInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"

-

-

-!ENDIF 

-

-SOURCE=.\BINDInstall.rc

-

-"$(INTDIR)\BINDInstall.res" : $(SOURCE) "$(INTDIR)"

-	$(RSC) $(RSC_PROJ) $(SOURCE)

-

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on BINDInstall.dsp
+!IF "$(CFG)" == ""
+CFG=BINDInstall - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to BINDInstall - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "BINDInstall - Win32 Release" && "$(CFG)" != "BINDInstall - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\BINDInstall.exe"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\AccountInfo.obj"
+	-@erase "$(INTDIR)\BINDInstall.obj"
+	-@erase "$(INTDIR)\BINDInstall.pch"
+	-@erase "$(INTDIR)\BINDInstall.res"
+	-@erase "$(INTDIR)\BINDInstallDlg.obj"
+	-@erase "$(INTDIR)\DirBrowse.obj"
+	-@erase "$(INTDIR)\ntgroups.obj"
+	-@erase "$(INTDIR)\StdAfx.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\VersionInfo.obj"
+	-@erase "..\..\..\Build\Release\BINDInstall.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG" /d "_AFXDLL" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\AccountInfo.obj" \
+	"$(INTDIR)\BINDInstall.obj" \
+	"$(INTDIR)\BINDInstallDlg.obj" \
+	"$(INTDIR)\DirBrowse.obj" \
+	"$(INTDIR)\ntgroups.obj" \
+	"$(INTDIR)\StdAfx.obj" \
+	"$(INTDIR)\VersionInfo.obj" \
+	"$(INTDIR)\BINDInstall.res"
+
+"..\..\..\Build\Release\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\BINDInstall.exe" "$(OUTDIR)\BINDInstall.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\AccountInfo.obj"
+	-@erase "$(INTDIR)\AccountInfo.sbr"
+	-@erase "$(INTDIR)\BINDInstall.obj"
+	-@erase "$(INTDIR)\BINDInstall.pch"
+	-@erase "$(INTDIR)\BINDInstall.res"
+	-@erase "$(INTDIR)\BINDInstall.sbr"
+	-@erase "$(INTDIR)\BINDInstallDlg.obj"
+	-@erase "$(INTDIR)\BINDInstallDlg.sbr"
+	-@erase "$(INTDIR)\DirBrowse.obj"
+	-@erase "$(INTDIR)\DirBrowse.sbr"
+	-@erase "$(INTDIR)\ntgroups.obj"
+	-@erase "$(INTDIR)\ntgroups.sbr"
+	-@erase "$(INTDIR)\StdAfx.obj"
+	-@erase "$(INTDIR)\StdAfx.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\VersionInfo.obj"
+	-@erase "$(INTDIR)\VersionInfo.sbr"
+	-@erase "$(OUTDIR)\BINDInstall.bsc"
+	-@erase "..\..\..\Build\Debug\BINDInstall.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG" /d "_AFXDLL" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\AccountInfo.sbr" \
+	"$(INTDIR)\BINDInstall.sbr" \
+	"$(INTDIR)\BINDInstallDlg.sbr" \
+	"$(INTDIR)\DirBrowse.sbr" \
+	"$(INTDIR)\ntgroups.sbr" \
+	"$(INTDIR)\StdAfx.sbr" \
+	"$(INTDIR)\VersionInfo.sbr"
+
+"$(OUTDIR)\BINDInstall.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\AccountInfo.obj" \
+	"$(INTDIR)\BINDInstall.obj" \
+	"$(INTDIR)\BINDInstallDlg.obj" \
+	"$(INTDIR)\DirBrowse.obj" \
+	"$(INTDIR)\ntgroups.obj" \
+	"$(INTDIR)\StdAfx.obj" \
+	"$(INTDIR)\VersionInfo.obj" \
+	"$(INTDIR)\BINDInstall.res"
+
+"..\..\..\Build\Debug\BINDInstall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("BINDInstall.dep")
+!INCLUDE "BINDInstall.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "BINDInstall.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "BINDInstall - Win32 Release" || "$(CFG)" == "BINDInstall - Win32 Debug"
+SOURCE=.\AccountInfo.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+
+"$(INTDIR)\AccountInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+
+"$(INTDIR)\AccountInfo.obj"	"$(INTDIR)\AccountInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ENDIF 
+
+SOURCE=.\BINDInstall.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+
+"$(INTDIR)\BINDInstall.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+
+"$(INTDIR)\BINDInstall.obj"	"$(INTDIR)\BINDInstall.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ENDIF 
+
+SOURCE=.\BINDInstallDlg.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+
+"$(INTDIR)\BINDInstallDlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+
+"$(INTDIR)\BINDInstallDlg.obj"	"$(INTDIR)\BINDInstallDlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ENDIF 
+
+SOURCE=.\DirBrowse.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+
+"$(INTDIR)\DirBrowse.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+
+"$(INTDIR)\DirBrowse.obj"	"$(INTDIR)\DirBrowse.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ENDIF 
+
+SOURCE=..\..\..\lib\isc\win32\ntgroups.c
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+
+"$(INTDIR)\ntgroups.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+
+"$(INTDIR)\ntgroups.obj"	"$(INTDIR)\ntgroups.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF 
+
+SOURCE=.\StdAfx.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+
+"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+
+"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\StdAfx.sbr"	"$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF 
+
+SOURCE=.\VersionInfo.cpp
+
+!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+
+
+"$(INTDIR)\VersionInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+
+
+"$(INTDIR)\VersionInfo.obj"	"$(INTDIR)\VersionInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
+
+
+!ENDIF 
+
+SOURCE=.\BINDInstall.rc
+
+"$(INTDIR)\BINDInstall.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 511ab6e8..adc040ae 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.12 2005/10/11 23:54:48 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.14 2006/02/26 22:28:36 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -416,26 +416,28 @@ void CBINDInstallDlg::OnInstall() {
 	}
 	
 	/*
-	 * Check that the Password is not null.
-	 */
-	if (m_accountPassword.GetLength() == 0) {
-		MsgBox(IDS_ERR_NULLPASSWORD);
-		return;
-	}
-
-	/*
 	 * Check the entered account name.
 	 */
 	if (ValidateServiceAccount() == FALSE)
 		return;
 
-
 	/*
 	 * For Registration we need to know if account was changed.
 	 */
-	if(m_accountName != m_currentAccount)
+	if (m_accountName != m_currentAccount)
 		m_accountUsed = FALSE;
 
+	if (m_accountUsed == FALSE && m_serviceExists == FALSE)
+	{
+	/*
+	 * Check that the Password is not null.
+	 */
+		if (m_accountPassword.GetLength() == 0) {
+			MsgBox(IDS_ERR_NULLPASSWORD);
+			return;
+		}
+	}
+
 	/* Directories */
 	m_etcDir = m_targetDir + "\\etc";
 	m_binDir = m_targetDir + "\\bin";
diff --git a/config.h.in b/config.h.in
index 4c1557d3..5ab6174a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.47.2.3.2.20 2005/10/20 23:57:38 marka Exp $ */
+/* $Id: config.h.in,v 1.47.2.3.2.24 2006/03/01 02:41:36 marka Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -146,9 +146,22 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define if threads need PTHREAD_SCOPE_SYSTEM */
 #undef NEED_PTHREAD_SCOPE_SYSTEM
 
+/* Define if recvmsg() does not meet all of the BSD socket API specifications.
+   */
+#undef BROKEN_RECVMSG
+
+/* Define if you cannot bind() before connect() for TCP sockets. */
+#undef BROKEN_TCP_BIND_BEFORE_CONNECT
+
+/* Define if libcrypto has DH_generate_parameters */
+#undef HAVE_DH_GENERATE_PARAMETERS
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define if libcrypto has DSA_generate_parameters */
+#undef HAVE_DSA_GENERATE_PARAMETERS
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -182,6 +195,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <net/if6.h> header file. */
 #undef HAVE_NET_IF6_H
 
+/* Define if libcrypto has RSA_generate_key */
+#undef HAVE_RSA_GENERATE_KEY
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/config.h.win32 b/config.h.win32
index c55f04f0..ec409aa1 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.6.12.5 2004/04/29 05:12:04 marka Exp $ */
+/* $Id: config.h.win32,v 1.6.12.7 2006/05/26 01:42:54 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -104,6 +104,15 @@
 /* Define if you have h_errno */
 #define HAVE_H_ERRNO
 
+/* Define if libcrypto has RSA_generate_key */
+#define HAVE_RSA_GENERATE_KEY
+
+/* Define if libcrypto has DSA_generate_parameters */
+#define HAVE_DSA_GENERATE_PARAMETERS
+ 
+/* Define if libcrypto has DH_generate_parameters */
+#define HAVE_DH_GENERATE_PARAMETERS
+
 #define ISC_PLATFORM_NEEDSTRLCAT
 
 #define ISC_PLATFORM_NEEDSTRLCPY
diff --git a/configure b/configure
index d19a17c4..cc3b5d58 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1996-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.284.2.19.2.47 2005/10/20 23:57:38 marka Exp $
+# $Id: configure,v 1.284.2.19.2.55 2006/03/06 01:11:48 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.294.2.23.2.51 .
+# From configure.in Revision: 1.294.2.23.2.60 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -495,7 +495,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STD_CINCLUDES STD_CDEFINES STD_CWARNINGS CCOPT AR ARFLAGS LN ETAGS PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP ISC_SOCKADDR_LEN_T ISC_PLATFORM_HAVELONGLONG ISC_PLATFORM_HAVELIFCONF ISC_PLATFORM_NEEDSYSSELECTH LWRES_PLATFORM_NEEDSYSSELECTH USE_OPENSSL DST_OPENSSL_INC USE_GSSAPI DST_GSSAPI_INC DNS_CRYPTO_LIBS ALWAYS_DEFINES ISC_PLATFORM_USETHREADS ISC_THREAD_DIR MKDEPCC MKDEPCFLAGS MKDEPPROG IRIX_DNSSEC_WARNINGS_HACK purify_path PURIFY LN_S ECHO ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL O A SA LIBTOOL_MKDEP_SED LIBTOOL_MODE_COMPILE LIBTOOL_MODE_INSTALL LIBTOOL_MODE_LINK LIBTOOL_ALLOW_UNDEFINED LIBTOOL_IN_MAIN LIBBIND ISC_PLATFORM_HAVEIPV6 LWRES_PLATFORM_HAVEIPV6 ISC_PLATFORM_NEEDNETINETIN6H LWRES_PLATFORM_NEEDNETINETIN6H ISC_PLATFORM_NEEDNETINET6IN6H LWRES_PLATFORM_NEEDNETINET6IN6H ISC_PLATFORM_HAVEINADDR6 LWRES_PLATFORM_HAVEINADDR6 ISC_PLATFORM_NEEDIN6ADDRANY LWRES_PLATFORM_NEEDIN6ADDRANY ISC_PLATFORM_NEEDIN6ADDRLOOPBACK LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK ISC_PLATFORM_HAVEIN6PKTINFO ISC_PLATFORM_FIXIN6ISADDR ISC_IPV6_H ISC_IPV6_O ISC_ISCIPV6_O ISC_IPV6_C LWRES_HAVE_SIN6_SCOPE_ID ISC_PLATFORM_HAVESCOPEID ISC_PLATFORM_HAVEIF_LADDRREQ ISC_PLATFORM_HAVEIF_LADDRCONF ISC_PLATFORM_NEEDNTOP ISC_PLATFORM_NEEDPTON ISC_PLATFORM_NEEDATON ISC_PLATFORM_HAVESALEN LWRES_PLATFORM_HAVESALEN ISC_PLATFORM_MSGHDRFLAVOR ISC_PLATFORM_NEEDPORTT ISC_LWRES_NEEDADDRINFO ISC_LWRES_NEEDRRSETINFO ISC_LWRES_SETHOSTENTINT ISC_LWRES_ENDHOSTENTINT ISC_LWRES_GETNETBYADDRINADDR ISC_LWRES_SETNETENTINT ISC_LWRES_ENDNETENTINT ISC_LWRES_GETHOSTBYADDRVOID ISC_LWRES_NEEDHERRNO ISC_LWRES_GETIPNODEPROTO ISC_LWRES_GETADDRINFOPROTO ISC_LWRES_GETNAMEINFOPROTO ISC_PLATFORM_NEEDSTRSEP ISC_PLATFORM_NEEDMEMMOVE ISC_PLATFORM_NEEDSTRTOUL LWRES_PLATFORM_NEEDSTRTOUL GENRANDOMLIB ISC_PLATFORM_NEEDSTRLCPY ISC_PLATFORM_NEEDSTRLCAT ISC_PLATFORM_NEEDSPRINTF LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDVSNPRINTF LWRES_PLATFORM_NEEDVSNPRINTF ISC_EXTRA_OBJS ISC_EXTRA_SRCS ISC_PLATFORM_QUADFORMAT LWRES_PLATFORM_QUADFORMAT ISC_PLATFORM_RLIMITTYPE ISC_PLATFORM_USEDECLSPEC LWRES_PLATFORM_USEDECLSPEC ISC_PLATFORM_BRACEPTHREADONCEINIT ISC_PLATFORM_HAVEIFNAMETOINDEX LATEX PDFLATEX XSLTPROC XMLLINT XSLT_DOCBOOK_STYLE_HTML XSLT_DOCBOOK_STYLE_XHTML XSLT_DOCBOOK_STYLE_MAN XSLT_DOCBOOK_CHUNK_HTML XSLT_DOCBOOK_CHUNK_XHTML XSLT_DB2LATEX_STYLE XSLT_DB2LATEX_ADMONITIONS BIND9_TOP_BUILDDIR BIND9_ISC_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE BIND9_ISCCFG_BUILDINCLUDE BIND9_DNS_BUILDINCLUDE BIND9_LWRES_BUILDINCLUDE BIND9_BIND9_BUILDINCLUDE BIND9_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STD_CINCLUDES STD_CDEFINES STD_CWARNINGS CCOPT AR ARFLAGS LN ETAGS PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP ISC_SOCKADDR_LEN_T ISC_PLATFORM_HAVELONGLONG ISC_PLATFORM_HAVELIFCONF ISC_PLATFORM_NEEDSYSSELECTH LWRES_PLATFORM_NEEDSYSSELECTH USE_OPENSSL DST_OPENSSL_INC USE_GSSAPI DST_GSSAPI_INC DNS_CRYPTO_LIBS ALWAYS_DEFINES ISC_PLATFORM_USETHREADS ISC_THREAD_DIR MKDEPCC MKDEPCFLAGS MKDEPPROG IRIX_DNSSEC_WARNINGS_HACK purify_path PURIFY LN_S ECHO ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL O A SA LIBTOOL_MKDEP_SED LIBTOOL_MODE_COMPILE LIBTOOL_MODE_INSTALL LIBTOOL_MODE_LINK LIBTOOL_ALLOW_UNDEFINED LIBTOOL_IN_MAIN LIBBIND ISC_PLATFORM_HAVEIPV6 LWRES_PLATFORM_HAVEIPV6 ISC_PLATFORM_NEEDNETINETIN6H LWRES_PLATFORM_NEEDNETINETIN6H ISC_PLATFORM_NEEDNETINET6IN6H LWRES_PLATFORM_NEEDNETINET6IN6H ISC_PLATFORM_HAVEINADDR6 LWRES_PLATFORM_HAVEINADDR6 ISC_PLATFORM_NEEDIN6ADDRANY LWRES_PLATFORM_NEEDIN6ADDRANY ISC_PLATFORM_NEEDIN6ADDRLOOPBACK LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK ISC_PLATFORM_HAVEIN6PKTINFO ISC_PLATFORM_FIXIN6ISADDR ISC_IPV6_H ISC_IPV6_O ISC_ISCIPV6_O ISC_IPV6_C LWRES_HAVE_SIN6_SCOPE_ID ISC_PLATFORM_HAVESCOPEID ISC_PLATFORM_HAVEIF_LADDRREQ ISC_PLATFORM_HAVEIF_LADDRCONF ISC_PLATFORM_NEEDNTOP ISC_PLATFORM_NEEDPTON ISC_PLATFORM_NEEDATON ISC_PLATFORM_HAVESALEN LWRES_PLATFORM_HAVESALEN ISC_PLATFORM_MSGHDRFLAVOR ISC_PLATFORM_NEEDPORTT ISC_LWRES_NEEDADDRINFO ISC_LWRES_NEEDRRSETINFO ISC_LWRES_SETHOSTENTINT ISC_LWRES_ENDHOSTENTINT ISC_LWRES_GETNETBYADDRINADDR ISC_LWRES_SETNETENTINT ISC_LWRES_ENDNETENTINT ISC_LWRES_GETHOSTBYADDRVOID ISC_LWRES_NEEDHERRNO ISC_LWRES_GETIPNODEPROTO ISC_LWRES_GETADDRINFOPROTO ISC_LWRES_GETNAMEINFOPROTO ISC_PLATFORM_NEEDSTRSEP ISC_PLATFORM_NEEDMEMMOVE ISC_PLATFORM_NEEDSTRTOUL LWRES_PLATFORM_NEEDSTRTOUL GENRANDOMLIB ISC_PLATFORM_NEEDSTRLCPY ISC_PLATFORM_NEEDSTRLCAT ISC_PLATFORM_NEEDSPRINTF LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDVSNPRINTF LWRES_PLATFORM_NEEDVSNPRINTF ISC_EXTRA_OBJS ISC_EXTRA_SRCS ISC_PLATFORM_QUADFORMAT LWRES_PLATFORM_QUADFORMAT ISC_PLATFORM_RLIMITTYPE ISC_PLATFORM_USEDECLSPEC LWRES_PLATFORM_USEDECLSPEC ISC_PLATFORM_BRACEPTHREADONCEINIT ISC_PLATFORM_HAVEIFNAMETOINDEX LATEX PDFLATEX XSLTPROC XMLLINT XSLT_DOCBOOK_STYLE_HTML XSLT_DOCBOOK_STYLE_XHTML XSLT_DOCBOOK_STYLE_MAN XSLT_DOCBOOK_CHUNK_HTML XSLT_DOCBOOK_CHUNK_XHTML XSLT_DB2LATEX_STYLE XSLT_DB2LATEX_ADMONITIONS BIND9_TOP_BUILDDIR BIND9_ISC_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE BIND9_ISCCFG_BUILDINCLUDE BIND9_DNS_BUILDINCLUDE BIND9_LWRES_BUILDINCLUDE BIND9_BIND9_BUILDINCLUDE BIND9_VERSION BUILD_CC BUILD_CFLAGS BUILD_CPPFLAGS BUILD_LDFLAGS BUILD_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files='BIND9_MAKE_INCLUDES BIND9_MAKE_RULES LIBISC_API LIBISCCC_API LIBISCCFG_API LIBDNS_API LIBBIND9_API LIBLWRES_API'
 
 # Initialize some variables set by options.
@@ -4873,6 +4873,9 @@ echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-op
 			*-solaris*)
 				DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
 				;;
+			*-hp-hpux*)
+				DNS_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
+				;;
 			*)
 				DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
 				;;
@@ -5046,6 +5049,300 @@ fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 
+		echo "$as_me:$LINENO: checking for DH_generate_parameters" >&5
+echo $ECHO_N "checking for DH_generate_parameters... $ECHO_C" >&6
+if test "${ac_cv_func_DH_generate_parameters+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define DH_generate_parameters to an innocuous variant, in case <limits.h> declares DH_generate_parameters.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define DH_generate_parameters innocuous_DH_generate_parameters
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char DH_generate_parameters (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef DH_generate_parameters
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char DH_generate_parameters ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_DH_generate_parameters) || defined (__stub___DH_generate_parameters)
+choke me
+#else
+char (*f) () = DH_generate_parameters;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != DH_generate_parameters;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_DH_generate_parameters=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_DH_generate_parameters=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_DH_generate_parameters" >&5
+echo "${ECHO_T}$ac_cv_func_DH_generate_parameters" >&6
+if test $ac_cv_func_DH_generate_parameters = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DH_GENERATE_PARAMETERS 1
+_ACEOF
+
+fi
+
+		echo "$as_me:$LINENO: checking for RSA_generate_key" >&5
+echo $ECHO_N "checking for RSA_generate_key... $ECHO_C" >&6
+if test "${ac_cv_func_RSA_generate_key+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define RSA_generate_key to an innocuous variant, in case <limits.h> declares RSA_generate_key.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define RSA_generate_key innocuous_RSA_generate_key
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char RSA_generate_key (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef RSA_generate_key
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char RSA_generate_key ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_RSA_generate_key) || defined (__stub___RSA_generate_key)
+choke me
+#else
+char (*f) () = RSA_generate_key;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != RSA_generate_key;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_RSA_generate_key=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_RSA_generate_key=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_RSA_generate_key" >&5
+echo "${ECHO_T}$ac_cv_func_RSA_generate_key" >&6
+if test $ac_cv_func_RSA_generate_key = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RSA_GENERATE_KEY 1
+_ACEOF
+
+fi
+
+		echo "$as_me:$LINENO: checking for DSA_generate_parameters" >&5
+echo $ECHO_N "checking for DSA_generate_parameters... $ECHO_C" >&6
+if test "${ac_cv_func_DSA_generate_parameters+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define DSA_generate_parameters to an innocuous variant, in case <limits.h> declares DSA_generate_parameters.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define DSA_generate_parameters innocuous_DSA_generate_parameters
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char DSA_generate_parameters (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef DSA_generate_parameters
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char DSA_generate_parameters ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_DSA_generate_parameters) || defined (__stub___DSA_generate_parameters)
+choke me
+#else
+char (*f) () = DSA_generate_parameters;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != DSA_generate_parameters;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_DSA_generate_parameters=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_DSA_generate_parameters=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_DSA_generate_parameters" >&5
+echo "${ECHO_T}$ac_cv_func_DSA_generate_parameters" >&6
+if test $ac_cv_func_DSA_generate_parameters = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DSA_GENERATE_PARAMETERS 1
+_ACEOF
+
+fi
+
 #
 #	OpenSSLDie is new with CERT CS-2002-23.  If we see it we have may
 #	have a patched library otherwise check that we are greater than
@@ -7169,7 +7466,7 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
-	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat"
+	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
 	case "$host" in
 	*-hp-hpux*)
 		LDFLAGS="-Wl,+vnocompatwarnings $LDFLAGS"
@@ -8139,7 +8436,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8142 "configure"' > conftest.$ac_ext
+  echo '#line 8439 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9136,7 +9433,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:9139:" \
+echo "$as_me:9436:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10197,11 +10494,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10200: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10497: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10204: \$? = $ac_status" >&5
+   echo "$as_me:10501: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10440,11 +10737,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10740: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10447: \$? = $ac_status" >&5
+   echo "$as_me:10744: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10500,11 +10797,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10800: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10507: \$? = $ac_status" >&5
+   echo "$as_me:10804: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12685,7 +12982,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12688 "configure"
+#line 12985 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12783,7 +13080,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12786 "configure"
+#line 13083 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12887,7 +13184,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 fi
 
 
-# Report which librarie types wil actually be built
+# Report which libraries types will actually be built
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -14980,11 +15277,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14983: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15280: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14987: \$? = $ac_status" >&5
+   echo "$as_me:15284: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15040,11 +15337,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15043: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15340: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15047: \$? = $ac_status" >&5
+   echo "$as_me:15344: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16401,7 +16698,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16404 "configure"
+#line 16701 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16499,7 +16796,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16502 "configure"
+#line 16799 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17336,11 +17633,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17339: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17343: \$? = $ac_status" >&5
+   echo "$as_me:17640: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17396,11 +17693,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17399: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17696: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17403: \$? = $ac_status" >&5
+   echo "$as_me:17700: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19435,11 +19732,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19438: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19735: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19442: \$? = $ac_status" >&5
+   echo "$as_me:19739: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19678,11 +19975,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19681: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19978: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19685: \$? = $ac_status" >&5
+   echo "$as_me:19982: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19738,11 +20035,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19741: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20038: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19745: \$? = $ac_status" >&5
+   echo "$as_me:20042: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21923,7 +22220,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21926 "configure"
+#line 22223 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22021,7 +22318,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22024 "configure"
+#line 22321 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -25589,12 +25886,12 @@ echo "$as_me:$LINENO: result: $ac_cv_func_strtoul" >&5
 echo "${ECHO_T}$ac_cv_func_strtoul" >&6
 if test $ac_cv_func_strtoul = yes; then
   ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
+	 LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL"
 	 GENRANDOMLIB=""
 else
   ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 "GENRANDOMLIB=${ISCLIBS}"
+	 LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1"
+	 GENRANDOMLIB="${ISCLIBS}"
 fi
 
 
@@ -26696,6 +26993,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+GEN_NEED_OPTARG="-DNEED_OPTARG=1"
 
 cat >>confdefs.h <<\_ACEOF
 #define NEED_OPTARG 1
@@ -27072,6 +27370,20 @@ fi
 esac
 
 #
+# Some hosts need msg_namelen to match the size of the socket structure.
+# Some hosts don't set msg_namelen appropriately on return from recvmsg().
+#
+case $host in
+*os2*|*hp-mpeix*)
+
+cat >>confdefs.h <<\_ACEOF
+#define BROKEN_RECVMSG 1
+_ACEOF
+
+	;;
+esac
+
+#
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.
 #
@@ -27368,6 +27680,19 @@ _ACEOF
 	;;
 esac
 #
+# Solaris 2.5.1 and earlier cannot bind() then connect() a TCP socket.
+# This prevents the source address being set.
+#
+case "$host" in
+*-solaris2.[012345]|*-solaris2.5.1)
+
+cat >>confdefs.h <<\_ACEOF
+#define BROKEN_TCP_BIND_BEFORE_CONNECT 1
+_ACEOF
+
+	;;
+esac
+#
 # The following sections deal with tools used for formatting
 # the documentation.  They are all optional, unless you are
 # a developer editing the documentation source.
@@ -27825,6 +28150,30 @@ LIBBIND9_API=$srcdir/lib/bind9/api
 
 LIBLWRES_API=$srcdir/lib/lwres/api
 
+if test "cross_compiling" = "yes"; then
+	if test -z "$BUILD_CC"; then
+		{ { echo "$as_me:$LINENO: error: BUILD_CC not set" >&5
+echo "$as_me: error: BUILD_CC not set" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	BUILD_CFLAGS="$BUILD_CFLAGS"
+	BUILD_CPPFLAGS="$BUILD_CPPFLAGS"
+	BUILD_LDFLAGS="$BUILD_LDFLAGS"
+	BUILD_LIBS="$BUILD_LIBS"
+else
+	BUILD_CC="$CC"
+	BUILD_CFLAGS="$CFLAGS"
+	BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
+	BUILD_LDFLAGS="$LDFLAGS"
+	BUILD_LIBS="$LIBS"
+fi
+
+
+
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         ac_config_files="$ac_config_files make/rules make/includes Makefile make/Makefile make/mkdep lib/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/nls/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile bin/Makefile bin/check/Makefile bin/named/Makefile bin/named/unix/Makefile bin/rndc/Makefile bin/rndc/unix/Makefile bin/dig/Makefile bin/nsupdate/Makefile bin/tests/Makefile bin/tests/names/Makefile bin/tests/master/Makefile bin/tests/rbt/Makefile bin/tests/db/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/lwresd/Makefile bin/tests/system/tkey/Makefile bin/tests/headerdep_test.sh bin/dnssec/Makefile doc/Makefile doc/arm/Makefile doc/misc/Makefile doc/xsl/Makefile isc-config.sh doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -28667,6 +29016,11 @@ s,@BIND9_DNS_BUILDINCLUDE@,$BIND9_DNS_BUILDINCLUDE,;t t
 s,@BIND9_LWRES_BUILDINCLUDE@,$BIND9_LWRES_BUILDINCLUDE,;t t
 s,@BIND9_BIND9_BUILDINCLUDE@,$BIND9_BIND9_BUILDINCLUDE,;t t
 s,@BIND9_VERSION@,$BIND9_VERSION,;t t
+s,@BUILD_CC@,$BUILD_CC,;t t
+s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
+s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
+s,@BUILD_LIBS@,$BUILD_LIBS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 /@BIND9_MAKE_INCLUDES@/r $BIND9_MAKE_INCLUDES
diff --git a/configure.in b/configure.in
index b14b489b..439a15ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.294.2.23.2.51 $)
+AC_REVISION($Revision: 1.294.2.23.2.60 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -416,6 +416,9 @@ case "$use_openssl" in
 			*-solaris*)
 				DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto"
 				;;
+			*-hp-hpux*)
+				DNS_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
+				;;
 			*)
 				DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
 				;;
@@ -462,6 +465,15 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
 		[AC_MSG_RESULT(assuming it does work on target platform)]
 		)
 		 
+		AC_CHECK_FUNC(DH_generate_parameters,
+			      AC_DEFINE(HAVE_DH_GENERATE_PARAMETERS, 1,
+					[Define if libcrypto has DH_generate_parameters]))
+		AC_CHECK_FUNC(RSA_generate_key,
+			      AC_DEFINE(HAVE_RSA_GENERATE_KEY, 1,
+					[Define if libcrypto has RSA_generate_key]))
+		AC_CHECK_FUNC(DSA_generate_parameters,
+			      AC_DEFINE(HAVE_DSA_GENERATE_PARAMETERS, 1,
+					[Define if libcrypto has DSA_generate_parameters]))
 #
 #	OpenSSLDie is new with CERT CS-2002-23.  If we see it we have may
 #	have a patched library otherwise check that we are greater than
@@ -789,7 +801,7 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
-	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat"
+	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -Wpointer-arith"
 	case "$host" in
 	*-hp-hpux*)
 		LDFLAGS="-Wl,+vnocompatwarnings $LDFLAGS"
@@ -1567,11 +1579,11 @@ AC_SUBST(ISC_PLATFORM_NEEDMEMMOVE)
 
 AC_CHECK_FUNC(strtoul,
 	[ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
+	 LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL"
 	 GENRANDOMLIB=""],
 	[ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 "GENRANDOMLIB=${ISCLIBS}"])
+	 LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1"
+	 GENRANDOMLIB="${ISCLIBS}"])
 AC_SUBST(ISC_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(LWRES_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(GENRANDOMLIB)
@@ -1686,6 +1698,7 @@ AC_TRY_COMPILE([
 [optarg = 0;],
 [AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)
+GEN_NEED_OPTARG="-DNEED_OPTARG=1"
 AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])])
 
 #
@@ -1749,6 +1762,17 @@ case "$host" in
 esac
 
 #
+# Some hosts need msg_namelen to match the size of the socket structure.
+# Some hosts don't set msg_namelen appropriately on return from recvmsg().
+#
+case $host in
+*os2*|*hp-mpeix*)
+	AC_DEFINE(BROKEN_RECVMSG, 1,
+		  [Define if recvmsg() does not meet all of the BSD socket API specifications.])
+	;;
+esac
+
+#
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.
 #
@@ -1861,6 +1885,16 @@ case "$host" in
 	;;
 esac
 #
+# Solaris 2.5.1 and earlier cannot bind() then connect() a TCP socket.
+# This prevents the source address being set.
+#
+case "$host" in
+*-solaris2.[[012345]]|*-solaris2.5.1)
+	AC_DEFINE(BROKEN_TCP_BIND_BEFORE_CONNECT, 1,
+		  [Define if you cannot bind() before connect() for TCP sockets.])
+	;;
+esac
+#
 # The following sections deal with tools used for formatting
 # the documentation.  They are all optional, unless you are
 # a developer editing the documentation source.
@@ -2036,6 +2070,28 @@ LIBBIND9_API=$srcdir/lib/bind9/api
 AC_SUBST_FILE(LIBLWRES_API)
 LIBLWRES_API=$srcdir/lib/lwres/api
 
+if test "cross_compiling" = "yes"; then
+	if test -z "$BUILD_CC"; then
+		AC_ERROR([BUILD_CC not set])
+	fi
+	BUILD_CFLAGS="$BUILD_CFLAGS"
+	BUILD_CPPFLAGS="$BUILD_CPPFLAGS"
+	BUILD_LDFLAGS="$BUILD_LDFLAGS"
+	BUILD_LIBS="$BUILD_LIBS"
+else
+	BUILD_CC="$CC" 
+	BUILD_CFLAGS="$CFLAGS" 
+	BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
+	BUILD_LDFLAGS="$LDFLAGS"
+	BUILD_LIBS="$LIBS"
+fi
+
+AC_SUBST(BUILD_CC)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_CPPFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
+AC_SUBST(BUILD_LIBS)
+
 AC_OUTPUT(
 	make/rules
 	make/includes
diff --git a/contrib/dbus/GetForwarders b/contrib/dbus/GetForwarders
new file mode 100755
index 00000000..838706d4
--- /dev/null
+++ b/contrib/dbus/GetForwarders
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+#  This script uses the named D-BUS support, which must be enabled in
+#  the running named with the named '-D' option, to get and print the
+#  list of forwarding zones in the running server.
+# 
+#  It accepts an optional <zone> first argument which is the DNS name 
+#  of the zone whose forwarders (if any) will be retrieved.
+#
+#  If no zone argument is specified, all forwarding zones will be listed.
+#
+#  Usage: GetForwarders [ <zone> ] 
+# 
+#  Copyright(C) Jason Vas Dias<jvdias@redhat.com> Red Hat Inc. 2005
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation at 
+#           http://www.fsf.org/licensing/licenses/gpl.txt
+#  and included in this software distribution as the "LICENSE" file.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+zone=''
+if [ $# -gt 0 ]; then 
+   zone="string:$1";
+fi
+dbus-send --system --type=method_call --print-reply --reply-timeout=20000 --dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders $zone;
diff --git a/contrib/dbus/INSTALL b/contrib/dbus/INSTALL
new file mode 100644
index 00000000..2ad526e9
--- /dev/null
+++ b/contrib/dbus/INSTALL
@@ -0,0 +1,9 @@
+To build named with D-BUS support, run
+# make
+in this directory.
+Then cd to the top-level BIND source directory,
+(../..), and 
+# ./configure ...; make
+After building, cd back to contrib/dbus and run:
+# make install
+as root to install the D-BUS configuration files. 
diff --git a/contrib/dbus/Makefile b/contrib/dbus/Makefile
new file mode 100644
index 00000000..62850344
--- /dev/null
+++ b/contrib/dbus/Makefile
@@ -0,0 +1,20 @@
+# contrib/dbus/Makefile
+# 
+# This Makefile will install D-BUS support into the ISC BIND 9.3.2b1+ source,
+# necessary to support dynamic forwarding table management with D-BUS, for
+# Red Hat NetworkManager support.
+#
+# After running "make" in this directory, simply run make in the top level
+# BIND source directory, and D-BUS support will be enabled.
+#
+
+all:
+	echo 'Enabling D-BUS support...'
+	@ cp -fp dbus_mgr.c dbus_service.c ../../bin/named;
+	@ cp -fp dbus_mgr.h dbus_service.h ../../bin/named/include/named;
+	@ cp -fp README.DBUS ../../doc/misc
+	@ cd ../..; patch -s -p1 -b --suffix=.dbus < contrib/dbus/bind-9.3.2b1-dbus.patch
+
+install:
+	install -o root -g root -m 640 named-dbus-system.conf /etc/dbus-1/system.d/named.conf
+	install -o root -g root -m 640 named-dbus.service /usr/share/dbus-1/services/named.service
diff --git a/contrib/dbus/README.DBUS b/contrib/dbus/README.DBUS
new file mode 100644
index 00000000..8c5c73f8
--- /dev/null
+++ b/contrib/dbus/README.DBUS
@@ -0,0 +1,259 @@
+Dynamic Management of the ISC BIND named Forwarding Table with D-BUS
+
+    Jason Vas Dias<jvdias@redhat.com>, Red Hat Inc., May 2005
+
+
+Overview:
+
+  Red Hat has developed an extension to named that is enabled during
+  rpmbuild of the bind SRPM with the option --define 'WITH_DBUS=1', 
+  and at named runtime with the -D named option.
+
+  You can obtain the latest version of the source code for the BIND
+  D-BUS extensions from:
+  
+    http://people.redhat.com/~jvdias/bind-dbus/
+
+  The Red Hat BIND D-BUS extensions allow services such as Red Hat's 
+  NetworkManager and dhcdbd (the DHCP Client controller D-Bus daemon) 
+  to tell named which name servers to forward requests to dynamically, 
+  instead of only with the "forward" and "forwarders" named.conf options. 
+ 
+  Dynamic forwarding table management allows named to be an effective
+  and efficient caching nameserver for configurations with multiple
+  wireless or VPN IP interfaces that are not always active, and whose
+  name service parameters are typically configured with DHCP.
+
+  Problems with trying to configure such systems automatically using 
+  only the libc resolver, causing conflicts over the contents of the
+  /etc/resolv.conf  file, are avoided; the resolv.conf file can contain 
+  only the users chosen search path and the single "nameserver 127.0.0.1"
+  entry.
+
+  named also provides a much more efficient, both in terms of caching
+  performance and resolving time, and much more feature rich DNS resolver 
+  than does the libc resolver library and nscd, and has the benefit of
+  existing improved IPv6 and DNSSEC support over glibc and nscd.
+
+Operation Guide for Developers:
+ 
+  Programs can access named's dynamic forward table management services
+  using D-BUS, the "service messagebus" sysv-init service that is started
+  by default at boot (see the D-BUS documentation for details).
+
+  When named is started with the -D option (by adding -D to the $OPTIONS
+  variable in /etc/sysconfig/named), named provides two D-BUS methods:
+
+  These D-BUS names are common to all named D-BUS methods:
+  D-BUS Destination 	D-BUS Path		D-BUS interface	
+  ~~~~~~~~~~~~~~~~~     ~~~~~~~~~~      	~~~~~~~~~~~~~~~ 
+  com.redhat.named      /com/redhat/named	com.redhat.named
+  
+  D-BUS Members:
+  ~~~~~~~~~~~~~~
+
+  SetForwarders ( { [ string:<domain name>,
+  ~~~~~~~~~~~~~       [ ( uint32:<nameserver IPv4 address>
+	                | array of 4 bytes :  <nameserver IPv4 address>
+	                | array of 16 bytes :  <nameserver IPv6 address>
+                        | string: <nameserver dotted-quad IPv4 or RFC2374 IPv6 address>
+	                )			
+	                [ uint16: <nameserver port>, ] 
+		        [ uint8:  <forward policy>   ]
+	              ] 
+	            ]
+                  } , ...	          
+                )
+
+   SetForwarders will create or delete members of the forwarding table.
+
+   It accepts a list of tuples of up to 4 members: only the <domain name> 
+   is required.
+  
+   If ONLY the <domain name> is specified, the forwarding entry for 
+   EXACTLY that domain name is deleted if it exists.
+
+   Only a specification of at least one <nameserver IP address> is required to
+   create a forwarding entry. 
+ 
+   The IP address can be IPv4: 
+	( 32-bit integer OR array of 4 bytes OR dotted-quad string )
+   Or IPv6:
+        ( array of 16 bytes 
+          OR  RFC 2373/4 ascii string of 8 ':' separate hex quads as supported by inet_pton(3)
+        )   
+
+   32 and 16-bit integer parameters MUST be given in network byte order; ie the IPv4 address
+   192.168.2.1 would be specified as uint32:16951488 on an i386 and port 53 would be uint16:13568.
+
+   There are an optional <port> 16-bit integer parameter, to specify the name server socket
+   address port associated with the preceding IP address, and a <forward policy> 
+   parameter, which sets the forward policy as follows:
+     0: "none" : never  forward to this nameserver for this domain.
+     1: "first": forward first to this server, and then search its authoritative data. 
+     2: "only" : always forward to this nameserver for this domain.
+ 
+   If not specified, <port> will have the value 53, and <forward policy> will be "2": "only". 
+   named's default forward policy is "first" .
+
+   Creation of forwarding domains is not "exact", as is deletion, but is "inclusive":
+   creating forwarding entry for the '.' domain sets the default set of nameservers named
+   will query for ALL domains, and creating an entry for "redhat.com" creates a set of
+   nameservers to be queried for all names suffixed by "redhat.com." . If both are specified,
+   the "redhat.com" servers will be tried first, followed by the "." servers.   
+
+   Forwarding entries are ONLY created in the first DNS View that matches the "localhost" client
+   (127.0.0.1) and destination. The default view, which exists if no views have been specified
+   in named.conf, matches ALL clients and destinations. If the user has configured views, none
+   of which match the localhost client, then no forwarding will be dynamically configurable.
+   Users are also free to configure a view that matches the localhost, for which forwarding
+   will be dynamically configurable, and other views which do not match the localhost, so that
+   other, remote clients can be served that will not be subject to dynamic forwarding. So it
+   is a fully supported configuration that users can serve authoritative data to external
+   clients and still use named's forwarding features for their localhost resolver.
+    
+   SetForwarders returns uint32:0 on success or a DBUS_ERROR message on failure .
+  
+   
+  GetForwarders ( [ string:<domain name> ] )
+  ~~~~~~~~~~~~~
+   Using the default "com.redhat.named" interface, returns the EXACT forwarding entry for
+   <domain name> as binary D-BUS types; there is also a com.redhat.named.text interface 
+   supported by GetForwarders which returns all values as string: text .
+ 
+   If a <domain name> is not specified, all forwarding table entries are dumped.
+
+   
+  Examples:
+  ~~~~~~~~
+  
+   Suppose we start out with the named.conf configuration:
+
+    
+   	options { ...
+		        forwarders { 172.16.80.118;  };
+                  ...
+	};
+
+	zone "redhat.com" {
+			forward only;
+			forwarders { 172.16.76.10; 172.16.52.28; };
+	};
+	
+   Using a "dbus-send" trivially modified to support uint16 parameters (!) :
+
+	$ dbus-send --system --type=method_call --print-reply --reply-timeout=20000 \
+		    --dest=com.redhat.named /com/redhat/named com.redhat.named.GetForwarders
+	method return sender=:1.367 -> dest=:1.368
+	 0 string "redhat.com"
+	 1 byte 2              
+	 2 uint32 172757164
+	 3 uint16 13568
+	 4 uint32 473174188
+	 5 uint16 13568
+	 6 string "."
+	 7 byte 1
+	 8 uint32 1984958636
+	 9 uint16 13568  
+
+	ie. GetForwarders always returns a list of tuples of 
+            ( <domain name>, <forward policy>, <ip address>, <port> )
+	
+  	If the "text" interface was specified:
+	
+	$ dbus-send --system --type=method_call --print-reply --reply-timeout=20000 \
+		    --dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders
+	method return sender=:1.367 -> dest=:1.370
+	 0 string "redhat.com"
+	 1 string "only"
+	 2 string "172.16.76.10"
+	 3 string "53"
+	 4 string "172.16.52.28"
+	 5 string "53"
+	 6 string "."
+	 7 string "first"
+	 8 string "172.16.80.118"
+	 9 string "53"
+
+        So we could set the default nameserver for the root zone as follows:
+   	
+	$ dbus-send --system --type=method_call --print-reply --reply-timeout=20000 \
+		--dest=com.redhat.named /com/redhat/named com.redhat.named.SetForwarders \
+		string:'.' string:'192.33.14.30' string:'2001:503:231d::2:30'
+	method return sender=:1.367 -> dest=:1.371
+	 0 uint32 0
+	$ dbus-send --system --type=method_call --print-reply --reply-timeout=20000 \
+		--dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders
+	method return sender=:1.367 -> dest=:1.372
+	 0 string "redhat.com"
+	 1 string "only"
+	 2 string "172.16.76.10"
+	 3 string "53"
+	 4 string "172.16.52.28"
+	 5 string "53"
+	 6 string "."
+	 7 string "only"
+	 8 string "192.33.14.30"
+	 9 string "53"
+	 10 string "2001:503:231d::2:30"
+	 11 string "53"
+
+   Using tcpdump one can verify that named will attempt to contact 192.33.14.30, then
+   2001:503:231d::2:30, for all zones not in redhat.com; for redhat.com zones, 172.16.76.10   
+   and 192.33.14.30 will be tried in that order.
+
+   If the D-BUS driver dbus-daemon should shut down, named will emit the syslog message:
+	 "D-BUS service disabled."
+   And will retry connecting to D-BUS every 10 seconds - once it has connected, the message:
+	 "D-BUS service enabled."
+   will be logged.
+	
+   NOTE: there are the "SetForwarders" and "GetForwarders" scripts in the contrib/dbus directory
+   of the BIND source code distribution which are wrappers around the dbus-send commands above.
+   Usage: SetForwarders [ -t first | only ] <zone> [ <server> [...<server>] ]  
+  	  GetForwarders [ <zone> ]
+         
+	
+  DHCP Integration
+  ~~~~~~~~~~~~~~~~
+
+   With the -D option, named will try to subscribe to dhcdbd, the DHCP Client D-BUS Daemon, to
+   be notified of DHCP "reason", "domain-name", "domain-name-server", "ip-address", and "subnet-mask" 
+   DHCP options when the dhclient program has received them from a DHCP server .
+
+   If it cannot subscribe to dhcdbd, named will emit the message :
+	 "D-BUS dhcdbd subscription disabled."
+   and will monitor D-BUS "NameOwnerChanged" messages for the appearance of a new owner
+   for "com.redhat.dhcp". When the name is owned, named will send a "com.redhat.dhcp.subscribe.binary"
+   message to dhcdbd to subscribe to the above options for all interfaces (provided by dhcdbd-1.5+),
+   and emit the log message:
+	 "D-BUS dhcdbd subscription enabled."
+
+   named will match on signals from the com.redhat.dhcp.subscribe.binary interface for those option
+   settings, and , when the last option is received (indicated by a "reason" of 15: END_OPTIONS), it
+   will configure the forwarding table .
+
+   For each whitespace separated member of "domain-name-servers", AND for the reverse IPv4 in-addr.arpa
+   class C or less domain of the ip-address masked by the subnet-mask, it will create a forwarding entry
+   to query each "domain-server" .
+	
+   To support CIDR-based reverse subnet forwarding, Views would have to be configured dynamically, a
+   possible future direction which is not yet implemented. (It would perhaps be easier to add a 
+   "match-queries" ACL to the forwarders table).
+          
+   When dhclient acquires a lease, named will configure forwarding, and emit the message:
+	  "D-BUS: dhclient for interface eth0 acquired new lease - creating forwarders."
+
+   When a lease expires or the interface is brought down (dhclient is stopped with dhcdbd), it
+   will revert any forwarding entries from the initial, static configuration that were modified
+   by the DHCP subscription to their initial values;  ie. if redhat.com had a forwarder configured
+   in named.conf, and then an DHCP session specified forwarders for redhat.com, when the DHCP
+   session ends the forwarders for redhat.com are reverted to their named.conf values; thus 
+   when all DHCP interfaces have released their leases, and if no SetForwarders commands were issued,
+   the forwarding configuration will be identical to that at named startup.
+
+
+ To Do:
+   - Sending signals when any Forwarding entry is changed (easy to implement if it would be desirable).
+   - CIDR based reverse Forwarding 
+
diff --git a/contrib/dbus/SetForwarders b/contrib/dbus/SetForwarders
new file mode 100755
index 00000000..8ee4ce10
--- /dev/null
+++ b/contrib/dbus/SetForwarders
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+#  This script uses the named D-BUS support, which must be enabled in
+#  the running named with the named '-D' option, to set the forwarding zones
+#  in the running server.
+#  
+#  One zone argument is required, followed by any number of server IP (v4 or v6)
+#  addresses. If the server IP address list is empty, any forwarders for the zone
+#  will be removed.
+#
+#  Usage:
+#        SetForwarders [ -t <'first' | 'only'> ] <zone> [ <server IP> [...<server IP>] ] 
+#
+#  Copyright(C) Jason Vas Dias<jvdias@redhat.com> Red Hat Inc. 2005
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation at 
+#           http://www.fsf.org/licensing/licenses/gpl.txt
+#  and included in this software distribution as the "LICENSE" file.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+usage() { echo "Usage: SetForwarders [ -t <'first' | 'only'> ] <zone> [ <server> [...<server>] ]"; }
+type=''
+if [ $# -eq 0 ]; then
+   usage;
+   exit 1;
+elif [ "$1" = "-t" ]; then
+   if [ $# -lt 2 ]; then
+      echo '-t option requires an argument.'
+      exit 1;
+   fi;
+   type=$2;
+   shift 2;
+fi;
+if [ $# -lt 1 ]; then
+   echo '<zone> first argument required.'
+   exit 1;
+fi; 
+zone='string:'"$1";
+shift;
+servers='';
+if [ $# -gt 0 ]; then
+  for svr in $*; do
+    servers="$servers string:$svr";
+  done
+fi;
+dbus-send --system --type=method_call --print-reply --reply-timeout=20000 --dest=com.redhat.named /com/redhat/named com.redhat.named.text.SetForwarders $zone $type $servers;
diff --git a/contrib/dbus/bind-9.3.2b1-dbus.patch b/contrib/dbus/bind-9.3.2b1-dbus.patch
new file mode 100644
index 00000000..cdf50d68
--- /dev/null
+++ b/contrib/dbus/bind-9.3.2b1-dbus.patch
@@ -0,0 +1,713 @@
+--- bind-9.3.2b1/lib/dns/rbt.c.dbus	2005-06-17 21:03:24.000000000 -0400
++++ bind-9.3.2b1/lib/dns/rbt.c	2005-10-07 12:43:26.000000000 -0400
+@@ -2172,6 +2172,47 @@
+ 	dns_rbt_printtree(rbt->root, NULL, 0);
+ }
+ 
++static void
++dns_rbt_traverse_tree(dns_rbtnode_t *root,  dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 ) {
++/*
++ * This is used ONLY to traverse the forward table by dbus_mgr at the moment.
++ * Since the forward table is not likely to be large, this can be recursive.
++ */
++	dns_name_t name;
++	dns_offsets_t offsets;
++	char buf[DNS_NAME_MAXWIRE];
++	isc_buffer_t buffer;
++
++	if (root != NULL) {
++
++		if (DOWN(root)) 
++			dns_rbt_traverse_tree(DOWN(root), cb, cb_arg1, cb_arg2);
++
++		if( LEFT(root) != NULL )
++		        dns_rbt_traverse_tree(LEFT(root), cb, cb_arg1, cb_arg2);
++
++		if( RIGHT(root) != NULL )
++		        dns_rbt_traverse_tree(RIGHT(root), cb, cb_arg1, cb_arg2);
++
++		if( DATA(root) == 0L )
++		    return;
++
++		dns_name_init(&name, offsets);
++		isc_buffer_init(&buffer, buf, DNS_NAME_MAXWIRE);
++		dns_name_setbuffer( &name, &buffer);
++		dns_rbt_fullnamefromnode(root, &name);
++		
++		(*cb)(&name, DATA(root), cb_arg1, cb_arg2);		
++	} 
++}
++
++void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2  )
++{
++        REQUIRE(VALID_RBT(rbt));
++
++	dns_rbt_traverse_tree( rbt->root, cb, cb_arg1, cb_arg2 );       
++}
++
+ /*
+  * Chain Functions
+  */
+--- bind-9.3.2b1/lib/dns/forward.c.dbus	2005-03-16 22:58:30.000000000 -0500
++++ bind-9.3.2b1/lib/dns/forward.c	2005-10-07 12:43:26.000000000 -0400
+@@ -200,3 +200,89 @@
+ 	}
+ 	isc_mem_put(fwdtable->mctx, forwarders, sizeof(dns_forwarders_t));
+ }
++
++/***
++ *** new D-BUS Dynamic Forwarding Zones functions:
++ ***/
++isc_result_t
++dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name )
++{
++	isc_result_t result;
++
++	REQUIRE(VALID_FWDTABLE(fwdtable));
++
++	RWLOCK(&fwdtable->rwlock, isc_rwlocktype_write);
++
++	result = dns_rbt_deletename(fwdtable->table, name, ISC_FALSE);
++
++	RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_write);		    
++
++	return (result);
++}
++
++isc_result_t
++dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, 
++			  dns_name_t *name, 
++			  dns_name_t *foundname,
++			  dns_forwarders_t **forwardersp)
++{
++	isc_result_t result;
++
++	REQUIRE(VALID_FWDTABLE(fwdtable));
++	
++	RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read);
++
++	result = dns_rbt_findname(fwdtable->table, name, 0, foundname,
++				  (void **)forwardersp);
++	
++	if(result == DNS_R_PARTIALMATCH)
++	    result = ISC_R_SUCCESS;
++
++	RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read);
++
++	return (result);
++}
++
++isc_result_t
++dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name,
++		  dns_forwarders_t **forwardersp)
++{
++	isc_result_t result;
++
++	REQUIRE(VALID_FWDTABLE(fwdtable));
++
++	REQUIRE(forwardersp != 0L);
++
++	RWLOCK(&fwdtable->rwlock, isc_rwlocktype_read);
++
++	result = dns_rbt_findname(fwdtable->table, name, 0, NULL,
++				  (void **)forwardersp);
++	
++	if( result != ISC_R_SUCCESS )
++	    *forwardersp = 0L;
++
++	RWUNLOCK(&fwdtable->rwlock, isc_rwlocktype_read);
++
++	return (result);
++}
++
++static 
++void dns_fwdtable_traverse
++(   
++    dns_name_t *name,
++    void *node_data,
++    void *cbp,
++    void *cb_arg
++)
++{
++    dns_fwdtable_callback_t  cb = (dns_fwdtable_callback_t) cbp;
++    
++    (*cb)( name, node_data, cb_arg);
++}
++
++void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void *cb_arg )
++{
++    REQUIRE(VALID_FWDTABLE(fwdtable));
++
++    dns_rbt_traverse( fwdtable->table, dns_fwdtable_traverse, cb, cb_arg );
++}
+--- bind-9.3.2b1/lib/dns/include/dns/forward.h.dbus	2005-03-16 22:58:31.000000000 -0500
++++ bind-9.3.2b1/lib/dns/include/dns/forward.h	2005-10-07 12:43:26.000000000 -0400
+@@ -98,6 +98,37 @@
+  * 	all memory associated with the forwarding table is freed.
+  */
+ 
++
++/* These are ONLY used by dbus_mgr :
++ */
++
++isc_result_t
++dns_fwdtable_delete( dns_fwdtable_t *fwdtable, dns_name_t *name );
++/* 
++ * Removes an entry from the forwarding table.
++ */
++
++isc_result_t
++dns_fwdtable_find_exact(dns_fwdtable_t *fwdtable, dns_name_t *name,
++		  dns_forwarders_t **forwardersp);
++/*
++ * Finds an exact match for "name" in the forwarding table.  
++ */
++
++isc_result_t
++dns_fwdtable_find_closest(dns_fwdtable_t *fwdtable, dns_name_t *name, dns_name_t *foundname,
++		  dns_forwarders_t **forwardersp);
++/*
++ * Finds the closest match for "*name" in the forwarding table, returning  
++ * the actual name matching in *name if different to *name passed in. 
++ */
++
++typedef void (*dns_fwdtable_callback_t)( dns_name_t *, dns_forwarders_t *, void *);
++void dns_fwdtable_foreach(dns_fwdtable_t *fwdtable, dns_fwdtable_callback_t cb, void * );
++/* Invoke cb for each member of fwdtable 
++ */
++
++
+ ISC_LANG_ENDDECLS
+ 
+ #endif /* DNS_FORWARD_H */
+--- bind-9.3.2b1/lib/dns/include/dns/rbt.h.dbus	2004-10-11 01:55:51.000000000 -0400
++++ bind-9.3.2b1/lib/dns/include/dns/rbt.h	2005-10-07 12:43:26.000000000 -0400
+@@ -833,6 +833,17 @@
+  *	<something_else>	Any error result from dns_name_concatenate.
+  */
+ 
++
++typedef void (*dns_rbt_traverse_callback_t)(  dns_name_t *name,
++					      void *node_data,
++					      void *cb_arg1,
++					      void *cb_arg2);
++
++void dns_rbt_traverse( dns_rbt_t *rbt, dns_rbt_traverse_callback_t cb, void *cb_arg1, void *cb_arg2 );
++/* tree traversal function (only used by D-BUS dynamic forwarding dbus_mgr at
++ * the moment)
++ */
++
+ ISC_LANG_ENDDECLS
+ 
+ #endif /* DNS_RBT_H */
+--- bind-9.3.2b1/lib/isc/unix/socket.c.dbus	2005-08-25 00:32:55.000000000 -0400
++++ bind-9.3.2b1/lib/isc/unix/socket.c	2005-10-07 13:40:03.000000000 -0400
+@@ -148,6 +148,11 @@
+ 	ISC_LIST(isc_socketevent_t)		recv_list;
+ 	ISC_LIST(isc_socket_newconnev_t)	accept_list;
+ 	isc_socket_connev_t		       *connect_ev;
++        
++        /* these are used only by isc_sockettype_fd sockets:*/
++        isc_socketevent_t      *read_ready_event;
++        isc_socketevent_t      *write_ready_event;
++        isc_socketevent_t      *selected_event;
+ 
+ 	/*
+ 	 * Internal events.  Posted when a descriptor is readable or
+@@ -304,7 +309,7 @@
+ 
+ static void
+ wakeup_socket(isc_socketmgr_t *manager, int fd, int msg) {
+-	isc_socket_t *sock;
++	isc_socket_t *sock=0L;
+ 
+ 	/*
+ 	 * This is a wakeup on a socket.  If the socket is not in the
+@@ -1266,6 +1271,9 @@
+ 	sock->connected = 0;
+ 	sock->connecting = 0;
+ 	sock->bound = 0;
++	sock->read_ready_event = 0L;
++	sock->write_ready_event = 0L;
++	sock->selected_event = 0L;
+ 
+ 	/*
+ 	 * initialize the lock
+@@ -1378,13 +1386,16 @@
+ 	case isc_sockettype_tcp:
+ 		sock->fd = socket(pf, SOCK_STREAM, IPPROTO_TCP);
+ 		break;
++
++	case isc_sockettype_fd:
++	        sock->fd = pf;
+ 	}
+ 
+ #ifdef F_DUPFD
+ 	/*
+ 	 * Leave a space for stdio to work in.
+ 	 */
+-	if (sock->fd >= 0 && sock->fd < 20) {
++	if ( (type != isc_sockettype_fd) && (sock->fd >= 0) && (sock->fd < 20) ) {
+ 		int new, tmp;
+ 		new = fcntl(sock->fd, F_DUPFD, 20);
+ 		tmp = errno;
+@@ -1438,7 +1449,7 @@
+ 		}
+ 	}
+ 
+-	if (make_nonblock(sock->fd) != ISC_R_SUCCESS) {
++	if ((type != isc_sockettype_fd) && (make_nonblock(sock->fd) != ISC_R_SUCCESS)) {
+ 		(void)close(sock->fd);
+ 		free_socket(&sock);
+ 		return (ISC_R_UNEXPECTED);
+@@ -1706,6 +1717,38 @@
+ 	isc_task_send(ev->ev_sender, (isc_event_t **)&iev);
+ }
+ 
++static
++isc_event_t *dispatch_read_ready(isc_socketmgr_t *manager, isc_socket_t *sock)
++{
++    isc_event_t *dev = (isc_event_t*)sock->read_ready_event, *ev;
++    
++    ev = isc_mem_get(manager->mctx, dev->ev_size);
++    memcpy(ev,dev,dev->ev_size);
++    ISC_LINK_INIT(ev,ev_link);
++    isc_task_send(dev->ev_sender, &ev );
++    return (isc_event_t *)sock->selected_event;
++}
++
++static
++isc_event_t *dispatch_write_ready(isc_socketmgr_t *manager,isc_socket_t *sock)
++{
++    isc_event_t *dev = (isc_event_t*)sock->write_ready_event, *ev;
++    ev = isc_mem_get(manager->mctx, dev->ev_size);
++    memcpy(ev,dev,dev->ev_size);
++    ISC_LINK_INIT(ev,ev_link);
++    isc_task_send(dev->ev_sender, &ev );
++    return (isc_event_t *)sock->selected_event;
++}
++
++static
++void dispatch_selected(isc_socketmgr_t *manager, isc_event_t *dev)
++{   isc_event_t *ev;
++    ev = isc_mem_get(manager->mctx, dev->ev_size);
++    memcpy(ev,dev,dev->ev_size);
++    ISC_LINK_INIT(ev,ev_link);
++    isc_task_send(dev->ev_sender, &ev );
++}
++
+ /*
+  * Dequeue an item off the given socket's read queue, set the result code
+  * in the done event to the one provided, and send it to the task it was
+@@ -2113,6 +2156,7 @@
+ 	int i;
+ 	isc_socket_t *sock;
+ 	isc_boolean_t unlock_sock;
++	isc_event_t *sock_selected = 0L;
+ 
+ 	REQUIRE(maxfd <= (int)FD_SETSIZE);
+ 
+@@ -2146,11 +2190,15 @@
+ 			unlock_sock = ISC_TRUE;
+ 			LOCK(&sock->lock);
+ 			if (!SOCK_DEAD(sock)) {
++			    if( sock->type != isc_sockettype_fd )
++			    {
+ 				if (sock->listener)
+ 					dispatch_accept(sock);
+ 				else
+ 					dispatch_recv(sock);
+-			}
++			    }else			    
++				sock_selected = dispatch_read_ready(manager,sock);
++			}			    
+ 			FD_CLR(i, &manager->read_fds);
+ 		}
+ 	check_write:
+@@ -2164,16 +2212,24 @@
+ 				LOCK(&sock->lock);
+ 			}
+ 			if (!SOCK_DEAD(sock)) {
++			    if( sock->type != isc_sockettype_fd )
++			    {
+ 				if (sock->connecting)
+ 					dispatch_connect(sock);
+ 				else
+ 					dispatch_send(sock);
++			    }else			   
++				sock_selected =	dispatch_write_ready(manager,sock);
+ 			}
+ 			FD_CLR(i, &manager->write_fds);
+ 		}
+ 		if (unlock_sock)
+ 			UNLOCK(&sock->lock);
+ 	}
++	if( sock_selected != 0L )
++	{
++	    dispatch_selected(manager, sock_selected);
++	}
+ }
+ 
+ #ifdef ISC_PLATFORM_USETHREADS
+@@ -2192,7 +2248,7 @@
+ 	int cc;
+ 	fd_set readfds;
+ 	fd_set writefds;
+-	int msg, fd;
++	int msg, fd = -1;
+ 	int maxfd;
+ 	char strbuf[ISC_STRERRORSIZE];
+ 
+@@ -3523,3 +3579,55 @@
+ 	return (ISC_R_SUCCESS);
+ }
+ #endif /* ISC_PLATFORM_USETHREADS */
++
++isc_socketevent_t*
++isc_socket_fd_handle_reads( isc_socket_t *sock, isc_socketevent_t *dev )
++{    
++    REQUIRE(VALID_SOCKET(sock));   
++    if(dev != 0L) 
++    {
++	sock->references=1;
++	sock->read_ready_event = dev;
++	select_poke(sock->manager, sock->fd, SELECT_POKE_READ);
++    }else
++    {
++	dev = sock->read_ready_event ;
++	sock->read_ready_event = 0L ;
++    }
++    return dev;
++}
++
++isc_socketevent_t*
++isc_socket_fd_handle_writes( isc_socket_t *sock, isc_socketevent_t *dev )
++{
++    REQUIRE(VALID_SOCKET(sock));   
++    if(dev != 0L) 
++    {
++	sock->references=1;
++	sock->write_ready_event = dev;
++	select_poke(sock->manager, sock->fd, SELECT_POKE_WRITE);    
++    }else
++    {
++	dev = sock->write_ready_event;
++	sock->write_ready_event = 0L;
++    }
++    return dev;
++}
++
++isc_socketevent_t*
++isc_socket_fd_handle_selected( isc_socket_t *sock, isc_socketevent_t *dev )
++{
++    REQUIRE(VALID_SOCKET(sock));
++    if(dev != 0L) 
++    {
++	sock->references=1;
++	sock->selected_event = dev;
++    }else
++    {
++	dev = sock->selected_event;
++	sock->selected_event = 0L;
++	sock->references=0;
++	destroy(&sock);
++    }
++    return dev;
++}
+--- bind-9.3.2b1/lib/isc/include/isc/socket.h.dbus	2004-03-08 04:04:53.000000000 -0500
++++ bind-9.3.2b1/lib/isc/include/isc/socket.h	2005-10-07 12:43:26.000000000 -0400
+@@ -136,6 +136,10 @@
+ #define ISC_SOCKEVENT_NEWCONN	(ISC_EVENTCLASS_SOCKET + 3)
+ #define ISC_SOCKEVENT_CONNECT	(ISC_EVENTCLASS_SOCKET + 4)
+ 
++#define ISC_SOCKEVENT_READ_READY  (ISC_EVENTCLASS_SOCKET + 5)
++#define ISC_SOCKEVENT_WRITE_READY (ISC_EVENTCLASS_SOCKET + 6)
++#define ISC_SOCKEVENT_SELECTED    (ISC_EVENTCLASS_SOCKET + 7)
++
+ /*
+  * Internal events.
+  */
+@@ -144,7 +148,8 @@
+ 
+ typedef enum {
+ 	isc_sockettype_udp = 1,
+-	isc_sockettype_tcp = 2
++	isc_sockettype_tcp = 2,
++	isc_sockettype_fd  = 8
+ } isc_sockettype_t;
+ 
+ /*
+@@ -699,6 +704,30 @@
+  *	'sock' is a valid socket.
+  */
+ 
++isc_socketevent_t*
++isc_socket_fd_handle_reads( isc_socket_t *sock, isc_socketevent_t *dev );
++/* register the "dev" event to be sent when the isc_sockettype_fd sock 
++ * was select()-ed for read. If there is already an event registered, it
++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing
++ * registered event.
++ */
++ 
++isc_socketevent_t*
++isc_socket_fd_handle_writes( isc_socket_t *sock, isc_socketevent_t *dev );
++/* register the "dev" event to be sent when the isc_sockettype_fd sock 
++ * was select()-ed for write. If there is already an event registered, it
++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing
++ * registered event.
++ */
++
++isc_socketevent_t*
++isc_socket_fd_handle_selected( isc_socket_t *sock, isc_socketevent_t *dev );
++/* register the "dev" event to be sent when ALL isc_sockettype_fd sockets 
++ * have been select()-ed . If there is already an event registered, it
++ * is returned, otherwise 0 is returned. If dev is 0, removes any existing
++ * registered event.
++ */
++
+ ISC_LANG_ENDDECLS
+ 
+ #endif /* ISC_SOCKET_H */
+--- bind-9.3.2b1/bin/named/log.c.dbus	2005-05-24 19:58:17.000000000 -0400
++++ bind-9.3.2b1/bin/named/log.c	2005-10-07 12:43:26.000000000 -0400
+@@ -41,6 +41,7 @@
+ 	{ "queries",	 		0 },
+ 	{ "unmatched",	 		0 },
+ 	{ "update-security",		0 },
++	{ "dbus",                       0 },
+ 	{ NULL, 			0 }
+ };
+ 
+@@ -60,6 +61,7 @@
+ 	{ "notify",	 		0 },
+ 	{ "control",	 		0 },
+ 	{ "lwresd",	 		0 },
++	{ "dbus",                       0 },
+ 	{ NULL, 			0 }
+ };
+ 
+--- bind-9.3.2b1/bin/named/Makefile.in.dbus	2004-09-06 17:47:25.000000000 -0400
++++ bind-9.3.2b1/bin/named/Makefile.in	2005-10-07 13:44:22.000000000 -0400
+@@ -35,7 +35,9 @@
+ 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
+ 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
+ 		${DBDRIVER_INCLUDES}
+-
++DBUS_ARCHDEP_LIBDIR ?= lib
++DBUS_INCLUDES = \
++	-I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0
+ CDEFINES =
+ CWARNINGS =
+ 
+@@ -52,6 +54,7 @@
+ ISCDEPLIBS =	../../lib/isc/libisc.@A@
+ LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
+ BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
++DBUSLIBS=       -ldbus-1
+ 
+ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
+ 		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
+@@ -71,6 +74,7 @@
+ 		zoneconf.@O@ \
+ 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
+ 		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
++		dbus_service.@O@ dbus_mgr.@O@ \
+ 		$(DBDRIVER_OBJS)
+ 
+ UOBJS =		unix/os.@O@
+@@ -83,6 +87,7 @@
+ 		zoneconf.c \
+ 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
+ 		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
++	        dbus_service.c dbus_mgr.c \
+ 		$(DBDRIVER_SRCS)
+ 
+ MANPAGES =	named.8 lwresd.8 named.conf.5
+@@ -105,9 +110,14 @@
+ 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
+ 		-c ${srcdir}/config.c
+ 
++dbus_service.@O@: dbus_service.c
++	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	        ${DBUS_INCLUDES} \
++		-c ${srcdir}/dbus_service.c
++
+ named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+-	${OBJS} ${UOBJS} ${LIBS}
++	${OBJS} ${UOBJS} ${LIBS} ${DBUSLIBS}
+ 
+ lwresd@EXEEXT@: named@EXEEXT@
+ 	rm -f lwresd@EXEEXT@
+--- bind-9.3.2b1/bin/named/named.8.dbus	2005-05-12 22:43:20.000000000 -0400
++++ bind-9.3.2b1/bin/named/named.8	2005-10-07 13:50:12.000000000 -0400
+@@ -41,7 +41,7 @@
+ named \- Internet domain name server
+ .SH "SYNOPSIS"
+ .HP 6
+-\fBnamed\fR [\fB\-4\fR] [\fB\-6\fR] [\fB\-c\ \fIconfig\-file\fR\fR] [\fB\-d\ \fIdebug\-level\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-n\ \fI#cpus\fR\fR] [\fB\-p\ \fIport\fR\fR] [\fB\-s\fR] [\fB\-t\ \fIdirectory\fR\fR] [\fB\-u\ \fIuser\fR\fR] [\fB\-v\fR] [\fB\-x\ \fIcache\-file\fR\fR]
++\fBnamed\fR [\fB\-4\fR] [\fB\-6\fR] [\fB\-c\ \fIconfig\-file\fR\fR] [\fB\-d\ \fIdebug\-level\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-n\ \fI#cpus\fR\fR] [\fB\-p\ \fIport\fR\fR] [\fB\-s\fR] [\fB\-t\ \fIdirectory\fR\fR] [\fB\-u\ \fIuser\fR\fR] [\fB\-v\fR] [\fB\-x\ \fIcache\-file\fR\fR] [\fB\-D\fR]
+ .SH "DESCRIPTION"
+ .PP
+ \fBnamed\fR is a Domain Name System (DNS) server, part of the BIND 9 distribution from ISC\&. For more information on the DNS, see RFCs 1033, 1034, and 1035\&.
+@@ -103,6 +103,13 @@
+ .B "Warning:"
+ This option must not be used\&. It is only of interest to BIND 9 developers and may be removed or changed in a future release\&.
+ .RE
++.sp
++.TP
++\fB\-D\fR
++Enable dynamic management of the forwarding table with D-BUS
++messages. This option is required for Red Hat NetworkManager
++support. See doc/README.DBUS .
++.sp
+ .SH "SIGNALS"
+ .PP
+ In routine operation, signals should not be used to control the nameserver; \fBrndc\fR should be used instead\&.
+@@ -117,6 +124,7 @@
+ .SH "CONFIGURATION"
+ .PP
+ The \fBnamed\fR configuration file is too complex to describe in detail here\&. A complete description is provided in the BIND 9 Administrator Reference Manual\&.
++.PP
+ .SH "FILES"
+ .TP
+ \fI/etc/named\&.conf\fR
+--- bind-9.3.2b1/bin/named/main.c.dbus	2005-04-28 21:04:47.000000000 -0400
++++ bind-9.3.2b1/bin/named/main.c	2005-10-07 12:43:26.000000000 -0400
+@@ -239,7 +239,8 @@
+ 		"usage: named [-4|-6] [-c conffile] [-d debuglevel] "
+ 		"[-f|-g] [-n number_of_cpus]\n"
+ 		"             [-p port] [-s] [-t chrootdir] [-u username]\n"
+-		"             [-m {usage|trace|record}]\n");
++		"             [-m {usage|trace|record}]\n"
++	        "             [-D ]\n");
+ }
+ 
+ static void
+@@ -345,7 +346,7 @@
+ 
+ 	isc_commandline_errprint = ISC_FALSE;
+ 	while ((ch = isc_commandline_parse(argc, argv,
+-			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:")) != -1) {
++			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:D")) != -1) {
+ 		switch (ch) {
+ 		case '4':
+ 			if (disable4)
+@@ -434,6 +435,9 @@
+ 		case 'v':
+ 			printf("BIND %s\n", ns_g_version);
+ 			exit(0);
++		case 'D':
++		        ns_g_dbus = 1;
++			break;
+ 		case '?':
+ 			usage();
+ 			ns_main_earlyfatal("unknown option '-%c'",
+--- bind-9.3.2b1/bin/named/server.c.dbus	2005-07-26 22:53:15.000000000 -0400
++++ bind-9.3.2b1/bin/named/server.c	2005-10-07 12:43:26.000000000 -0400
+@@ -86,6 +86,8 @@
+ #include <stdlib.h>
+ #endif
+ 
++#include <named/dbus_mgr.h>
++
+ /*
+  * Check an operation for failure.  Assumes that the function
+  * using it has a 'result' variable and a 'cleanup' label.
+@@ -1496,12 +1498,12 @@
+ 	if (result != ISC_R_SUCCESS) {
+ 		char namebuf[DNS_NAME_FORMATSIZE];
+ 		dns_name_format(origin, namebuf, sizeof(namebuf));
+-		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING,
+-			    "could not set up forwarding for domain '%s': %s",
++		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_NOTICE,
++			    "setting up forwarding failed for domain '%s': %s",
+ 			    namebuf, isc_result_totext(result));
+ 		goto cleanup;
+ 	}
+-
++		
+ 	result = ISC_R_SUCCESS;
+ 
+  cleanup:
+@@ -2873,6 +2875,20 @@
+ 
+ 	CHECKFATAL(load_zones(server, ISC_FALSE), "loading zones");
+ 
++	server->dbus_mgr = 0L;
++	if( ns_g_dbus )	
++	    if( dbus_mgr_create
++	        (  ns_g_mctx, ns_g_taskmgr, ns_g_socketmgr, ns_g_timermgr,
++		   &server->dbus_mgr
++		) != ISC_R_SUCCESS
++	      )
++	    {
++		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
++			      NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
++			      "dbus_mgr initialization failed. D-BUS service is disabled."
++		             );
++	    }
++
+ 	ns_os_started();
+ 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,
+ 		      ISC_LOG_NOTICE, "running");
+@@ -2935,6 +2951,9 @@
+ 
+ 	dns_db_detach(&server->in_roothints);
+ 
++	if( server->dbus_mgr != 0L )
++	    dbus_mgr_shutdown(server->dbus_mgr);
++
+ 	isc_task_endexclusive(server->task);
+ 
+ 	isc_task_detach(&server->task);
+--- bind-9.3.2b1/bin/named/include/named/globals.h.dbus	2004-03-07 23:04:20.000000000 -0500
++++ bind-9.3.2b1/bin/named/include/named/globals.h	2005-10-07 13:47:36.000000000 -0400
+@@ -112,6 +112,8 @@
+ 
+ EXTERN int			ns_g_listen		INIT(3);
+ 
++EXTERN int                      ns_g_dbus               INIT(0);
++
+ #undef EXTERN
+ #undef INIT
+ 
+--- bind-9.3.2b1/bin/named/include/named/server.h.dbus	2004-03-07 23:04:21.000000000 -0500
++++ bind-9.3.2b1/bin/named/include/named/server.h	2005-10-07 12:43:26.000000000 -0400
+@@ -91,7 +91,8 @@
+ 	ns_controls_t *		controls;	/* Control channels */
+ 	unsigned int		dispatchgen;
+ 	ns_dispatchlist_t	dispatches;
+-						
++
++        ns_dbus_mgr_t *         dbus_mgr;
+ };
+ 
+ #define NS_SERVER_MAGIC			ISC_MAGIC('S','V','E','R')
+--- bind-9.3.2b1/bin/named/include/named/log.h.dbus	2004-03-07 23:04:21.000000000 -0500
++++ bind-9.3.2b1/bin/named/include/named/log.h	2005-10-07 12:43:26.000000000 -0400
+@@ -34,6 +34,7 @@
+ #define NS_LOGCATEGORY_QUERIES		(&ns_g_categories[4])
+ #define NS_LOGCATEGORY_UNMATCHED	(&ns_g_categories[5])
+ #define NS_LOGCATEGORY_UPDATE_SECURITY	(&ns_g_categories[6])
++#define NS_LOGCATEGORY_DBUS      	(&ns_g_categories[7])
+ 
+ /*
+  * Backwards compatibility.
+@@ -51,6 +52,7 @@
+ #define NS_LOGMODULE_NOTIFY		(&ns_g_modules[8])
+ #define NS_LOGMODULE_CONTROL		(&ns_g_modules[9])
+ #define NS_LOGMODULE_LWRESD		(&ns_g_modules[10])
++#define NS_LOGMODULE_DBUS		(&ns_g_modules[11])
+ 
+ isc_result_t
+ ns_log_init(isc_boolean_t safe);
+--- bind-9.3.2b1/bin/named/include/named/types.h.dbus	2004-03-06 05:21:26.000000000 -0500
++++ bind-9.3.2b1/bin/named/include/named/types.h	2005-10-07 12:43:26.000000000 -0400
+@@ -38,4 +38,6 @@
+ typedef struct ns_dispatch		ns_dispatch_t;
+ typedef ISC_LIST(ns_dispatch_t)		ns_dispatchlist_t;
+ 
++typedef struct ns_dbus_mgr              ns_dbus_mgr_t ;
++
+ #endif /* NAMED_TYPES_H */
diff --git a/contrib/dbus/dbus_mgr.c b/contrib/dbus/dbus_mgr.c
new file mode 100644
index 00000000..832c0cac
--- /dev/null
+++ b/contrib/dbus/dbus_mgr.c
@@ -0,0 +1,2441 @@
+/* dbus_mgr.c
+ *
+ *  named module to provide dynamic forwarding zones in 
+ *  response to D-BUS dhcp events or commands.
+ *
+ *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation at 
+ *           http://www.fsf.org/licensing/licenses/gpl.txt
+ *  and included in this software distribution as the "LICENSE" file.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+#include <config.h>
+#include <isc/types.h>
+#include <isc/net.h>
+#include <isc/mem.h>
+#include <isc/magic.h>
+#include <isc/list.h>
+#include <isc/task.h>
+#include <isc/event.h>
+#include <isc/socket.h>
+#include <isc/timer.h>
+#include <isc/netaddr.h>
+#include <isc/sockaddr.h>
+#include <isc/buffer.h>
+#include <isc/log.h>
+
+#include <dns/name.h>
+#include <dns/acl.h>
+#include <dns/fixedname.h>
+#include <dns/view.h>
+#include <dns/forward.h>
+
+#include <named/types.h>
+#include <named/config.h>
+#include <named/server.h>
+#include <named/globals.h>
+#include <named/log.h>
+
+#include <named/dbus_service.h>
+#include <named/dbus_mgr.h>
+
+#include <string.h>
+#include <search.h>
+
+typedef void (*__free_fn_t) (void *__nodep);
+extern void tdestroy (void *__root, __free_fn_t __freefct);
+extern void free(void*);
+
+#ifdef ISC_USE_INTERNAL_MALLOC
+#  if  ISC_USE_INTERNAL_MALLOC
+#      error dbus_mgr cannot be used if ISC_USE_INTERNAL_MALLOC==1
+#  endif
+#endif
+
+#define DBUSMGR_DESTINATION  "com.redhat.named"
+#define DBUSMGR_OBJECT_PATH "/com/redhat/named"
+#define DBUSMGR_INTERFACE    "com.redhat.named"
+
+#define DBUSMGR_MAGIC	ISC_MAGIC('D', 'B', 'U', 'S')
+
+struct ns_dbus_mgr
+{
+    unsigned int        magic;
+    isc_mem_t         *	mctx;		/* Memory context. */
+    isc_taskmgr_t     * taskmgr;	/* Task manager.   */
+    isc_socketmgr_t   *	socketmgr;	/* Socket manager. */   
+    isc_timermgr_t    *	timermgr;	/* Timer manager.  */   
+    isc_task_t        * task;           /* task            */
+    isc_timer_t       * timer;          /* dbus_init retry */
+    void              * sockets;        /* dbus fd tree    */ 
+    void              * dhc_if;         /* dhcp interface tree */
+    void              * ifwdt;          /* initial forwarder tree */
+    char              * dhcdbd_name;    /* dhcdbd destination  */
+    DBUS_SVC            dbus;	        /* dbus handle */
+};
+
+typedef
+struct dbus_mgr_sock_s
+{
+    int fd;
+    struct ns_dbus_mgr *mgr;
+    isc_socket_t *sock;
+    isc_socketevent_t *ser;
+    isc_socketevent_t *sew;
+    isc_socketevent_t *sel;
+} DBusMgrSocket;
+
+typedef
+enum dhc_state_e
+{
+   DHC_NBI,         	/* no broadcast interfaces found */
+   DHC_PREINIT, 	/* configuration started   */
+   DHC_BOUND, 		/* lease obtained          */
+   DHC_RENEW, 		/* lease renewed           */
+   DHC_REBOOT,	        /* have valid lease, but now obtained a different one */
+   DHC_REBIND, 		/* new, different lease */
+   DHC_STOP,  		/* remove old lease */
+   DHC_MEDIUM, 		/* media selection begun */
+   DHC_TIMEOUT, 	/* timed out contacting DHCP server */
+   DHC_FAIL, 		/* all attempts to contact server timed out, sleeping */
+   DHC_EXPIRE, 		/* lease has expired, renewing */
+   DHC_RELEASE, 	/* releasing lease */
+   DHC_START,           /* sent when dhclient started OK */
+   DHC_ABEND,  		/* dhclient exited abnormally    */
+   DHC_END, 		/* dhclient exited normally      */
+   DHC_END_OPTIONS,     /* last option in subscription sent */
+   DHC_INVALID=255      
+} DHC_State;
+
+typedef ISC_LIST(dns_name_t) DNSNameList;
+
+typedef ISC_LIST(isc_sockaddr_t) SockAddrList;
+
+typedef struct dbm_fwdr_s
+{
+    dns_fwdpolicy_t fwdpolicy;
+    dns_name_t       dn;
+    SockAddrList     sa;
+    ISC_LINK( struct dbm_fwdr_s ) link;
+} DBusMgrInitialFwdr;
+
+typedef
+struct dhc_if_s
+{
+    char           *if_name;
+    DHC_State      dhc_state;
+    DHC_State      previous_state;
+    struct in_addr ip;
+    struct in_addr subnet_mask;
+    DNSNameList    dn;
+    SockAddrList   dns;
+} DHC_IF;
+
+static void 
+dbus_mgr_watch_handler( int fd, dbus_svc_WatchFlags flags, void *mgrp );
+
+static
+dbus_svc_HandlerResult 
+dbus_mgr_message_handler
+(  
+    DBusMsgHandlerArgs
+);
+
+static
+void dbus_mgr_close_socket( const void *p, const VISIT which, const int level);
+
+static
+void dbus_mgr_destroy_socket( void *p );
+
+static
+void dbus_mgr_free_dhc( void *p );
+
+static void
+dbus_mgr_watches_selected(isc_task_t *t, isc_event_t *ev);
+
+static isc_result_t
+dbus_mgr_init_dbus(ns_dbus_mgr_t *);
+
+static isc_result_t
+dbus_mgr_record_initial_fwdtable(ns_dbus_mgr_t *);
+
+static void
+dbus_mgr_free_initial_fwdtable(ns_dbus_mgr_t *);
+
+static 
+uint8_t dbus_mgr_subscribe_to_dhcdbd( ns_dbus_mgr_t * );
+
+static 
+void dbus_mgr_dbus_shutdown_handler ( ns_dbus_mgr_t * );
+
+static
+int dbus_mgr_log_err( const char *fmt, ...)
+{
+    va_list  va;
+    va_start(va, fmt);
+    isc_log_vwrite(ns_g_lctx,		  
+		   NS_LOGCATEGORY_DBUS,
+		   NS_LOGMODULE_DBUS,	
+		   ISC_LOG_NOTICE,
+		   fmt, va
+	          );
+    va_end(va);
+    return 0;
+}
+
+static
+int dbus_mgr_log_dbg( const char *fmt, ...)
+{
+    va_list  va;
+    va_start(va, fmt);
+    isc_log_vwrite(ns_g_lctx,		  
+		   NS_LOGCATEGORY_DBUS,
+		   NS_LOGMODULE_DBUS,	
+		   ISC_LOG_DEBUG(80),
+		   fmt, va
+	          );
+    va_end(va);
+    return 0;
+}
+
+static
+int dbus_mgr_log_info( const char *fmt, ...)
+{
+    va_list  va;
+    va_start(va, fmt);
+    isc_log_vwrite(ns_g_lctx,		  
+		   NS_LOGCATEGORY_DBUS,
+		   NS_LOGMODULE_DBUS,	
+		   ISC_LOG_DEBUG(1),
+		   fmt, va
+	          );
+    va_end(va);
+    return 0;
+}
+
+isc_result_t 
+dbus_mgr_create
+(   isc_mem_t *mctx, 
+    isc_taskmgr_t *taskmgr,
+    isc_socketmgr_t *socketmgr,
+    isc_timermgr_t *timermgr,
+    ns_dbus_mgr_t **dbus_mgr
+)
+{
+    isc_result_t result;
+    ns_dbus_mgr_t *mgr;
+    
+    *dbus_mgr = 0L; 
+
+    mgr = isc_mem_get(mctx, sizeof(*mgr));
+    if (mgr == NULL)
+	return (ISC_R_NOMEMORY);
+
+    mgr->magic = DBUSMGR_MAGIC;
+    mgr->mctx = mctx;
+    mgr->taskmgr = taskmgr;
+    mgr->socketmgr = socketmgr;
+    mgr->timermgr = timermgr;
+    mgr->task = 0L;
+    mgr->sockets = 0L;
+    mgr->timer = 0L;
+    mgr->dhc_if = 0L;
+    mgr->ifwdt = 0L;
+    mgr->dhcdbd_name = 0L;
+
+    if( (result = isc_task_create( taskmgr, 100, &(mgr->task)))
+        != ISC_R_SUCCESS
+      )	goto cleanup_mgr;
+    
+    isc_task_setname( mgr->task, "dbusmgr", mgr );
+
+    mgr->dbus = 0L;
+
+    if( (result = dbus_mgr_record_initial_fwdtable( mgr ))
+	!= ISC_R_SUCCESS
+      )	goto cleanup_mgr;
+
+    if( (result = dbus_mgr_init_dbus( mgr ))
+	!= ISC_R_SUCCESS 
+      )	goto cleanup_mgr;     
+
+    *dbus_mgr = mgr; 
+   
+    return ISC_R_SUCCESS;
+
+ cleanup_mgr:
+    if( mgr->task != 0L )
+	isc_task_detach(&(mgr->task));
+    isc_mem_put(mctx, mgr, sizeof(*mgr));
+    return (result);
+}
+
+static isc_result_t
+dbus_mgr_init_dbus(ns_dbus_mgr_t * mgr)
+{
+    char destination[]=DBUSMGR_DESTINATION;
+
+    if( mgr->sockets != 0L )
+    {
+	isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+	twalk(mgr->sockets, dbus_mgr_close_socket);
+	tdestroy(mgr->sockets, dbus_mgr_destroy_socket);
+	mgr->sockets = 0L;
+    }
+
+    if( mgr->dbus != 0L )
+    {
+	dbus_svc_shutdown(mgr->dbus);
+	mgr->dbus = 0L;
+    }
+
+    mgr->dbus = 
+	dbus_svc_init
+	(   DBUS_PRIVATE_SYSTEM,
+	    destination,
+	    dbus_mgr_watch_handler,
+	    0L, 0L,
+	    mgr
+	);
+
+    if( mgr->dbus == 0L )
+    {
+	if( mgr->timer == 0L)
+	{
+	    isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+	    if( mgr->sockets != 0L )
+	    {
+		twalk(mgr->sockets, dbus_mgr_close_socket);
+		tdestroy(mgr->sockets, dbus_mgr_destroy_socket);
+		mgr->sockets = 0L;
+	    }
+	    dbus_mgr_dbus_shutdown_handler (  mgr );
+	    return ISC_R_SUCCESS;
+	}
+	goto cleanup;
+    }
+
+    if( !dbus_svc_add_filter
+	( mgr->dbus, dbus_mgr_message_handler, mgr, 4,
+	  "type=signal,path=/org/freedesktop/DBus,member=NameOwnerChanged",
+	  "type=signal,path=/org/freedesktop/DBus/Local,member=Disconnected",
+	  "type=signal,interface=com.redhat.dhcp.subscribe.binary",
+	  "type=method_call,destination=com.redhat.named,path=/com/redhat/named" 	 
+	)
+      )
+    {
+	dbus_mgr_log_err( "dbus_svc_add_filter failed" );
+	goto cleanup;
+    }
+    
+    if( mgr->timer != 0L )
+    {
+	isc_timer_reset(mgr->timer,
+			isc_timertype_inactive,
+			NULL, NULL, ISC_TRUE
+	               );
+    }
+
+    if( !dbus_mgr_subscribe_to_dhcdbd( mgr ) )
+	dbus_mgr_log_err("D-BUS dhcdbd subscription disabled.");
+
+    dbus_mgr_log_err("D-BUS service enabled.");
+    return ISC_R_SUCCESS;
+
+ cleanup:
+    isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+    twalk(mgr->sockets, dbus_mgr_close_socket);
+    tdestroy(mgr->sockets, dbus_mgr_destroy_socket);
+    mgr->sockets = 0L;
+    if( mgr->dbus )
+    {
+	dbus_svc_shutdown(mgr->dbus);
+	mgr->dbus = 0L;
+    }
+    return ISC_R_FAILURE;
+}
+
+static 
+uint8_t dbus_mgr_subscribe_to_dhcdbd( ns_dbus_mgr_t *mgr )
+{
+    DBUS_SVC dbus = mgr->dbus;
+    char subs[1024], path[1024], 
+	dhcdbd_destination[]="com.redhat.dhcp", *ddp[1]={ &(dhcdbd_destination[0]) },
+	*dhcdbd_name=0L;
+    const char *options[] = { "reason", "ip-address", "subnet-mask", 
+			      "domain-name", "domain-name-servers" 
+                            };
+    dbus_svc_MessageHandle msg;
+    int i, n_opts = 5;
+
+    if( mgr->dhcdbd_name == 0L )
+    {
+	msg = dbus_svc_call
+	      ( dbus,
+		"org.freedesktop.DBus",
+		"/org/freedesktop/DBus",
+		"GetNameOwner",		
+		"org.freedesktop.DBus",
+		TYPE_STRING, &ddp,
+		TYPE_INVALID
+	       );
+	if( msg == 0L )	
+	    return 0;    
+
+	if( !dbus_svc_get_args(dbus, msg,
+			       TYPE_STRING, &(dhcdbd_name),
+			       TYPE_INVALID
+		              ) 
+	  )	return 0;
+
+	mgr->dhcdbd_name = isc_mem_get(mgr->mctx, strlen(dhcdbd_name) + 1);
+	if( mgr->dhcdbd_name == 0L )
+	    return 0;
+
+	strcpy(mgr->dhcdbd_name, dhcdbd_name);
+
+    }
+
+    sprintf(path,"/com/redhat/dhcp/subscribe");    
+    sprintf(subs,"com.redhat.dhcp.binary");
+
+    for(i = 0; i < n_opts; i++)
+    {
+	msg = dbus_svc_call
+	      ( dbus,
+		"com.redhat.dhcp",
+		path,
+		"binary",		
+		subs,		
+		TYPE_STRING, &(options[i]),
+		TYPE_INVALID
+	      );
+	if(msg == 0L)
+	    return 0;
+	if ( dbus_svc_message_type( msg ) == ERROR )
+	    return 0;
+    }
+    dbus_mgr_log_err("D-BUS dhcdbd subscription enabled.");
+    return 1;
+}
+
+void 
+dbus_mgr_shutdown
+(   ns_dbus_mgr_t *mgr
+)
+{
+    if( mgr->timer != 0L )
+	isc_timer_detach(&(mgr->timer));
+    if( mgr->dbus != 0L )
+    {
+	isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+	if( mgr->sockets != 0L )
+	{
+	    twalk(mgr->sockets, dbus_mgr_close_socket);
+	    tdestroy(mgr->sockets, dbus_mgr_destroy_socket);
+	    mgr->sockets = 0L;
+	}
+	dbus_svc_shutdown(mgr->dbus);
+    }
+    if( mgr->dhc_if != 0L )
+	tdestroy(mgr->dhc_if, dbus_mgr_free_dhc);
+    if( mgr->dhcdbd_name != 0L )
+	isc_mem_put(mgr->mctx, mgr->dhcdbd_name, strlen(mgr->dhcdbd_name) + 1);
+    isc_task_detach(&(mgr->task));
+    dbus_mgr_free_initial_fwdtable(mgr);
+    isc_mem_put(mgr->mctx, mgr, sizeof(ns_dbus_mgr_t));
+}
+
+static 
+void dbus_mgr_restart_dbus(isc_task_t *t, isc_event_t *ev)
+{   
+    ns_dbus_mgr_t *mgr = (ns_dbus_mgr_t*)(ev->ev_arg) ;
+    t=t;    
+    isc_event_free(&ev);
+    dbus_mgr_log_dbg("attempting to connect to D-BUS");
+    dbus_mgr_init_dbus( mgr );
+}
+
+static
+void dbus_mgr_handle_dbus_shutdown_event(isc_task_t *t, isc_event_t *ev)
+{
+    ns_dbus_mgr_t *mgr = ev->ev_arg;
+    isc_time_t     tick={10,0};
+    isc_interval_t tock={10,0};
+    DBUS_SVC dbus = mgr->dbus;
+    t = t;
+
+    mgr->dbus = 0L;
+
+    isc_event_free(&ev);
+
+    if ( dbus != 0L )
+    {
+	isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+	if( mgr->sockets != 0L )
+	{
+	    twalk(mgr->sockets, dbus_mgr_close_socket);
+	    tdestroy(mgr->sockets, dbus_mgr_destroy_socket);
+	    mgr->sockets = 0L;
+	}
+	dbus_svc_shutdown(dbus);    
+    }
+
+    dbus_mgr_log_err( "D-BUS service disabled." );
+
+    if( mgr->timer != 0L )
+    {
+	isc_timer_reset(mgr->timer,
+			isc_timertype_ticker,
+			&tick, &tock, ISC_TRUE
+	               );
+    }else
+    if( isc_timer_create
+	(   mgr->timermgr,
+	    isc_timertype_ticker,
+	    &tick, &tock,
+	    mgr->task,
+	    dbus_mgr_restart_dbus,
+	    mgr,
+	    &(mgr->timer)
+	) != ISC_R_SUCCESS
+      )
+    {
+	dbus_mgr_log_err( "D-BUS service cannot be restored." );
+    }
+}
+
+static 
+void dbus_mgr_dbus_shutdown_handler ( ns_dbus_mgr_t *mgr )
+{ 
+    isc_event_t *dbus_shutdown_event = 
+	isc_event_allocate
+	(   mgr->mctx, 
+	    mgr->task, 
+	    1,
+	    dbus_mgr_handle_dbus_shutdown_event,
+	    mgr,
+	    sizeof(isc_event_t)
+	 );
+    if( dbus_shutdown_event != 0L )
+    {
+	isc_task_purgerange(mgr->task, 0L, ISC_SOCKEVENT_READ_READY, ISC_SOCKEVENT_SELECTED, 0L);
+	isc_task_send( mgr->task, &dbus_shutdown_event );
+    }else
+	dbus_mgr_log_err("unable to allocate dbus shutdown event");
+}
+
+static
+dns_view_t *dbus_mgr_get_localhost_view(void)
+{
+    dns_view_t       *view;
+    isc_netaddr_t    localhost = { AF_INET, { { htonl( ( 127 << 24 ) | 1 ) } }, 0 };
+    int              match;
+
+    for (view = ISC_LIST_HEAD(ns_g_server->viewlist);
+	 view != NULL;
+	 view = ISC_LIST_NEXT(view, link)
+        )
+    {	
+	/* return first view matching "localhost" source and dest */
+
+	if(( (view->matchclients != 0L )   /* 0L: accept "any" */
+	   &&(( dns_acl_match( &localhost, 
+			     NULL, /* unsigned queries */
+			     view->matchclients,
+		  	     &(ns_g_server->aclenv),
+			     &match, 
+			     NULL  /* no match list */
+		            ) != ISC_R_SUCCESS
+	      ) || (match <= 0)
+	     )
+	    ) 
+	 ||( (view->matchdestinations != 0L )   /* 0L: accept "any" */
+	   &&(( dns_acl_match( &localhost, 
+			     NULL, /* unsigned queries */
+			     view->matchdestinations,
+		  	     &(ns_g_server->aclenv),
+			     &match, 
+			     NULL  /* no match list */
+		            ) != ISC_R_SUCCESS
+	      ) || (match <= 0)
+	     )
+	    )
+	  ) continue;	
+	
+	break;
+    }
+    return view;
+}
+
+static
+dns_fwdtable_t *dbus_mgr_get_fwdtable(void)
+{
+    dns_view_t *view = dbus_mgr_get_localhost_view();
+    if( view != 0L )
+	return view->fwdtable;
+    return 0L;
+}
+
+static
+dns_fwdtable_t *dbus_mgr_get_view_and_fwdtable( dns_view_t **viewp )
+{
+    *viewp = dbus_mgr_get_localhost_view();
+    if( *viewp != 0L )
+	return (*viewp)->fwdtable;
+    return 0L;
+}
+
+static int dbus_mgr_ifwdr_comparator( const void *p1, const void *p2 )
+{
+    char  n1buf[ DNS_NAME_FORMATSIZE ]="", *n1p=&(n1buf[0]),
+	  n2buf[ DNS_NAME_FORMATSIZE ]="", *n2p=&(n2buf[0]);
+    dns_name_t *dn1;
+    dns_name_t *dn2;
+    DE_CONST(&(((const DBusMgrInitialFwdr*)p1)->dn), dn1);
+    DE_CONST(&(((const DBusMgrInitialFwdr*)p2)->dn), dn2);
+    dns_name_format(dn1, n1p, DNS_NAME_FORMATSIZE );    
+    dns_name_format(dn2, n2p, DNS_NAME_FORMATSIZE );    
+    return strcmp(n1buf, n2buf);
+}
+
+static int dbus_mgr_dhc_if_comparator( const void *p1, const void *p2 );
+
+static void dbus_mgr_record_initial_forwarder( dns_name_t *name, dns_forwarders_t *fwdr, void *mp )
+{
+    ns_dbus_mgr_t *mgr = mp;
+    isc_sockaddr_t *sa, *nsa;
+    DBusMgrInitialFwdr *ifwdr;
+ 
+    if( ISC_LIST_HEAD(fwdr->addrs) == 0L) 
+	return;
+
+    if( (ifwdr = isc_mem_get(mgr->mctx, sizeof(DBusMgrInitialFwdr))) == 0L)
+	return;
+
+    ifwdr->fwdpolicy = fwdr->fwdpolicy;
+
+    dns_name_init(&(ifwdr->dn), NULL);
+    if( dns_name_dupwithoffsets(name, mgr->mctx, &(ifwdr->dn)) != ISC_R_SUCCESS )
+	return;
+
+    ISC_LIST_INIT(ifwdr->sa);
+    
+    for( sa = ISC_LIST_HEAD(fwdr->addrs);
+	 sa != 0L;
+	 sa = ISC_LIST_NEXT(sa,link)
+       )
+    {
+	nsa = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+	if( nsa == 0L ) 
+	    return;
+	*nsa = *sa;
+	ISC_LINK_INIT(nsa, link);
+	ISC_LIST_APPEND(ifwdr->sa, nsa, link);
+    }
+    ISC_LINK_INIT(ifwdr, link);
+    tsearch( ifwdr, &(mgr->ifwdt), dbus_mgr_ifwdr_comparator);
+} 
+
+static isc_result_t
+dbus_mgr_record_initial_fwdtable( ns_dbus_mgr_t *mgr )
+{
+    dns_fwdtable_t *fwdtable = dbus_mgr_get_fwdtable();
+    
+    if( fwdtable == 0L )
+	return ISC_R_SUCCESS; /* no initial fwdtable */
+    dns_fwdtable_foreach( fwdtable, dbus_mgr_record_initial_forwarder, mgr);
+    return ISC_R_SUCCESS;
+}
+
+static void
+dbus_mgr_free_initial_forwarder( void *p )
+{
+   DBusMgrInitialFwdr *ifwdr = p;
+   isc_sockaddr_t *sa;
+
+   dns_name_free(&(ifwdr->dn), ns_g_mctx);
+   for( sa = ISC_LIST_HEAD( ifwdr->sa );
+	sa != 0L;
+	sa = ISC_LIST_HEAD( ifwdr->sa )
+      )
+   {
+       if( ISC_LINK_LINKED(sa, link) )
+	   ISC_LIST_UNLINK(ifwdr->sa, sa, link);
+       isc_mem_put(ns_g_mctx, sa, sizeof(isc_sockaddr_t));
+   }
+   isc_mem_put(ns_g_mctx, ifwdr, sizeof(DBusMgrInitialFwdr));
+}
+
+static void
+dbus_mgr_free_initial_fwdtable( ns_dbus_mgr_t *mgr )
+{
+    tdestroy(mgr->ifwdt, dbus_mgr_free_initial_forwarder);
+    mgr->ifwdt = 0L;
+}
+
+static void
+dbus_mgr_log_forwarders( const char *pfx, dns_name_t *name, SockAddrList *saList)
+{
+    isc_sockaddr_t   *sa;
+    char nameP[DNS_NAME_FORMATSIZE], addrP[128];
+    int s=0;
+    dns_name_format(name, nameP, DNS_NAME_FORMATSIZE );    
+    for( sa = ISC_LIST_HEAD(*saList);
+	 sa != 0L;
+	 sa = ISC_LIST_NEXT(sa,link)
+	)
+    {
+	isc_sockaddr_format(sa, addrP, 128);
+	dbus_mgr_log_info("%s zone %s server %d: %s", pfx, nameP, s++, addrP);
+    }		
+}
+
+static
+isc_result_t dbus_mgr_set_forwarders
+(   
+    ns_dbus_mgr_t *mgr,
+    DNSNameList *nameList,
+    SockAddrList *saList,
+    dns_fwdpolicy_t fwdpolicy
+)
+{
+    isc_result_t   result = ISC_R_SUCCESS;    
+    dns_fwdtable_t *fwdtable;
+    dns_view_t     *view=0L;
+    dns_name_t     *dnsName;
+    isc_sockaddr_t   *sa, *nsa;
+    dns_forwarders_t *fwdr=0L;
+
+    fwdtable = dbus_mgr_get_view_and_fwdtable(&view);
+
+    if( fwdtable == 0L )
+    {
+	if( ISC_LIST_HEAD(*saList) == 0L )
+	    return ISC_R_SUCCESS;/* deletion not required */
+
+	view = dbus_mgr_get_localhost_view();
+	if( view == 0L )
+	    return ISC_R_NOPERM; /* if configuration does not allow localhost clients,
+				  * then we really shouldn't be creating a forwarding table.
+				  */
+	result = isc_task_beginexclusive(mgr->task);
+
+	if( result == ISC_R_SUCCESS )
+	{
+	    result = dns_fwdtable_create( mgr->mctx, &(view->fwdtable) );
+
+	    isc_task_endexclusive(mgr->task);
+
+	    if( result != ISC_R_SUCCESS )
+		return result;
+
+	    if( view->fwdtable == 0L )
+		return ISC_R_NOMEMORY;
+
+	    if( isc_log_getdebuglevel(ns_g_lctx) >= 1 )
+		dbus_mgr_log_info("Created forwarder table.");
+	}
+    }
+	
+    for( dnsName = ISC_LIST_HEAD(*nameList);
+	 dnsName != NULL;
+	 dnsName = ISC_LIST_NEXT(dnsName,link)
+	)
+    {   	
+	fwdr = 0L;
+	if( ( dns_fwdtable_find_exact( fwdtable, dnsName, &fwdr ) != ISC_R_SUCCESS )
+	  ||( fwdr == 0L )
+	  )
+	{ 
+	    if( ISC_LIST_HEAD( *saList )  == 0L )
+		continue;
+	   /* no forwarders for name - add forwarders */
+
+	    result = isc_task_beginexclusive(mgr->task);
+
+	    if( result == ISC_R_SUCCESS )
+	    {
+		result = dns_fwdtable_add( fwdtable, dnsName, 
+					   (isc_sockaddrlist_t*)saList, 
+					   fwdpolicy
+					 ) ;
+
+		if( view != 0L )
+		    dns_view_flushcache( view );
+
+		isc_task_endexclusive(mgr->task);	
+
+		if( result != ISC_R_SUCCESS )
+		    return result;
+
+		if( isc_log_getdebuglevel(ns_g_lctx) >= 1 )
+		    dbus_mgr_log_forwarders("Created forwarder",dnsName, saList);
+	    }
+	    continue;
+	}
+
+	if( ISC_LIST_HEAD( *saList ) == 0L )
+	{ /* empty forwarders list - delete forwarder entry */
+
+	    if( isc_log_getdebuglevel(ns_g_lctx) >= 1 )
+		dbus_mgr_log_forwarders("Deleting forwarder", dnsName, (SockAddrList*)&(fwdr->addrs));
+
+	    result = isc_task_beginexclusive(mgr->task);
+	    if( result == ISC_R_SUCCESS )
+	    {
+		result = dns_fwdtable_delete( fwdtable, dnsName );
+
+		if( view != 0L )
+		    dns_view_flushcache( view );
+
+		isc_task_endexclusive(mgr->task);
+
+		if( result != ISC_R_SUCCESS )
+		    return result;	
+	    }
+	    continue;
+	}	
+
+	result = isc_task_beginexclusive(mgr->task);
+
+	if( result == ISC_R_SUCCESS )
+	{	 	   
+	    fwdr->fwdpolicy = fwdpolicy;
+
+	    if( isc_log_getdebuglevel(ns_g_lctx) >= 1 )
+		dbus_mgr_log_forwarders("Removing forwarder", dnsName, (SockAddrList*)&(fwdr->addrs));
+	    
+	    for( sa = ISC_LIST_HEAD(fwdr->addrs);
+		 sa != 0L ;
+		 sa = ISC_LIST_HEAD(fwdr->addrs)
+	       )
+	    {
+		if( ISC_LINK_LINKED(sa, link) )
+		    ISC_LIST_UNLINK(fwdr->addrs, sa, link);
+		isc_mem_put(mgr->mctx, sa, sizeof(isc_sockaddr_t));
+	    }
+
+	    ISC_LIST_INIT( fwdr->addrs );
+	    
+	    for( sa = ISC_LIST_HEAD(*saList);
+		 sa != 0L;
+		 sa = ISC_LIST_NEXT(sa,link)
+	       )
+	    {
+		nsa = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+		if( nsa == 0L )
+		{
+		    result = ISC_R_NOMEMORY;
+		    break;
+		}
+		*nsa = *sa;
+		ISC_LINK_INIT( nsa, link );
+		ISC_LIST_APPEND( fwdr->addrs, nsa, link );
+	    }	    
+
+	    if( view != 0L )
+		dns_view_flushcache( view );
+
+	    isc_task_endexclusive(mgr->task);
+
+	    if( isc_log_getdebuglevel(ns_g_lctx) >= 1 )
+		dbus_mgr_log_forwarders("Added forwarder", dnsName, (SockAddrList*)&(fwdr->addrs));
+
+	}else
+	    return result;
+
+    }
+    return (result);
+}
+
+static void
+dbus_mgr_get_name_list
+( 
+    ns_dbus_mgr_t *mgr,
+    char *domains, 
+    DNSNameList *nameList,
+    char *error_name,
+    char *error_message
+)
+{
+    char *name, *endName, *endp;
+    dns_fixedname_t *fixedname;
+    dns_name_t      *dnsName;
+    isc_buffer_t     buffer;
+    isc_result_t     result;
+    uint32_t total_length;
+    
+    total_length = strlen(domains);
+    endp = domains + total_length;
+
+    ISC_LIST_INIT( *nameList );
+
+    for( name =   domains + strspn(domains," \t\n"),
+	 endName = name + strcspn(name," \t\n");
+	 (name < endp) && (endName <= endp); 
+	 name =  endName + 1 + strspn(endName+1," \t\n"),
+	 endName = name + strcspn(name," \t\n")
+       )
+    {  /* name loop */
+	*endName = '\0';
+
+	isc_buffer_init( &buffer, name, endName - name );
+	isc_buffer_add(&buffer, endName - name);		
+	
+	fixedname = isc_mem_get( mgr->mctx, sizeof( dns_fixedname_t ));
+
+	dns_fixedname_init(fixedname);
+
+	dnsName = dns_fixedname_name(fixedname);
+
+	result= dns_name_fromtext
+	        (  dnsName, &buffer, ( *(endp-1) != '.') ? dns_rootname : NULL, ISC_FALSE, NULL
+		); 
+
+	if( result != ISC_R_SUCCESS )
+	{
+	    sprintf(error_name, "com.redhat.named.InvalidArgument");
+	    sprintf(error_message,"Invalid DNS name initial argument: %s", name);
+	    
+	    isc_mem_put( mgr->mctx, fixedname, sizeof( dns_fixedname_t ) );
+
+	    for( dnsName = ISC_LIST_HEAD( *nameList );
+		 (dnsName != 0L);
+		 dnsName = ISC_LIST_HEAD( *nameList )
+	       )
+	    {
+		if( ISC_LINK_LINKED(dnsName,link) )
+		    ISC_LIST_DEQUEUE( *nameList, dnsName, link );
+		isc_mem_put( mgr->mctx, dnsName, sizeof( dns_fixedname_t ) );
+	    }
+	    ISC_LIST_INIT(*nameList);
+	    return;
+	}
+	ISC_LINK_INIT(dnsName, link);
+	ISC_LIST_ENQUEUE( *nameList, dnsName, link );
+    }
+}
+
+static isc_result_t
+dbus_mgr_get_sa_list
+(
+    ns_dbus_mgr_t *mgr,
+    dbus_svc_MessageIterator iter,
+    SockAddrList *saList ,
+    uint8_t *fwdpolicy,
+    char *error_name,
+    char *error_message
+)
+{
+    DBUS_SVC dbus = mgr->dbus;
+    isc_sockaddr_t *nsSA=0L, *nsSA_Q=0L;
+    uint32_t argType = dbus_svc_message_next_arg_type( dbus, iter ), 
+	     length;    
+    isc_result_t result;
+    in_port_t port;
+    char *ip;
+    uint8_t *iparray=0L;
+
+    ISC_LIST_INIT(*saList);
+
+    if( argType == TYPE_INVALID ) 
+	return ISC_R_SUCCESS; /* address list "removal" */
+   
+    do
+    {
+	switch( argType )
+	{
+	case TYPE_UINT32:
+
+	    nsSA = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+	    if( nsSA != 0L )
+	    {
+		memset(nsSA,'\0', sizeof(isc_sockaddr_t));
+		nsSA_Q = nsSA;
+		dbus_svc_message_next_arg(dbus, iter, &(nsSA->type.sin.sin_addr.s_addr));	
+		nsSA->type.sa.sa_family = AF_INET;
+		nsSA->length = sizeof( nsSA->type.sin );
+	    }
+	    break;
+
+	case TYPE_ARRAY:
+
+	    argType = dbus_svc_message_element_type( dbus, iter );
+	    if( argType == TYPE_BYTE )
+	    {
+		iparray = 0L;
+		length = 0;
+
+		dbus_svc_message_get_elements(dbus, iter, &length, &iparray);
+		
+		if( iparray != 0L )
+		{
+		    if (length == sizeof( struct in_addr ))
+		    {
+			nsSA = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+			if( nsSA != 0L )
+			{
+			    memset(nsSA,'\0', sizeof(isc_sockaddr_t));
+			    nsSA_Q = nsSA;
+
+			    memcpy(&(nsSA->type.sin.sin_addr), iparray, sizeof( struct in_addr ));
+			    nsSA->type.sa.sa_family = AF_INET;
+			    nsSA->length = sizeof( nsSA->type.sin );
+			}
+		    }else
+		    if (length == sizeof( struct in6_addr ))
+		    {
+			nsSA = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+			if( nsSA != 0L )
+			{
+			    memset(nsSA,'\0', sizeof(isc_sockaddr_t));
+			    nsSA_Q = nsSA;
+			
+			    memcpy(&(nsSA->type.sin6.sin6_addr), iparray, sizeof( struct in6_addr ));
+			    nsSA->type.sa.sa_family = AF_INET6;
+			    nsSA->length = sizeof( nsSA->type.sin6 );
+			}
+		    }
+		}
+	    }
+	    break;
+
+	case TYPE_STRING:
+
+	    ip = 0L;
+	    dbus_svc_message_next_arg(dbus, iter, &(ip));	
+	    if( ip != 0L )
+	    {
+		length = strlen(ip);
+		if( strspn(ip, "0123456789.") == length )
+		{
+		    nsSA = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+		    if( nsSA != 0L) 
+		    {
+			memset(nsSA,'\0', sizeof(isc_sockaddr_t));
+			if( inet_pton( AF_INET, ip, &(nsSA->type.sin.sin_addr)) )
+			{
+			    nsSA->type.sa.sa_family = AF_INET;
+			    nsSA->length = sizeof(nsSA->type.sin);
+			    nsSA_Q = nsSA;
+			}
+		    }
+		}else
+		if( strspn(ip, "0123456789AaBbCcDdEeFf:.") == length)
+		{
+		    nsSA = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+		    if( nsSA != 0L )
+		    {
+			memset(nsSA,'\0', sizeof(isc_sockaddr_t));
+			if( inet_pton( AF_INET6, ip, &(nsSA->type.sin6.sin6_addr)) )
+			{
+			    nsSA->type.sa.sa_family = AF_INET6;
+			    nsSA->length = sizeof(nsSA->type.sin6);
+			    nsSA_Q = nsSA;
+			}
+		    }
+		}
+	    }
+	    break;
+	   
+	case TYPE_UINT16:
+	    
+	    if( (nsSA == 0L) || (nsSA->type.sa.sa_family == AF_UNSPEC) )
+		break;
+	    else
+	    if( nsSA->type.sa.sa_family == AF_INET )
+		dbus_svc_message_next_arg(dbus, iter, &(nsSA->type.sin.sin_port));
+	    else
+            if( nsSA->type.sa.sa_family == AF_INET6 )
+		dbus_svc_message_next_arg(dbus, iter, &(nsSA->type.sin6.sin6_port));
+	    break;
+
+	case TYPE_BYTE:
+
+	    dbus_svc_message_next_arg(dbus, iter, fwdpolicy);
+	    if(*fwdpolicy > dns_fwdpolicy_only)
+		*fwdpolicy =  dns_fwdpolicy_only;
+	    break;
+
+	default:
+
+	    if(nsSA != 0L) 
+		nsSA->type.sa.sa_family = AF_UNSPEC;
+	    sprintf(error_message,"Unhandled argument type: %c", argType);
+	    break;
+	}
+
+	if( (nsSA != 0L) 
+	  &&(nsSA->type.sa.sa_family == AF_UNSPEC)
+	  )
+	{
+	    sprintf(error_name, "com.redhat.named.InvalidArgument");
+	    if( error_message[0]=='\0')
+	    {
+		if( nsSA == 0L )
+		    sprintf(error_message,"Missing IP Address Name Server argument");
+		else
+		    sprintf(error_message,"Bad IP Address Name Server argument");
+	    }
+       	    if( nsSA != 0L )
+		isc_mem_put(mgr->mctx, nsSA, sizeof(isc_sockaddr_t));
+	    nsSA = 0L;
+	    for( nsSA = ISC_LIST_HEAD( *saList );
+		 (nsSA != 0L);
+		 nsSA = ISC_LIST_HEAD( *saList )
+	       )
+	    {
+		if(ISC_LINK_LINKED(nsSA, link))
+		    ISC_LIST_DEQUEUE( *saList, nsSA, link );
+		isc_mem_put( mgr->mctx, nsSA, sizeof( isc_sockaddr_t ) );
+	    }
+	    ISC_LIST_INIT(*saList);
+	    return ISC_R_FAILURE;
+	}
+
+	if( nsSA != 0L )
+	{
+	    if( nsSA->type.sin.sin_port == 0 )
+	    {
+		if( ns_g_port != 0L )
+		    nsSA->type.sin.sin_port = htons(ns_g_port);
+		else
+		{
+		    result = ns_config_getport(ns_g_config, &(port) );
+		    if( result != ISC_R_SUCCESS )
+			port = 53;
+		    nsSA->type.sin.sin_port = htons( port );
+		}
+	    }	
+	
+	    if( nsSA_Q != 0L )
+	    {
+		ISC_LINK_INIT(nsSA,link);
+		ISC_LIST_ENQUEUE(*saList, nsSA, link);
+		nsSA_Q = 0L;
+	    }
+	}
+
+	argType = dbus_svc_message_next_arg_type( dbus, iter );    
+
+    } while ( argType != TYPE_INVALID );
+
+    return ISC_R_SUCCESS;
+}
+
+static void
+dbus_mgr_handle_set_forwarders
+(
+    ns_dbus_mgr_t *mgr,
+    DBUS_SVC dbus, 
+    uint8_t  reply_expected,
+    uint32_t serial,        
+    const char *path,         
+    const char *member,         
+    const char *interface,
+    const char *sender,   
+    dbus_svc_MessageHandle msg
+)
+{
+    dbus_svc_MessageIterator iter;
+    char error_name[1024]="", error_message[1024]="", *domains=0L;
+    uint32_t       argType, new_serial;
+    DNSNameList nameList; 
+    dns_name_t     *dnsName;
+    SockAddrList  saList;    
+    isc_sockaddr_t *nsSA;
+    isc_result_t   result;
+    uint8_t fwdpolicy = dns_fwdpolicy_only;
+    
+    iter = dbus_svc_message_iterator_new( dbus, msg );
+
+    if( iter == 0L )
+    {
+	if( reply_expected )
+	{
+	    sprintf(error_name, "com.redhat.named.InvalidArguments");
+	    sprintf(error_message,"SetForwarders requires DNS name and nameservers arguments.");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );
+	}
+	return;
+    }
+    
+    argType = dbus_svc_message_next_arg_type( dbus, iter );
+
+    if( argType != TYPE_STRING )
+    {
+	if( reply_expected )
+	{
+	    sprintf(error_name, "com.redhat.named.InvalidArguments");
+	    sprintf(error_message,"SetForwarders requires DNS name string initial argument.");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );
+	}
+	return;
+    } 
+    
+    dbus_svc_message_next_arg( dbus, iter, &domains );
+
+    if( ( domains == 0L ) || (*domains == '\0') )
+    {
+	if( reply_expected )
+	{
+	    sprintf(error_name, "com.redhat.named.InvalidArguments");
+	    sprintf(error_message,"SetForwarders requires DNS name string initial argument.");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );
+	}
+	return;
+    }
+    
+    dbus_mgr_get_name_list( mgr, domains, &nameList, error_name, error_message );
+    
+    if( error_name[0] != '\0' )
+    {
+	if( reply_expected )
+	{
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );
+	}
+	return;
+    }
+
+    if( ISC_LIST_HEAD( nameList ) == 0L )
+	return;	
+
+    result = dbus_mgr_get_sa_list( mgr, iter, &saList , &fwdpolicy, error_name, error_message );
+
+    if( result == ISC_R_SUCCESS )
+    {
+	result = dbus_mgr_set_forwarders( mgr, &nameList, &saList, fwdpolicy );
+
+	if( result != ISC_R_SUCCESS )
+	{
+	    if( reply_expected )
+	    {
+		sprintf(error_name, "com.redhat.named.Failure");
+		sprintf(error_message, isc_result_totext(result));
+		dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		             );
+	    }
+	}else	
+	    if( reply_expected )
+		dbus_svc_send( dbus, RETURN, serial, &new_serial, sender, path, interface, member,
+		       TYPE_UINT32, &result, TYPE_INVALID
+	             );
+    }else
+    {
+	if( reply_expected )
+	{
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );
+	}
+    }
+
+    for( dnsName = ISC_LIST_HEAD( nameList );
+	 (dnsName != 0L) ;
+	 dnsName = ISC_LIST_HEAD( nameList )
+	)
+    {
+	if( ISC_LINK_LINKED(dnsName,link) )
+	    ISC_LIST_DEQUEUE( nameList, dnsName, link );
+	isc_mem_put( mgr->mctx, dnsName, sizeof( dns_fixedname_t ) );
+    }
+
+    for( nsSA = ISC_LIST_HEAD(saList);
+	 (nsSA != 0L) ;
+	 nsSA = ISC_LIST_HEAD(saList)
+       )
+    {
+	if( ISC_LINK_LINKED(nsSA,link) )
+	    ISC_LIST_DEQUEUE( saList, nsSA, link );
+	isc_mem_put(mgr->mctx, nsSA, sizeof(isc_sockaddr_t));
+    }
+}
+
+static 
+int dbus_mgr_msg_append_dns_name
+(   DBUS_SVC dbus, 
+    dbus_svc_MessageHandle msg,
+    dns_name_t *name
+)
+{
+    char  nameBuf[ DNS_NAME_FORMATSIZE ]="", *nameP=&(nameBuf[0]);
+
+    dns_name_format(name, nameP, DNS_NAME_FORMATSIZE );    
+
+    if( *nameP == '\0' )
+	return 0;
+
+    return dbus_svc_message_append_args( dbus, msg, TYPE_STRING, &nameP, TYPE_INVALID ) > 0;
+}
+
+typedef enum dbmoi_e
+{
+    OUTPUT_BINARY,
+    OUTPUT_TEXT    
+}   DBusMgrOutputInterface;
+
+static 
+int dbus_mgr_msg_append_forwarders
+(   DBUS_SVC               dbus, 
+    dbus_svc_MessageHandle msg,
+    dns_forwarders_t      *fwdr,
+    DBusMgrOutputInterface outputType
+)
+{
+    isc_sockaddr_t *sa;
+    char policyBuf[16]="", *pbp[1]={&(policyBuf[0])}, addressBuf[64]="", *abp[1]={&(addressBuf[0])};
+    uint8_t *byteArray[1];
+
+    if( outputType == OUTPUT_BINARY )
+    {
+	if(!dbus_svc_message_append_args
+	   (   dbus, msg, 
+	       TYPE_BYTE, &(fwdr->fwdpolicy),
+	       TYPE_INVALID
+	   )
+	  ) return 0;
+    }else
+    if( outputType == OUTPUT_TEXT )
+    {
+	sprintf(policyBuf,"%s",
+		(fwdr->fwdpolicy == dns_fwdpolicy_none)
+		? "none"
+		:  (fwdr->fwdpolicy == dns_fwdpolicy_first)
+		   ? "first"
+		   : "only"
+	       );
+	if(!dbus_svc_message_append_args
+	   (   dbus, msg, 
+	       TYPE_STRING, pbp,
+	       TYPE_INVALID
+	   )
+	  ) return 0;
+    }else
+	return 0;
+
+    for( sa = ISC_LIST_HEAD(fwdr->addrs);
+	 sa != 0L;
+	 sa = ISC_LIST_NEXT(sa, link)
+	)
+    {
+	if( outputType == OUTPUT_BINARY )
+	{
+	    if( sa->type.sa.sa_family == AF_INET )
+	    {
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_UINT32, &(sa->type.sin.sin_addr.s_addr),
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+		
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_UINT16, &(sa->type.sin.sin_port),
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+	    }else
+	    if( sa->type.sa.sa_family == AF_INET6 )
+	    {
+		byteArray[0] = (uint8_t*)&(sa->type.sin6.sin6_addr);
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_ARRAY, TYPE_BYTE, &byteArray, sizeof(struct in6_addr),
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_UINT16, &(sa->type.sin6.sin6_port),
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+	    }else
+		continue;
+	}else
+	if( outputType == OUTPUT_TEXT )
+	{
+	    if( sa->type.sa.sa_family == AF_INET )
+	    {
+		if( inet_ntop( AF_INET, &(sa->type.sin.sin_addr), addressBuf, sizeof(addressBuf)) == 0L )
+		    continue;
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_STRING, abp,
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+		sprintf(addressBuf, "%hu", ntohs( sa->type.sin.sin_port ));
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_STRING, abp,
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+	    }else
+	    if( sa->type.sa.sa_family == AF_INET6 )
+	    {
+		if( inet_ntop( AF_INET6, &(sa->type.sin6.sin6_addr), addressBuf, sizeof(addressBuf)) == 0L )
+		    continue;
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_STRING, abp,
+		       TYPE_INVALID
+		   )
+		  ) return 0;
+		sprintf(addressBuf, "%hu", ntohs( sa->type.sin6.sin6_port ));
+		if(!dbus_svc_message_append_args
+		   (   dbus, msg, 
+		       TYPE_STRING, abp,
+		       TYPE_INVALID
+		   )
+		  ) return 0;		
+	    }else
+		continue;
+	}else
+	    return 0;
+    }
+    return 1;
+}
+
+typedef struct dbm_m_s
+{
+    DBUS_SVC dbus;
+    dbus_svc_MessageHandle msg;
+    DBusMgrOutputInterface outputType;
+}   DBusMgrMsg;
+
+static
+void forwarders_to_msg( dns_name_t *name, dns_forwarders_t *fwdr, void *mp )
+{
+    DBusMgrMsg *m = mp;
+    
+    if( (fwdr == 0L) || (name == 0L) || (mp == 0L))
+	return;
+    dbus_mgr_msg_append_dns_name  ( m->dbus, m->msg, name );
+    dbus_mgr_msg_append_forwarders( m->dbus, m->msg, fwdr, m->outputType );    
+}
+
+static void
+dbus_mgr_handle_list_forwarders
+(
+    DBUS_SVC dbus, 
+    uint8_t  reply_expected,
+    uint32_t serial,        
+    const char *path,         
+    const char *member,         
+    const char *interface,
+    const char *sender,   
+    dbus_svc_MessageHandle msg
+)
+{
+    char error_name[1024], error_message[1024];
+    DBusMgrMsg m;
+    uint32_t new_serial;
+    dns_fwdtable_t *fwdtable = dbus_mgr_get_fwdtable();
+    DBusMgrOutputInterface outputType = OUTPUT_BINARY;
+    uint32_t length = strlen(interface);
+        
+    if( !reply_expected )
+	return;
+
+    if( (length > 4) && (strcmp(interface + (length - 4), "text")==0))
+	outputType = OUTPUT_TEXT;
+
+    if( fwdtable == 0L )
+    {	
+	sprintf(error_name,"com.redhat.dbus.Failure");
+	sprintf(error_message, "%s", isc_result_totext(ISC_R_NOPERM));
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	    
+	return;
+    }
+
+    msg = dbus_svc_new_message( dbus, RETURN, serial, sender, path, interface, member);
+
+    m.dbus = dbus;
+    m.msg = msg;
+    m.outputType = outputType;
+
+    if( msg == 0L )
+    {
+	sprintf(error_name,"com.redhat.dbus.OutOfMemory");
+	sprintf(error_message,"out of memory");
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	    
+    }
+    
+    dns_fwdtable_foreach( fwdtable, forwarders_to_msg, &m );
+
+    dbus_svc_send_message( dbus, msg, &new_serial );
+}
+
+static void
+dbus_mgr_handle_get_forwarders
+(
+    DBUS_SVC dbus, 
+    uint8_t  reply_expected,
+    uint32_t serial,        
+    const char *path,         
+    const char *member,         
+    const char *interface,
+    const char *sender,   
+    dbus_svc_MessageHandle msg
+)
+{
+    char error_name[1024], error_message[1024], *domain=0L;
+    isc_result_t    result;
+    dns_fixedname_t  fixedname;
+    dns_name_t       *dnsName;
+    isc_buffer_t     buffer;
+    uint32_t         length,  new_serial;
+    dns_fwdtable_t   *fwdtable;
+    dns_forwarders_t *fwdr=0L;
+    dns_name_t       *foundname;
+    dns_fixedname_t  fixedFoundName;
+    DBusMgrOutputInterface outputType = OUTPUT_BINARY;
+
+    if( !reply_expected )
+	return;
+
+    length = strlen(interface);
+
+    if( (length > 4) && (strcmp(interface + (length - 4), "text")==0))
+	outputType = OUTPUT_TEXT;
+
+    if( (!dbus_svc_get_args( dbus, msg, TYPE_STRING, &domain, TYPE_INVALID))
+      ||(domain == 0L)
+      ||(*domain == '\0')
+      )
+    {
+
+	sprintf(error_name,"com.redhat.dbus.InvalidArguments");
+	sprintf(error_message,"domain name argument expected");
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	    
+	return;
+    }
+    
+    length = strlen( domain );
+
+    isc_buffer_init( &buffer, domain, length); 
+
+    isc_buffer_add(&buffer, length);		
+    
+    dns_fixedname_init(&fixedname);
+
+    dnsName = dns_fixedname_name(&fixedname);
+
+    result = dns_name_fromtext
+	     (  dnsName, &buffer, dns_rootname, ISC_FALSE, NULL
+	     ); 
+
+    if( result != ISC_R_SUCCESS )
+    {	
+	sprintf(error_name,"com.redhat.dbus.InvalidArguments");
+	sprintf(error_message,"invalid domain name argument: %s", domain);
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	    
+	return;
+    }
+
+    msg = dbus_svc_new_message( dbus, RETURN, serial, sender, path, interface, member);
+    
+    if( msg == 0L )
+    {
+	sprintf(error_name,"com.redhat.dbus.OutOfMemory");
+	sprintf(error_message,"out of memory");
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	
+	return;
+    }	
+    
+    fwdtable = dbus_mgr_get_fwdtable();
+
+    if( fwdtable == 0L )
+    {
+	sprintf(error_name,"com.redhat.dbus.Failure");
+	sprintf(error_message, "%s", isc_result_totext(ISC_R_NOPERM));
+	dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+		       TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+	             );	    
+	return;
+    }
+
+    dns_fixedname_init(&fixedFoundName);
+    foundname = dns_fixedname_name(&fixedFoundName);
+	
+    if( ( dns_fwdtable_find_closest( fwdtable, dnsName, foundname, &fwdr ) == ISC_R_SUCCESS )
+      &&( fwdr != 0L )
+      )
+    {
+	if( (!dbus_mgr_msg_append_dns_name( dbus, msg, foundname ))
+	  ||(!dbus_mgr_msg_append_forwarders( dbus, msg, fwdr, outputType ))
+	  )
+	{
+	    sprintf(error_name,"com.redhat.dbus.OutOfMemory");
+	    sprintf(error_message,"out of memory");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		);	    
+	    return;
+	}	
+	
+    }else
+    {
+	result = ISC_R_NOTFOUND;
+	if( outputType == OUTPUT_BINARY )
+	{
+	    dbus_svc_message_append_args( dbus, msg, 
+					  TYPE_UINT32, &(result),
+					  TYPE_INVALID
+		                        ) ;
+	}else
+	{
+	    sprintf(error_name,"com.redhat.dbus.NotFound");
+	    sprintf(error_message,"Not Found");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		         );	   
+	    return;
+	}
+    }
+    dbus_svc_send_message( dbus, msg, &new_serial );
+}
+
+static void
+dbus_mgr_check_dhcdbd_state( ns_dbus_mgr_t *mgr, dbus_svc_MessageHandle msg )
+{
+    DBUS_SVC dbus = mgr->dbus;
+    char *name_owned = 0L,
+	 *old_owner = 0L,
+	 *new_owner = 0L;
+    
+    if( !dbus_svc_get_args( dbus, msg,
+			    TYPE_STRING, &name_owned,
+			    TYPE_STRING, &old_owner,
+			    TYPE_STRING, &new_owner,
+			    TYPE_INVALID
+	                  )
+      ) return;
+	
+    dbus_mgr_log_dbg("NameOwnerChanged: %s %s %s ( %s )", name_owned, old_owner, new_owner, mgr->dhcdbd_name);
+
+    if( (name_owned == 0L) || (new_owner == 0L) || (old_owner == 0L) )
+	return;
+
+    if( strcmp( name_owned, "com.redhat.dhcp" ) == 0 )
+    {
+	if( *new_owner == '\0' )
+	{
+	    isc_mem_put(mgr->mctx, mgr->dhcdbd_name, strlen(mgr->dhcdbd_name) + 1);
+	    mgr->dhcdbd_name = 0L;
+	    dbus_mgr_log_err("D-BUS dhcdbd subscription disabled.");
+	    return;
+	}
+	if( (mgr->dhcdbd_name == 0L) 
+	  ||( strcmp( mgr->dhcdbd_name, new_owner) != 0 )
+	  )
+	{
+	    if( mgr->dhcdbd_name != 0L )
+	    {
+		isc_mem_put(mgr->mctx, mgr->dhcdbd_name, strlen(mgr->dhcdbd_name)+1);
+		mgr->dhcdbd_name = 0L;
+	    }
+	    mgr->dhcdbd_name = isc_mem_get(mgr->mctx, strlen(new_owner) + 1);
+	    if( mgr->dhcdbd_name == 0L )
+		return;
+	    strcpy( mgr->dhcdbd_name, new_owner );
+	    dbus_mgr_subscribe_to_dhcdbd( mgr );
+	}
+    }else
+    if(  ( mgr->dhcdbd_name != 0L ) 
+      && ( strcmp(mgr->dhcdbd_name, name_owned) == 0L )
+      && ( *new_owner == '\0' )
+      ) 
+    {
+	isc_mem_put(mgr->mctx, mgr->dhcdbd_name, strlen(mgr->dhcdbd_name));
+	mgr->dhcdbd_name = 0L;
+	dbus_mgr_log_err("D-BUS dhcdbd subscription disabled.");
+    }
+}
+
+static int dbus_mgr_dhc_if_comparator( const void *p1, const void *p2 )
+{
+    return( strcmp( ((const DHC_IF*)p1)->if_name, ((const DHC_IF*)p2)->if_name) );
+}
+
+static 
+dns_name_t *dbus_mgr_if_reverse_ip_name
+(   ns_dbus_mgr_t *mgr,
+    struct in_addr ip_address, 
+    struct in_addr subnet_mask 
+)
+{
+    dns_name_t *dns_name =0L;
+    dns_fixedname_t *fixedname=0L;
+    char name [ DNS_NAME_FORMATSIZE ], *p;
+    uint32_t ip = (ntohl(ip_address.s_addr) & ntohl(subnet_mask.s_addr)), i;
+    isc_buffer_t buffer;
+    isc_result_t result;
+
+    if( (ip == 0) || (ip == 0xffffffff) )
+	return 0L;
+    
+    for(i = 8, p = name; (i < 32); i += 8)
+	if( ip & ( 0xff << i ) )
+	    p += sprintf(p, "%u.", (((ip & ( 0xff << i )) >> i ) & 0xff) );
+
+    if( p > name )
+    {
+	p += sprintf(p, "in-addr.arpa");
+	isc_buffer_init( &buffer, name, p - name );
+	isc_buffer_add(&buffer, p - name);		
+	
+	fixedname = isc_mem_get( mgr->mctx, sizeof( dns_fixedname_t ));
+
+	dns_fixedname_init(fixedname);
+
+	dns_name = dns_fixedname_name(fixedname);
+
+	result= dns_name_fromtext
+	        (  dns_name, &buffer, dns_rootname, ISC_FALSE, NULL
+		); 
+
+	ISC_LINK_INIT(dns_name, link);
+	if( result == ISC_R_SUCCESS )
+	    return dns_name;
+    }
+    return 0L;
+}
+
+static void
+dbus_mgr_free_dhc( void *p )
+{
+    DHC_IF *d_if = p;
+    dns_name_t *dn;
+    isc_sockaddr_t *sa;
+
+    isc_mem_put( ns_g_mctx, d_if->if_name, strlen(d_if->if_name) + 1);
+    for( sa = ISC_LIST_HEAD( d_if->dns );
+	 sa != NULL;
+	 sa = ISC_LIST_HEAD( d_if->dns )
+       )
+    {
+	if( ISC_LINK_LINKED( sa, link ) )
+	    ISC_LIST_UNLINK( d_if->dns, sa, link );
+	isc_mem_put(ns_g_mctx, sa, sizeof(isc_sockaddr_t));
+    }
+    for( dn = ISC_LIST_HEAD( d_if->dn );
+	 dn != NULL;
+	 dn = ISC_LIST_HEAD( d_if->dn )
+       )
+    {
+	if( ISC_LINK_LINKED( dn, link ) )
+	    ISC_LIST_UNLINK( d_if->dn, dn, link );
+	isc_mem_put( ns_g_mctx, dn, sizeof( dns_fixedname_t ) );
+    }
+    isc_mem_put( ns_g_mctx, d_if, sizeof(DHC_IF));    
+}
+
+static void
+dbus_mgr_handle_dhcdbd_message
+(
+    ns_dbus_mgr_t *mgr,
+    const char *path,
+    const char *member,
+    dbus_svc_MessageHandle msg
+)
+{
+    DBUS_SVC dbus = mgr->dbus;
+    DHC_IF *d_if, *const*d_ifpp, dif;
+    DHC_State dhc_state;
+    char *if_name, *opt_name, error_name[1024]="", error_message[1024]="";
+    uint8_t *value=0L;
+    uint32_t length;
+    isc_result_t result;
+    isc_sockaddr_t *sa = 0L;
+    dns_name_t *dn = 0L;
+    struct in_addr *ip;
+    in_port_t port;
+    char dnBuf[ DNS_NAME_FORMATSIZE ];
+    isc_buffer_t buffer;
+    DBusMgrInitialFwdr *ifwdr, *const*ifwdpp, ifwd;    
+    ISC_LIST(DBusMgrInitialFwdr) ifwdrList;
+    DNSNameList nameList;
+    dbus_mgr_log_dbg("Got dhcdbd message: %s %s %p", path, member, msg );
+
+    if( ( if_name = strrchr(path,'/') ) == 0L )
+    {
+	dbus_mgr_log_err("bad path in dhcdbd message:", path);
+	return;
+    }
+
+    ++if_name;
+    dif.if_name = if_name;
+
+    if( ((d_ifpp=tfind( &dif, &(mgr->dhc_if), dbus_mgr_dhc_if_comparator)) == 0L)
+      ||((d_if = *d_ifpp) == 0L)
+      )
+    {
+	d_if = isc_mem_get( mgr->mctx, sizeof(DHC_IF));
+	if( d_if == 0L )	  
+	{
+	    dbus_mgr_log_err("out of memory");
+	    return;
+	}
+	memset(d_if, '\0', sizeof(DHC_IF));
+	if((d_if->if_name =  isc_mem_get( mgr->mctx, strlen(if_name) + 1)) == 0L)
+	{
+	    dbus_mgr_log_err("out of memory");
+	    return;
+	}
+	strcpy(d_if->if_name, if_name);
+	d_if->dhc_state = DHC_INVALID;
+	d_if->previous_state = DHC_INVALID;
+	ISC_LIST_INIT( d_if->dn );
+	ISC_LIST_INIT( d_if->dns );
+	if( tsearch( d_if, &(mgr->dhc_if), dbus_mgr_dhc_if_comparator) == 0L )
+	{
+	    dbus_mgr_log_err("out of memory");
+	    return;
+	}
+    }
+
+    if( strcmp(member, "reason") == 0 )
+    {
+	if( (!dbus_svc_get_args( dbus, msg,
+				 TYPE_STRING, &opt_name,
+				 TYPE_ARRAY, TYPE_BYTE, &value, &length,
+				 TYPE_INVALID
+		               )
+	    )
+	  ||( value == 0L)
+	  ||( length != sizeof(uint32_t))
+	  ||( *((uint32_t*)value) > DHC_END_OPTIONS)
+	  )
+	{
+	    dbus_mgr_log_err("Invalid DHC reason value received from dhcdbd");
+	    return;
+	}
+	dhc_state = (DHC_State) *((uint32_t*)value);
+	dbus_mgr_log_dbg("reason: %d %d %d", dhc_state, d_if->dhc_state, d_if->previous_state);
+	switch( dhc_state )
+	{
+
+	case  DHC_END_OPTIONS:
+	    switch( d_if->dhc_state )
+	    {
+	    case  DHC_END_OPTIONS:
+		break;
+
+	    case  DHC_RENEW: 
+	    case  DHC_REBIND:		
+		if( ( d_if->previous_state != DHC_INVALID ) 
+		  &&( d_if->previous_state != DHC_RELEASE )
+		  ) break; 
+		    /* DHC_RENEW means the same lease parameters were obtained. 
+		     * Only do configuration if we started up with existing dhclient
+		     * which has now renewed - else we are already configured correctly.
+		     */
+		dbus_mgr_log_err("D-BUS: existing dhclient for interface %s RENEWed lease", if_name);
+
+	    case  DHC_REBOOT:
+	    case  DHC_BOUND:
+		d_if->previous_state = d_if->dhc_state;
+		d_if->dhc_state = DHC_BOUND;
+		if( (dn = dbus_mgr_if_reverse_ip_name(mgr, d_if->ip, d_if->subnet_mask )) != 0L )
+		{
+		    ISC_LIST_APPEND(d_if->dn, dn, link );
+		} 
+		if( ( ISC_LIST_HEAD( d_if->dn ) != NULL )
+		  &&( ISC_LIST_HEAD( d_if->dns ) != NULL )
+		  )
+		{
+		    dbus_mgr_log_err("D-BUS: dhclient for interface %s acquired new lease - creating forwarders.", 
+				     if_name
+			            );
+		    result = dbus_mgr_set_forwarders( mgr, &(d_if->dn), &(d_if->dns), dns_fwdpolicy_only );
+		    if( result != ISC_R_SUCCESS )
+		    {
+			dbus_mgr_log_err("D-BUS: forwarder configuration failed: %s", isc_result_totext(result));
+		    }
+		}
+		break;	  
+
+	    case  DHC_STOP:
+	    case  DHC_TIMEOUT:
+	    case  DHC_FAIL:
+	    case  DHC_EXPIRE:
+	    case  DHC_RELEASE:
+		d_if->previous_state = d_if->dhc_state;
+		d_if->dhc_state = DHC_RELEASE;
+		if( ISC_LIST_HEAD( d_if->dn ) != NULL )
+		{
+		    dbus_mgr_log_err("D-BUS: dhclient for interface %s released lease - removing forwarders.", 
+				     if_name);
+		    for( sa = ISC_LIST_HEAD( d_if->dns );
+			 sa != 0L;
+			 sa = ISC_LIST_HEAD( d_if->dns )
+		       )
+		    {
+			if( ISC_LINK_LINKED( sa, link ) )
+			    ISC_LIST_UNLINK( d_if->dns, sa, link );
+			isc_mem_put( mgr->mctx, sa, sizeof(isc_sockaddr_t));
+		    }
+		    ISC_LIST_INIT( d_if->dns );
+		    ISC_LIST_INIT( ifwdrList );
+
+		    for( dn = ISC_LIST_HEAD( d_if->dn );
+			 dn != 0L;
+			 dn = ISC_LIST_NEXT( dn, link )
+		       )
+		    {
+		        dns_name_init( &(ifwd.dn), NULL );
+			isc_buffer_init( &buffer, dnBuf, DNS_NAME_FORMATSIZE);
+			dns_name_setbuffer( &(ifwd.dn), &buffer);
+			dns_name_copy(dn, &(ifwd.dn), NULL);
+			if( ((ifwdpp = tfind(&ifwd, &(mgr->ifwdt), dbus_mgr_ifwdr_comparator)) != 0L )
+			  &&((ifwdr = *ifwdpp) != 0L)
+			  )
+			{
+			    ISC_LIST_APPEND( ifwdrList, ifwdr, link );
+			}			
+		    }
+		    
+		    result = dbus_mgr_set_forwarders( mgr, &(d_if->dn), &(d_if->dns), dns_fwdpolicy_none );
+		    if( result != ISC_R_SUCCESS )
+		    {
+			dbus_mgr_log_err("D-BUS: removal of forwarders failed: %s", isc_result_totext(result));
+		    }
+
+		    for( dn = ISC_LIST_HEAD( d_if->dn );
+			 dn != 0L;
+			 dn = ISC_LIST_HEAD( d_if->dn )
+		       )
+		    {
+			if( ISC_LINK_LINKED( dn, link ) )
+			    ISC_LIST_UNLINK( d_if->dn, dn, link );			
+			isc_mem_put( mgr->mctx, dn, sizeof( dns_fixedname_t ) );
+		    }
+		    ISC_LIST_INIT( d_if->dn );
+
+		    for( ifwdr = ISC_LIST_HEAD( ifwdrList );
+			 ifwdr != 0L;
+			 ifwdr = ISC_LIST_HEAD( ifwdrList )
+		       )
+		    {
+			if( ISC_LINK_LINKED( ifwdr, link ) )
+			    ISC_LIST_UNLINK( ifwdrList, ifwdr, link );
+			ISC_LINK_INIT(ifwdr, link);
+			ISC_LIST_INIT(nameList);
+			ISC_LINK_INIT(&(ifwdr->dn), link);
+			ISC_LIST_APPEND( nameList, &(ifwdr->dn), link );
+			result = dbus_mgr_set_forwarders( mgr, &nameList, 
+							  &(ifwdr->sa), 
+							  ifwdr->fwdpolicy 
+			                                );
+			if( result != ISC_R_SUCCESS )
+			{
+			    dbus_mgr_log_err("D-BUS: restore of forwarders failed: %s", isc_result_totext(result));
+			}			
+		    }
+		}
+
+	    case  DHC_ABEND:
+	    case  DHC_END:
+	    case  DHC_NBI:
+	    case  DHC_PREINIT:
+	    case  DHC_MEDIUM:
+	    case  DHC_START:
+	    case  DHC_INVALID:
+	    default:
+		break;
+	    }
+	    break;
+
+	case  DHC_BOUND:
+	case  DHC_REBOOT:
+	case  DHC_REBIND:	
+	case  DHC_RENEW:
+        case  DHC_STOP:
+        case  DHC_TIMEOUT:
+	case  DHC_FAIL:
+	case  DHC_EXPIRE:
+	case  DHC_RELEASE:
+		d_if->previous_state = d_if->dhc_state;
+		d_if->dhc_state = dhc_state;
+
+	case  DHC_ABEND:
+	case  DHC_END:
+	case  DHC_NBI:
+	case  DHC_PREINIT:
+	case  DHC_MEDIUM:
+	case  DHC_START:
+	case  DHC_INVALID:
+	default:
+	    break;
+	}	
+    }else
+    if( strcmp( member, "domain_name" ) == 0 )
+    {	
+	if( (!dbus_svc_get_args( dbus, msg,
+				 TYPE_STRING, &opt_name,
+				 TYPE_ARRAY, TYPE_BYTE, &value, &length,
+				 TYPE_INVALID
+		               )
+	    )
+	  ||( value == 0L)
+	  ||( length == 0)
+	  )
+	{
+	    dbus_mgr_log_err("Invalid domain_name value received from dhcdbd");
+	    return;	
+	}
+	dbus_mgr_log_dbg("domain-name %s", (char*)value);
+	dbus_mgr_get_name_list( mgr, (char*)value, &(d_if->dn), error_name, error_message );
+	if( ( error_message[0] != '\0' ) || (ISC_LIST_HEAD(d_if->dn) == 0L ))
+	{
+	    dbus_mgr_log_err("Bad domain_name value: %s", error_message );
+	}
+    }else
+    if( strcmp( member, "domain_name_servers") == 0 )
+    {
+	if( (!dbus_svc_get_args( dbus, msg,
+				 TYPE_STRING, &opt_name,
+				 TYPE_ARRAY, TYPE_BYTE, &value, &length,
+				 TYPE_INVALID
+		               )
+	    )
+	  ||( value == 0L)
+	  ||( length == 0)
+	  )
+	{
+	    dbus_mgr_log_err("Invalid domain_name_servers value received from dhcdbd");
+	    return;	
+	}	
+	for(ip = (struct in_addr*) value; ip < ((struct in_addr*)(value + length)); ip++)
+	{
+	    dbus_mgr_log_dbg("domain-name-servers: %s", inet_ntop(AF_INET, value, error_name, 16));
+	    sa = isc_mem_get(mgr->mctx, sizeof(isc_sockaddr_t));
+	    memset(sa, '\0', sizeof(isc_sockaddr_t));
+	    sa->type.sin.sin_addr = *ip;
+	    sa->type.sa.sa_family = AF_INET;
+	    sa->length = sizeof(sa->type.sin);
+	    result = ns_config_getport(ns_g_config, &(port) );
+	    if( result != ISC_R_SUCCESS )
+		port = 53;
+	    sa->type.sin.sin_port = htons( port );
+	    ISC_LIST_APPEND(d_if->dns, sa, link);
+	}
+    }else
+    if( strcmp(member, "ip_address") == 0)
+    {
+	if( (!dbus_svc_get_args( dbus, msg,
+				 TYPE_STRING, &opt_name,
+				 TYPE_ARRAY, TYPE_BYTE, &value, &length,
+				 TYPE_INVALID
+		               )
+	    )
+	  ||( value == 0L)
+	  ||( length != sizeof(struct in_addr) )
+	  )
+	{
+	    dbus_mgr_log_err("Invalid ip_address value received from dhcdbd");
+	    return;
+	}
+	dbus_mgr_log_dbg("ip-address: %s", inet_ntop(AF_INET, value, error_name, 16));
+	d_if->ip = *((struct in_addr*)value);
+    
+    }else
+    if( strcmp(member, "subnet_mask") == 0 )
+    {
+	if( (!dbus_svc_get_args( dbus, msg,
+				 TYPE_STRING, &opt_name,
+				 TYPE_ARRAY, TYPE_BYTE, &value, &length,
+				 TYPE_INVALID
+		               )
+	    )
+	  ||( value == 0L)
+	  ||( length != sizeof(struct in_addr) )
+	  )
+	{
+	    dbus_mgr_log_err("Invalid subnet_mask value received from dhcdbd");
+	    return;
+	}
+	dbus_mgr_log_dbg("subnet-mask: %s", inet_ntop(AF_INET, value, error_name, 16));
+	d_if->subnet_mask = *((struct in_addr*)value);
+    }
+}
+
+static
+dbus_svc_HandlerResult 
+dbus_mgr_message_handler
+(  
+    DBusMsgHandlerArgs
+)
+{
+    char error_name[1024], error_message[1024];
+    ns_dbus_mgr_t *mgr = object;
+    uint32_t new_serial;
+
+    if_suffix = prefix = suffix = prefixObject = 0L;
+
+    dbus_mgr_log_dbg("D-BUS message: %u %u %u %s %s %s %s %s %s",
+		     type, reply_expected, serial, destination, path, member, interface, sender, signature
+	            );
+
+    if (  ( type == SIGNAL )
+	&&( strcmp(path,"/org/freedesktop/DBus/Local") == 0 )
+       )
+    {
+	if( strcmp(member,"Disconnected") == 0 )
+	    dbus_mgr_dbus_shutdown_handler( mgr );
+    }else
+    if( ( type == SIGNAL )
+      &&( strcmp(path,"/org/freedesktop/DBus") == 0 )
+      &&(strcmp(member,"NameOwnerChanged") == 0)
+      &&(strcmp(signature, "sss") == 0)
+      )
+    {
+	dbus_mgr_check_dhcdbd_state( mgr, msg );
+    }else
+    if( ( type == SIGNAL ) 
+      &&( (sender != 0L) && (mgr->dhcdbd_name != 0L) && (strcmp(sender,mgr->dhcdbd_name)   == 0)) 
+      &&( strcmp(interface,"com.redhat.dhcp.subscribe.binary") == 0 )
+      )
+    {
+	dbus_mgr_handle_dhcdbd_message( mgr, path, member, msg );
+    }else
+    if( (type == CALL) 
+      &&( strcmp(destination, DBUSMGR_DESTINATION)==0)
+      &&( strcmp(path, DBUSMGR_OBJECT_PATH)==0)
+      )
+    {
+	if( strcmp(member, "SetForwarders") == 0 )
+	    dbus_mgr_handle_set_forwarders
+	    ( mgr, dbus, reply_expected, serial, path, member, interface, sender, msg );
+	else
+	if( strcmp(member, "GetForwarders") == 0 )
+	{
+	    if( *signature != '\0' )	   
+		dbus_mgr_handle_get_forwarders
+		( dbus, reply_expected, serial, path, member, interface, sender, msg );
+	    else       
+		dbus_mgr_handle_list_forwarders
+		( dbus, reply_expected, serial, path, member, interface, sender, msg );
+	}else
+	if( reply_expected )
+	{
+	    sprintf(error_name, "InvalidOperation");
+	    sprintf(error_message, "Unrecognized path / interface / member");
+	    dbus_svc_send( dbus, ERROR, serial, &new_serial, sender, path, interface, member,
+			   TYPE_STRING, error_name, TYPE_STRING, error_message, TYPE_INVALID 
+		);	    
+	}
+    }
+    return HANDLED;
+}
+
+static void
+dbus_mgr_read_watch_activated(isc_task_t *t, isc_event_t *ev)
+{
+    DBusMgrSocket *sfd = (DBusMgrSocket*)(ev->ev_arg);
+    t = t;
+    isc_mem_put(sfd->mgr->mctx, ev, ev->ev_size);
+    dbus_mgr_log_dbg("watch %d READ",sfd->fd);  
+    isc_socket_fd_handle_reads( sfd->sock, sfd->ser );
+    dbus_svc_handle_watch( sfd->mgr->dbus, sfd->fd, WATCH_ENABLE | WATCH_READ );
+}
+
+static void
+dbus_mgr_write_watch_activated(isc_task_t *t, isc_event_t *ev)
+{
+    DBusMgrSocket *sfd = (DBusMgrSocket*)(ev->ev_arg);
+    t = t;
+    isc_mem_put(sfd->mgr->mctx, ev, ev->ev_size);
+    dbus_mgr_log_dbg("watch %d WRITE",sfd->fd);
+    isc_socket_fd_handle_writes( sfd->sock, sfd->ser );
+    dbus_svc_handle_watch( sfd->mgr->dbus, sfd->fd, WATCH_ENABLE | WATCH_WRITE );    
+}
+
+static void
+dbus_mgr_watches_selected(isc_task_t *t, isc_event_t *ev)
+{
+    ns_dbus_mgr_t *mgr = (ns_dbus_mgr_t*)(ev->ev_arg);
+    t = t;
+    isc_mem_put(mgr->mctx, ev, ev->ev_size);
+    if( ( mgr->dbus == 0L ) || (mgr->sockets == 0L))
+    {
+	return;
+    }
+    dbus_mgr_log_dbg("watches selected");
+    dbus_svc_dispatch( mgr->dbus );
+    dbus_mgr_log_dbg("dispatch complete");
+}
+
+static int dbus_mgr_socket_comparator( const void *p1, const void *p2 )
+{
+    return( (   ((const DBusMgrSocket*)p1)->fd 
+	     == ((const DBusMgrSocket*)p2)->fd
+	    ) ? 0
+	      : (   ((const DBusMgrSocket*)p1)->fd 
+	          > ((const DBusMgrSocket*)p2)->fd
+	        ) ? 1
+	          : -1
+	  );
+}
+
+static void 
+dbus_mgr_watch_handler( int fd, dbus_svc_WatchFlags flags, void *mgrp )
+{
+    ns_dbus_mgr_t *mgr = mgrp;
+    DBusMgrSocket sockFd, *sfd=0L, *const*spp=0L;
+    isc_result_t  result=ISC_R_SUCCESS;
+    isc_socketevent_t *sev;
+    isc_event_t *pev[1];
+
+    if(mgr == 0L)
+	return;
+
+    if( (flags & 7) == WATCH_ERROR )
+	return;
+
+    sockFd.fd = fd;
+
+    dbus_mgr_log_dbg("watch handler: fd %d %d", fd, flags);
+
+    if( ((spp = tfind( &sockFd, &(mgr->sockets), dbus_mgr_socket_comparator) ) == 0L )
+      ||((sfd = *spp) == 0L )
+      )
+    {
+	if( ( flags & WATCH_ENABLE ) == 0 )
+	    return;
+
+	sfd = isc_mem_get(mgr->mctx, sizeof(DBusMgrSocket));
+	if( sfd == 0L )
+	{
+	    dbus_mgr_log_err("dbus_mgr: out of memory" );
+	    return;
+	}
+	sfd->fd = fd;
+	sfd->mgr = mgr;
+	sfd->ser = sfd->sew = sfd->sel = 0L;
+
+	if( tsearch(sfd, &(mgr->sockets), dbus_mgr_socket_comparator) == 0L )
+	{
+	    dbus_mgr_log_err("dbus_mgr: out of memory" );
+	    isc_mem_put(mgr->mctx, sfd, sizeof(DBusMgrSocket));
+	    return;
+	}
+	sfd->sock = 0L;
+	result = isc_socket_create( mgr->socketmgr, fd, isc_sockettype_fd, &(sfd->sock) );
+	if( result != ISC_R_SUCCESS )
+	{
+	    dbus_mgr_log_err("dbus_mgr: isc_socket_create failed: %s", 
+			     isc_result_totext(result)
+	                    );
+	    tdelete(sfd,  &(mgr->sockets), dbus_mgr_socket_comparator);
+	    isc_mem_put(mgr->mctx, sfd, sizeof(DBusMgrSocket));
+	    return;
+	}
+    }
+    
+    if( (flags & WATCH_ENABLE) == WATCH_ENABLE )
+    {
+	if( (flags & WATCH_READ) == WATCH_READ )
+	{
+	    if( sfd->ser == 0L )
+	    {
+		sfd->ser = (isc_socketevent_t *)
+		    isc_event_allocate
+		    (
+			mgr->mctx, mgr->task,
+			ISC_SOCKEVENT_READ_READY,
+			dbus_mgr_read_watch_activated,
+			sfd,
+			sizeof(isc_socketevent_t)
+		    );
+
+		if( sfd->ser == 0L )
+		{
+		    dbus_mgr_log_err("dbus_mgr: out of memory" );
+		    tdelete(sfd,  &(mgr->sockets), dbus_mgr_socket_comparator);
+		    isc_mem_put(mgr->mctx, sfd, sizeof(DBusMgrSocket));
+		    return;		    
+		}
+
+		sev = isc_socket_fd_handle_reads(sfd->sock, sfd->ser );
+
+	    }else
+	    {
+		sev = isc_socket_fd_handle_reads(sfd->sock, sfd->ser );
+	    }
+	}
+	if( (flags & WATCH_WRITE) == WATCH_WRITE )
+	{
+	    if( sfd->sew == 0L )
+	    {
+		sfd->sew = (isc_socketevent_t *)
+		    isc_event_allocate
+		    (
+			mgr->mctx, mgr->task,
+			ISC_SOCKEVENT_WRITE_READY,
+			dbus_mgr_write_watch_activated,
+			sfd,
+			sizeof(isc_socketevent_t)
+		    );
+		if( sfd->sew == 0L )
+		{
+		    dbus_mgr_log_err("dbus_mgr: out of memory" );
+		    tdelete(sfd,  &(mgr->sockets), dbus_mgr_socket_comparator);
+		    isc_mem_put(mgr->mctx, sfd, sizeof(DBusMgrSocket));
+		    return;		    
+		}
+		
+		sev = isc_socket_fd_handle_writes(sfd->sock, sfd->sew );
+		
+	    }else
+	    {
+		sev = isc_socket_fd_handle_writes(sfd->sock, sfd->sew );
+	    }
+	}
+	if( (sfd->ser != 0L) || (sfd->sew != 0L) )
+	{
+	    if( sfd->sel == 0L )
+	    {
+		sfd->sel = (isc_socketevent_t *)
+		    isc_event_allocate
+		    (
+			mgr->mctx, mgr->task,
+			ISC_SOCKEVENT_SELECTED,
+			dbus_mgr_watches_selected,
+			mgr,
+			sizeof(isc_socketevent_t)
+		    );
+		if( sfd->sel == 0L )
+		{
+		    dbus_mgr_log_err("dbus_mgr: out of memory" );
+		    tdelete(sfd,  &(mgr->sockets), dbus_mgr_socket_comparator);
+		    isc_mem_put(mgr->mctx, sfd, sizeof(DBusMgrSocket));
+		    return;		    
+		}
+		
+		sev = isc_socket_fd_handle_selected(sfd->sock, sfd->sel );
+		
+	    }else
+	    {
+		sev = isc_socket_fd_handle_selected(sfd->sock, sfd->sel);
+	    }
+	}
+    }else
+    {
+	dbus_mgr_log_dbg("watch %d disabled",fd);
+	if(flags & WATCH_READ)
+	{
+	    sev = isc_socket_fd_handle_reads( sfd->sock, 0L );
+	    if( sev != 0L )
+	    {
+		pev[0]=(isc_event_t*)sev;
+		isc_event_free(pev);
+	    }
+	    sfd->ser = 0L;
+	}
+
+	if( flags & WATCH_WRITE )
+	{
+	    sev = isc_socket_fd_handle_writes( sfd->sock, 0L );
+	    if( sev != 0L )
+	    {
+		pev[0]=(isc_event_t*)sev;
+		isc_event_free(pev);
+	    }
+	    sfd->sew = 0L;
+	}
+
+	if( (sfd->ser == 0L) && (sfd->sew == 0L) )
+	{
+	    sev = isc_socket_fd_handle_selected( sfd->sock, 0L );
+	    if( sev != 0L )
+	    {
+		pev[0]=(isc_event_t*)sev;
+		isc_event_free(pev);
+	    }
+	    sfd->sel = 0L;
+
+	    tdelete(sfd, &(mgr->sockets), dbus_mgr_socket_comparator);
+
+	    isc_mem_put(mgr->mctx, sfd,  sizeof(DBusMgrSocket));
+	}
+    }
+}
+
+static
+void dbus_mgr_close_socket( const void *p, const VISIT which, const int level)
+{
+    DBusMgrSocket *const*spp=p, *sfd;
+    isc_event_t *ev ;
+    int i =  level ? 0 :1;
+    i &= i;
+
+    if( (spp==0L) || ((sfd = *spp)==0L) 
+      ||((which != leaf) && (which != postorder))
+      ) return;
+   
+    if( sfd->ser != 0L )
+    {
+	ev = (isc_event_t *)isc_socket_fd_handle_reads(sfd->sock, 0);
+	if( ev != 0L )
+	    isc_event_free((isc_event_t **)&ev);
+	sfd->ser = 0L;
+    }
+
+    if( sfd->sew != 0L )
+    {
+	ev = (isc_event_t *)isc_socket_fd_handle_writes(sfd->sock, 0);
+	if( ev != 0L )
+	    isc_event_free((isc_event_t **)&ev);
+	sfd->sew = 0L;
+    }
+
+    if( sfd->sel != 0L )
+    {
+	ev = (isc_event_t *)isc_socket_fd_handle_selected(sfd->sock, 0);
+	if( ev != 0L )
+	    isc_event_free((isc_event_t **)&ev);
+	sfd->sel = 0L;
+	dbus_mgr_log_dbg("CLOSED socket %d", sfd->fd);
+    }
+}
+
+static
+void dbus_mgr_destroy_socket( void *p )
+{
+    DBusMgrSocket *sfd = p;
+
+    isc_mem_put( sfd->mgr->mctx, sfd, sizeof(DBusMgrSocket) );
+}
diff --git a/contrib/dbus/dbus_mgr.h b/contrib/dbus/dbus_mgr.h
new file mode 100644
index 00000000..78be0d09
--- /dev/null
+++ b/contrib/dbus/dbus_mgr.h
@@ -0,0 +1,37 @@
+/* dbus_mgr.h
+ *
+ *  named module to provide dynamic forwarding zones in 
+ *  response to D-BUS dhcp events
+ *
+ *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation at 
+ *           http://www.fsf.org/licensing/licenses/gpl.txt
+ *  and included in this software distribution as the "LICENSE" file.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+extern isc_result_t 
+dbus_mgr_create
+(   isc_mem_t *mctx, 
+    isc_taskmgr_t *taskmgr,
+    isc_socketmgr_t *socketmgr,
+    isc_timermgr_t *timermgr,
+    ns_dbus_mgr_t **dbus_mgr
+);
+
+extern void 
+dbus_mgr_shutdown
+(   ns_dbus_mgr_t *dus_mgr_t
+);
+
+
+
+
+
diff --git a/contrib/dbus/dbus_service.c b/contrib/dbus/dbus_service.c
new file mode 100644
index 00000000..85965d88
--- /dev/null
+++ b/contrib/dbus/dbus_service.c
@@ -0,0 +1,1149 @@
+/*  dbus_service.c
+ *
+ *  D-BUS Service Utilities
+ *  
+ *  Provides MINIMAL utilities for construction of D-BUS "Services".
+ *  
+ *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation at 
+ *           http://www.fsf.org/licensing/licenses/gpl.txt
+ *  and included in this software distribution as the "LICENSE" file.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ */
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <linux/limits.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <time.h>
+#include <signal.h>
+#include <syslog.h>
+#include <fcntl.h>
+#include <string.h>
+extern size_t strnlen(const char *s, size_t maxlen);
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <ifaddrs.h>
+#include <search.h>
+#include <getopt.h>
+typedef void (*__free_fn_t) (void *__nodep);
+extern void tdestroy (void *__root, __free_fn_t __freefct);
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+#define  DBUS_API_SUBJECT_TO_CHANGE  "Very Annoying and Silly!"
+#include <dbus/dbus.h>
+
+#include <named/dbus_service.h>
+
+typedef struct dbcs_s
+{
+    DBusConnection *connection;
+    DBusDispatchStatus dispatchStatus;
+    uint32_t        status;
+    dbus_svc_WatchHandler wh;
+    void *          wh_arg;
+    const char    * unique_name;
+    dbus_svc_MessageHandler mh;
+    void          * def_mh_obj;
+    dbus_svc_MessageHandler mf;
+    void          * def_mf_obj;
+    dbus_svc_ShutdownHandler sh;
+    void          * sh_obj;  
+    dbus_svc_ErrorHandler eh;
+    dbus_svc_ErrorHandler dh;
+    /*{ glibc b-trees: */
+    void *          roots;
+    void *          timeouts;  
+    void *          watches;
+    void *          filters;
+    /*}*/
+    int             n; 
+    fd_set          r_fds;
+    fd_set          s_r_fds;
+    fd_set          w_fds;
+    fd_set          s_w_fds;
+    fd_set          e_fds;  
+    fd_set          s_e_fds;
+    DBusMessage     *currentMessage;
+    int             rejectMessage;
+} DBusConnectionState;
+
+typedef struct root_s
+{
+    char *path;    
+    char *if_prefix;
+    DBUS_SVC cs;
+    dbus_svc_MessageHandler mh;        
+    void *object;
+    void *tree;
+} Root;
+
+typedef struct mhn_s
+{
+    char *path;    
+    dbus_svc_MessageHandler mh;    
+    void *object;
+} MessageHandlerNode;
+
+typedef struct mfn_s
+{
+    DBusConnectionState *cs;
+    dbus_svc_MessageHandler mf;
+    void *obj;
+    int n_matches;
+    char **matches;
+} MessageFilterNode;
+
+typedef struct dbto_s
+{
+    DBusTimeout   *to;
+    DBusConnectionState *cs;
+    struct timeval tv;
+} DBusConnectionTimeout;
+
+static void no_free( void *p){ p=0; }
+
+static int ptr_key_comparator( const void *p1, const void *p2 )
+{
+    return
+	(  (p1 == p2) 
+	   ? 0
+	   :( (p1 > p2)
+	      ? 1
+	      : -1
+	    )
+	);
+}
+
+static DBusHandlerResult
+default_message_filter 
+(   DBusConnection     *connection,
+    DBusMessage        *message,
+    void               *p
+)
+{
+    DBusConnectionState *cs = p;
+    uint32_t type  =dbus_message_get_type( message ),
+	   serial  =dbus_message_get_serial( message );
+    uint8_t  reply =dbus_message_get_no_reply( message )==0;
+    const char 
+	*path =    dbus_message_get_path( message ),
+	*dest =    dbus_message_get_destination( message ),
+	*member =  dbus_message_get_member( message ),
+	*interface=dbus_message_get_interface( message ),
+	*sender   =dbus_message_get_sender( message ),
+	*signature=dbus_message_get_signature( message );
+    connection = connection;
+    if(cs->mf)
+	return
+	(*(cs->mf))( cs, type, reply, serial, dest, path, member, interface, 0L,
+		    sender, signature, message, 0L, 0L, 0L, cs->def_mf_obj
+	          ) ;
+    return HANDLED;
+}
+
+uint8_t
+dbus_svc_add_filter
+(  DBusConnectionState *cs, dbus_svc_MessageHandler mh, void *obj, int n_matches, ... )
+{
+    DBusError error;
+    va_list va;
+    char *m;
+
+    va_start(va, n_matches );
+    
+    cs->mf = mh;
+    cs->def_mf_obj = obj;
+
+    if ( ! dbus_connection_add_filter (cs->connection, default_message_filter, cs, NULL))
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_add_filter: dbus_connection_add_filter failed");
+	va_end(va);
+	return( 0 );
+    }
+
+    if( n_matches )
+    {
+	memset(&error,'\0',sizeof(DBusError));
+	dbus_error_init(&error);
+	while( n_matches-- )
+	{
+	    m = va_arg(va, char* ) ;
+
+	    dbus_bus_add_match(cs->connection, m, &error);
+
+	    if( dbus_error_is_set(&error))
+	    {
+		if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_add_filter: dbus_bus_add_match failed for %s: %s %s",
+					       m, error.name, error.message
+		                              );
+		va_end(va);
+		return(0);
+	    }
+	}
+    }
+    return( 1 );
+}
+
+
+uint8_t
+dbus_svc_get_args_va(DBusConnectionState *cs, DBusMessage* msg, dbus_svc_DataType firstType, va_list va)
+{
+    DBusError error;
+    memset(&error,'\0',sizeof(DBusError));
+    dbus_error_init(&error);
+    if( (!dbus_message_get_args_valist(msg, &error, firstType, va)) || dbus_error_is_set(&error) )
+    {
+	if(  dbus_error_is_set(&error) )
+	{
+	    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_get_args failed: %s %s",error.name, error.message);
+	    dbus_error_free(&error);
+	}else
+	    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_get_args failed: dbus_message_get_args_valist failed");
+	return( 0 );
+    }
+    return( 1 );
+}
+
+uint8_t
+dbus_svc_get_args(DBusConnectionState *cs, DBusMessage* msg, dbus_svc_DataType firstType, ...)
+{
+    va_list va;
+    uint8_t r;
+    va_start(va, firstType);
+    r = dbus_svc_get_args_va( cs, msg, firstType, va);
+    va_end(va);
+    return r;
+}
+
+uint8_t 
+dbus_svc_send_va
+(  DBusConnectionState *cs,
+   dbus_svc_MessageType type,   
+   int32_t reply_serial,
+   uint32_t *new_serial,
+   const char *destination,
+   const char *path,
+   const char *interface,
+   const char *member,
+   dbus_svc_DataType firstType,
+   va_list va
+)
+{
+    DBusMessageIter iter;
+    char *e;
+    DBusMessage *msg = 
+	dbus_svc_new_message
+	(   cs,
+	    type,
+	    reply_serial,
+	    destination,
+	    path,
+	    interface,
+	    member
+	);
+
+    if(msg == 0L)
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_svc_new_message failed");
+	return 0;
+    }
+
+    if( type != DBUS_MESSAGE_TYPE_ERROR )
+    {
+	if( !dbus_message_append_args_valist( msg, firstType, va ) )
+	{
+	    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_append_args_valist failed");
+	    return 0;
+	}
+    }else
+    {
+	if( firstType == DBUS_TYPE_STRING )
+	{
+	    e = 0L;
+	    e = va_arg( va, char* );	    
+	    if( (e == 0L) ||  !dbus_message_set_error_name( msg, e ) )
+	    {
+		if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_set_error_name failed");
+		return 0;
+	    }
+	    firstType = va_arg(va, int);
+	    if( firstType == DBUS_TYPE_STRING )
+	    {
+		e = 0L;
+		e =  va_arg( va, char* );
+		if( e == 0L )
+		{
+		    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: NULL error message");
+		    return 0;		    		    
+		}
+		dbus_message_iter_init_append (msg, &iter);		
+		if( !dbus_message_iter_append_basic 
+		    (&iter, DBUS_TYPE_STRING, &e)
+		  )
+		{
+		    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_iter_append_basic failed");
+		    return 0;		    		    
+		}
+	    }
+	}else
+	{
+	    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: unhandled type for error name: %c", firstType);
+	    return 0;	    
+	}
+    }
+
+    if( !dbus_connection_send(cs->connection, msg, new_serial) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_send failed");
+	return 0;
+    }
+    if( cs->dh != 0L ) (*(cs->dh))("Sending message");
+    dbus_connection_flush(cs->connection);
+    return 1;
+}
+
+uint8_t 
+dbus_svc_send
+(  DBusConnectionState *cs,
+   dbus_svc_MessageType type,
+   int32_t reply_serial,
+   uint32_t *new_serial,
+   const char *destination,
+   const char *path,
+   const char *interface,
+   const char *member,
+   dbus_svc_DataType firstType,
+   ...
+)
+{
+    uint8_t r;
+    va_list va;
+    va_start(va, firstType);
+    r = dbus_svc_send_va(cs, type, reply_serial, new_serial, destination, path,interface,member,firstType,va);
+    va_end(va);
+    return ( r ) ;
+}
+
+dbus_svc_MessageHandle
+dbus_svc_new_message
+( DBusConnectionState* cs,
+  dbus_svc_MessageType type,
+  int32_t reply_serial,
+  const char *destination,
+  const char *path,
+  const char *interface,
+  const char *member
+)
+{
+    DBusMessage *msg = dbus_message_new(type);
+    
+    if( msg == 0L)
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_reply_serial failed");
+	return 0;
+    }
+
+    if( reply_serial != -1 )
+    {
+	if( !dbus_message_set_reply_serial(msg,reply_serial) )
+	{
+	    if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_reply_serial failed");
+	    return 0;
+	}    
+    }
+	    
+    if( (destination !=0L) && !dbus_message_set_destination(msg, destination) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_destination failed");
+	return 0;
+    }
+
+    if( !dbus_message_set_path(msg, path) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_path failed");
+	return 0;
+    }
+
+    if( ! dbus_message_set_interface(msg,interface) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_interface failed - %s", interface);
+	return 0;
+    }
+
+    if( !dbus_message_set_member(msg,member) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_new_message: dbus_message_set_member failed");
+	return 0;
+    }
+
+    return msg;    
+}
+
+extern uint8_t
+dbus_svc_send_message
+(
+    DBusConnectionState *cs, 
+    dbus_svc_MessageHandle msg, 
+    uint32_t *new_serial 
+)
+{
+    if( !dbus_connection_send(cs->connection, msg, new_serial) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_send failed");
+	return 0;
+    }
+    if( cs->dh != 0L ) (*(cs->dh))("Sending message");
+    dbus_connection_flush(cs->connection);   
+    return 1;
+}
+
+uint8_t
+dbus_svc_message_append_args(DBusConnectionState *cs, dbus_svc_MessageHandle msg, dbus_svc_DataType firstType, ...)
+{
+    va_list va;
+    va_start(va, firstType);
+    if( !dbus_message_append_args_valist( msg, firstType, va ) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_send: dbus_message_append_args failed");
+	return 0;	
+    }
+    va_end(va);
+    return ( 1 ) ;
+}
+
+dbus_svc_MessageHandle 
+dbus_svc_call
+( DBusConnectionState *cs,
+  const char *destination,
+  const char *path,
+  const char *member,
+  const char *interface,
+  dbus_svc_DataType firstType,
+  ... 
+)
+{
+    DBusMessage *message=0L, *reply=0L;
+    va_list va;
+    DBusError error;
+    int reply_timeout=20000;
+
+    va_start(va, firstType);
+
+    memset(&error,'\0',sizeof(DBusError));
+    dbus_error_init(&error);
+
+    if(( message = 
+	 dbus_message_new_method_call 
+	 (  destination,
+	    path,
+	    interface,
+	    member
+	 )
+       ) == 0L
+      )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_call: dbus_message_new_method_call failed");
+	va_end(va);
+	return(0L);
+    };
+
+    if( !dbus_message_append_args_valist( message, firstType, va ) )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_call: dbus_message_append_args_valist failed");
+	va_end(va);
+	return(0L);
+    }
+
+    if((reply = 
+	dbus_connection_send_with_reply_and_block 
+	(cs->connection,
+	 message, reply_timeout,
+	 &error
+	)
+       ) == 0L    
+      )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("dbus_svc_call: dbus_message_send_with_reply_and_block failed: %s %s",
+		    error.name, error.message
+	           );
+	va_end(va);
+	return(0L);
+    }
+    return reply;
+}
+
+dbus_svc_MessageIterator
+dbus_svc_message_iterator_new( DBusConnectionState *cs, DBusMessage *msg)
+{
+    DBusMessageIter *iter = malloc( sizeof(DBusMessageIter) );
+    void *p =cs;
+    p++;
+    if( iter != 0L )
+    {
+	if( !dbus_message_iter_init( msg, iter ))
+	{
+	    free( iter ) ;
+	    iter = 0L;
+	}
+    }
+    return iter;
+}
+
+uint32_t
+dbus_svc_message_next_arg_type( DBusConnectionState *cs, dbus_svc_MessageIterator iter )
+{
+    void *p =cs;
+    p++;
+    return dbus_message_iter_get_arg_type( iter );
+}
+
+void
+dbus_svc_message_next_arg( DBusConnectionState *cs, dbus_svc_MessageIterator iter, void *value )
+{
+    void *p =cs;
+    p++;
+    dbus_message_iter_get_basic( iter, value );
+    dbus_message_iter_next( iter );
+}
+
+uint32_t
+dbus_svc_message_element_type(DBusConnectionState *cs , dbus_svc_MessageIterator  iter)
+{
+    void *p =cs;
+    p++;
+    return dbus_message_iter_get_element_type(iter);
+}
+
+void
+dbus_svc_message_get_elements( DBusConnectionState *cs , dbus_svc_MessageIterator  iter, uint32_t *n, void *array )
+{
+    void *p =cs;
+    p++;
+    dbus_message_iter_get_fixed_array( iter, n, array);
+}
+
+void dbus_svc_message_iterator_free(  DBusConnectionState *cs, dbus_svc_MessageIterator iter )
+{
+    void *p =cs;
+    p++;
+    free( iter );
+}
+
+uint8_t dbus_svc_message_type(  DBusMessage *msg )
+{
+    return dbus_message_get_type( msg );
+}
+
+static DBusConnectionState *
+dbcs_new( DBusConnection *connection )
+{
+    DBusConnectionState *dbcs = (DBusConnectionState *) malloc( sizeof(DBusConnectionState) );
+    if ( dbcs )
+    {
+	memset( dbcs, '\0', sizeof( DBusConnectionState ));
+	dbcs->connection = connection;
+    }
+    return(dbcs);
+}
+
+static DBusConnectionTimeout *
+timeout_new( DBusTimeout *timeout )
+{
+    DBusConnectionTimeout *to = (DBusConnectionTimeout *) malloc ( sizeof(DBusConnectionTimeout) );
+    if( to != 0L )
+    {
+	to->to = timeout;
+	dbus_timeout_set_data(timeout, to, 0L);
+	if( dbus_timeout_get_enabled(timeout) )
+	    gettimeofday(&(to->tv),0L);
+	else
+	{
+	    to->tv.tv_sec = 0 ;
+	    to->tv.tv_usec = 0 ;
+	}	    
+    }
+    return( to );
+}
+
+static dbus_bool_t
+add_timeout( DBusTimeout *timeout, void *csp )
+{
+    DBusConnectionState   *cs = csp;
+    DBusConnectionTimeout *to = timeout_new(timeout);
+    if( cs->dh != 0L ) (*(cs->dh))("add_timeout: %d", dbus_timeout_get_interval(timeout));
+    to->cs = cs;
+    if ( to )
+    {
+	if( tsearch((void*)to, &(cs->timeouts), ptr_key_comparator) != 0L )
+	    return TRUE;
+    }
+    if( cs->eh != 0L ) (*(cs->eh))("add_timeout: out of memory");
+    return FALSE;
+}
+
+static void
+remove_timeout( DBusTimeout *timeout, void *csp )
+{
+    DBusConnectionState   *cs = csp;
+    DBusConnectionTimeout *to = dbus_timeout_get_data(timeout);
+    if( (to != 0L) && (to->to == timeout) )
+    {
+	if( cs->dh != 0L ) (*(cs->dh))("remove_timeout: %d", dbus_timeout_get_interval(to->to));
+	if( tdelete((const void*)to, &(cs->timeouts), ptr_key_comparator) != 0L )
+	{
+	    free(to);
+	}else
+	    if( cs->eh != 0L ) (*(cs->eh))("remove_timeout: can't happen?!?: timeout data %p not found", to);   	
+    }else
+	if( cs->eh != 0L ) (*(cs->eh))("remove_timeout: can't happen?!?: timeout %p did not record data %p %p", 
+		    timeout, to, ((to != 0L) ? to->to : 0L)
+	           );
+}
+
+static void
+toggle_timeout( DBusTimeout *timeout, void *csp )
+{
+    DBusConnectionState   *cs = csp;
+    DBusConnectionTimeout **top = tfind( (const void*) dbus_timeout_get_data(timeout), 
+				         &(cs->timeouts),
+				         ptr_key_comparator
+	                               ),
+	                   *to=0L;
+    if( (top != 0L) && ((to=*top) != 0L) && (to->to == timeout) )
+    {
+	if( cs->dh != 0L ) (*(cs->dh))("toggle_timeout: %d", dbus_timeout_get_interval(to->to));
+	if(  dbus_timeout_get_enabled(timeout) )
+	    gettimeofday(&(to->tv),0L);
+	else
+	{
+	    to->tv.tv_sec = 0 ;
+	    to->tv.tv_usec = 0 ;
+	}
+    }else
+	if( cs->eh != 0L ) (*(cs->eh))("toggle_timeout: can't happen?!?: timeout %p %s %p %p", timeout, 
+		    ((to==0L) ? "did not record data" : "not found"),
+		    to, ((to != 0L) ? to->to : 0L)
+	           );	
+}
+
+static void
+process_timeout( const void *p, const VISIT which, const int level)
+{
+    DBusConnectionState   *cs;
+    void * const *tpp = p;
+    DBusConnectionTimeout *to;
+    struct timeval tv;
+    float now, then, interval;
+    int l = level ? 1 : 0;
+    l=l;
+
+    gettimeofday(&tv,0L);
+    
+    if( (tpp != 0L) && (*tpp != 0L) && ((which == postorder) || (which == leaf)) ) 
+    {
+	to = (DBusConnectionTimeout*)*tpp;
+	cs = to->cs;
+	if ( !dbus_timeout_get_enabled(to->to) )
+	    return;
+	cs = dbus_timeout_get_data(to->to);
+	then = ((float)to->tv.tv_sec) + (((float)to->tv.tv_usec)  / 1000000.0);
+	if( then != 0.0 )
+	{
+	    interval = ((float)dbus_timeout_get_interval(to->to)) / 1000.0;
+	    now = ((float)tv.tv_sec) + (( (float)tv.tv_usec) /   1000000.0);
+	    if( (now - then) >= interval )
+	    {
+		if( cs->dh != 0L ) (*(cs->dh))("handle_timeout: %d - %f %f %f",  dbus_timeout_get_interval(to->to), then, now, interval);
+		dbus_timeout_handle( to->to );
+		to->tv=tv;
+	    }
+	}else
+	{
+	    to->tv = tv;
+	}
+    }
+}
+
+static void
+process_timeouts ( DBusConnectionState *cs )
+{
+    twalk( cs->timeouts, process_timeout );
+}
+
+static void 
+set_watch_fds( DBusWatch *watch, DBusConnectionState *cs )
+{
+    uint8_t flags = dbus_watch_get_flags(watch);
+    int fd = dbus_watch_get_fd(watch);
+
+    if ( cs->n <= fd )
+	cs->n = fd + 1;
+
+    if ( dbus_watch_get_enabled(watch) )
+    {
+	if ( flags & DBUS_WATCH_READABLE )
+	{
+	    FD_SET(fd , &(cs->r_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_ENABLE | WATCH_READ, cs->wh_arg ); 
+	}else	    
+	{
+	    FD_CLR(fd , &(cs->r_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_READ, cs->wh_arg ); 
+	}
+
+	if ( flags & DBUS_WATCH_WRITABLE )
+	{
+	    FD_SET(fd , &(cs->w_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_ENABLE | WATCH_WRITE, cs->wh_arg ); 	 
+	}else	    
+	{
+	    FD_CLR(fd , &(cs->w_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_WRITE, cs->wh_arg ); 	 
+	}
+	if ( flags & DBUS_WATCH_ERROR )
+	{
+	    FD_SET(fd , &(cs->e_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_ENABLE | WATCH_ERROR, cs->wh_arg ); 	
+	}else	    
+	{
+	    FD_CLR(fd , &(cs->e_fds));
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_ERROR, cs->wh_arg ); 	
+	}	
+    }else
+    {
+	if( FD_ISSET( fd, &(cs->r_fds)) )
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_READ, cs->wh_arg );
+	FD_CLR(fd , &(cs->r_fds));
+
+	if( FD_ISSET( fd, &(cs->w_fds)) )
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_WRITE, cs->wh_arg );	
+	FD_CLR(fd , &(cs->w_fds));
+	
+	if( FD_ISSET( fd, &(cs->e_fds)) )
+	    if( cs->wh != 0L )
+		(*(cs->wh))( fd, WATCH_ERROR, cs->wh_arg );
+	FD_CLR(fd , &(cs->e_fds));
+    }	
+}
+
+static dbus_bool_t
+add_watch ( DBusWatch *watch, void *csp )
+{    
+    DBusConnectionState *cs = csp;
+
+    dbus_watch_set_data(watch, cs, no_free );
+    if( cs->dh != 0L ) (*(cs->dh))("add_watch: %d", dbus_watch_get_fd(watch));
+    if( tsearch((const void*)watch,&(cs->watches),ptr_key_comparator) == 0L )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("add_watch: out of memory");
+	return FALSE;
+    }    
+    set_watch_fds(watch,cs);
+    return TRUE;
+}
+
+static void
+remove_watch ( DBusWatch *watch, void *csp )
+{
+    DBusConnectionState *cs = csp;
+    int  fd = dbus_watch_get_fd(watch);
+    if( tdelete((const void*)watch, &(cs->watches), ptr_key_comparator) == 0L )
+	if( cs->eh != 0L ) (*(cs->eh))("remove_watch: can't happen?!?: watch not found");
+    if( cs->dh != 0L ) (*(cs->dh))("remove_watch: %d", dbus_watch_get_fd(watch));
+    FD_CLR(fd , &(cs->r_fds));
+    FD_CLR(fd , &(cs->w_fds));
+    FD_CLR(fd , &(cs->e_fds));
+    if( cs->wh != 0L )
+	(*(cs->wh))(dbus_watch_get_fd(watch), WATCH_READ | WATCH_WRITE | WATCH_ERROR, cs->wh_arg );
+}
+
+static void
+toggle_watch ( DBusWatch *watch, void *csp )
+{
+    DBusConnectionState *cs = csp;    
+    if( cs->dh != 0L ) (*(cs->dh))("toggle_watch: %d", dbus_watch_get_fd(watch));
+    set_watch_fds(watch,cs);
+}
+
+static void
+process_watch( const void *p, const VISIT which, const int level)
+{
+    void * const *wpp=p;
+    DBusWatch *w;
+    int fd;
+    uint8_t flags;
+    DBusConnectionState *cs;
+    int l = level ? 1 : 0;
+    l=l;
+
+    if((wpp != 0L) && (*wpp != 0L) && ( (which == postorder) || (which == leaf) ) )
+    {
+	w = (DBusWatch*)*wpp;
+	cs = dbus_watch_get_data( w );
+	if( cs == 0 )
+	    return;
+	if( ! dbus_watch_get_enabled(w) )
+	    return;
+	fd = dbus_watch_get_fd( w );
+	flags = dbus_watch_get_flags( w );
+	if( cs->dh != 0L ) (*(cs->dh))("handle_watch: %d", dbus_watch_get_fd( w ));
+	if ( (flags & DBUS_WATCH_READABLE) && (FD_ISSET(fd, &(cs->s_r_fds))) )
+	    dbus_watch_handle(w, DBUS_WATCH_READABLE);
+	if ( (flags & DBUS_WATCH_WRITABLE) && (FD_ISSET(fd, &(cs->s_w_fds))) )
+	    dbus_watch_handle(w, DBUS_WATCH_READABLE);
+	if ( (flags & DBUS_WATCH_ERROR) && (FD_ISSET(fd, &(cs->s_e_fds))) )
+	    dbus_watch_handle(w, DBUS_WATCH_ERROR);
+    }
+} 
+
+static void
+process_watches ( DBusConnectionState *cs )
+{
+    twalk( cs->watches, process_watch );
+}
+
+void dbus_svc_handle_watch(  DBusConnectionState *cs, int fd, dbus_svc_WatchFlags action )
+{
+    switch( action & 7 )
+    {
+    case WATCH_READ:
+	FD_SET(fd, &(cs->s_r_fds));
+	break;
+
+    case WATCH_WRITE:
+	FD_SET(fd, &(cs->s_w_fds));
+	break;
+	
+    case WATCH_ERROR:
+	FD_SET(fd, &(cs->s_e_fds));
+	break;
+    }
+}
+
+static void
+dispatch_status
+(   DBusConnection *connection, 
+    DBusDispatchStatus new_status,
+    void *csp 
+)
+{
+    connection=connection;
+    DBusConnectionState *cs = csp;
+    cs->dispatchStatus = new_status;
+}
+
+void
+dbus_svc_main_loop( DBusConnectionState *cs, void (*idle_handler)(DBusConnectionState *) )
+{
+    struct timeval timeout={0,200000};
+    int n_fds;
+
+    while( cs->status != SHUTDOWN )
+    {
+	cs->s_r_fds = cs->r_fds;
+	cs->s_w_fds = cs->w_fds;
+	cs->s_e_fds = cs->e_fds;
+	
+	timeout.tv_sec = 0;
+	timeout.tv_usec= 200000;
+
+	if ( (n_fds = select(cs->n, &(cs->s_r_fds), &(cs->s_w_fds), &(cs->s_e_fds), &timeout)) < 0 )
+	{	    
+	    if (errno != EINTR) 
+	    {
+		if( cs->eh != 0L ) (*(cs->eh))( "select failed: %d : %s", errno, strerror(errno));
+	        return;
+	    }
+	}
+
+	if( n_fds > 0 )
+	    process_watches(cs);
+
+	process_timeouts(cs);
+
+	if ( cs->dispatchStatus != DBUS_DISPATCH_COMPLETE )
+	    dbus_connection_dispatch( cs->connection );
+
+	if( idle_handler != 0L )
+	    (*idle_handler)(cs);
+    }
+}
+
+void dbus_svc_dispatch(DBusConnectionState *cs)
+{
+    process_watches(cs);
+    
+    FD_ZERO(&(cs->s_r_fds));
+    FD_ZERO(&(cs->s_w_fds));
+    FD_ZERO(&(cs->s_e_fds));
+
+    process_timeouts(cs);
+
+    while ( cs->dispatchStatus != DBUS_DISPATCH_COMPLETE )
+	dbus_connection_dispatch( cs->connection );
+}
+
+void 
+dbus_svc_quit( DBusConnectionState *cs )
+{
+    cs->status = SHUTDOWN;
+}
+
+static DBusConnectionState *
+connection_setup 
+(   DBusConnection *connection,  
+    dbus_svc_WatchHandler wh, 
+    dbus_svc_ErrorHandler eh, 
+    dbus_svc_ErrorHandler dh,
+    void *wh_arg
+)
+{
+    DBusConnectionState *cs = dbcs_new( connection );
+    
+    if ( cs == 0L )
+    {
+	if(eh)(*(eh))("connection_setup: out of memory");
+	goto fail;
+    }
+    cs->wh = wh;
+    cs->wh_arg = wh_arg;
+    cs->eh = eh;
+    cs->dh = dh;
+
+    if (!dbus_connection_set_watch_functions 
+	 (    cs->connection,
+	      add_watch,
+	      remove_watch,
+	      toggle_watch,
+	      cs,
+	      no_free
+	  )
+       )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_watch_functions failed");
+	goto fail; 
+    }
+      
+    if (!dbus_connection_set_timeout_functions 
+	 (    connection,
+	      add_timeout,
+	      remove_timeout,
+	      toggle_timeout,
+	      cs, 
+	      no_free
+	 )
+       )
+    {
+	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_timeout_functions failed");
+	goto fail;
+    }
+
+    dbus_connection_set_dispatch_status_function 
+    (   connection, 
+	dispatch_status, 
+	cs, 
+	no_free
+    ); 
+
+    if (dbus_connection_get_dispatch_status (connection) != DBUS_DISPATCH_COMPLETE)
+	dbus_connection_ref(connection);    
+    
+    return cs;
+  
+ fail:
+    if( cs != 0L )
+	free(cs);
+  
+    dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
+    dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
+    dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
+  
+    return 0L;
+}
+
+DBusConnectionState *
+dbus_svc_init
+(
+    dbus_svc_DBUS_TYPE    bus,
+    char                  *name, 
+    dbus_svc_WatchHandler wh ,
+    dbus_svc_ErrorHandler eh ,
+    dbus_svc_ErrorHandler dh ,
+    void *wh_arg
+)
+{
+    DBusConnection       *connection;
+    DBusError            error;
+    DBusConnectionState  *cs;
+    char *session_bus_address=0L;
+
+    memset(&error,'\0',sizeof(DBusError));
+
+    dbus_error_init(&error);
+
+    switch( bus )
+    {
+	/* DBUS_PRIVATE_* bus types are the only type which allow reconnection if the dbus-daemon is restarted
+         */
+    case DBUS_PRIVATE_SYSTEM:
+       
+	if ( (connection = dbus_connection_open_private("unix:path=/var/run/dbus/system_bus_socket", &error)) == 0L )
+	{
+	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
+	    return ( 0L );
+	}
+
+	if ( ! dbus_bus_register(connection,&error) )
+	{
+	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
+	    dbus_connection_close(connection);
+	    free(connection);
+	    return ( 0L );
+	}
+	break;
+
+    case DBUS_PRIVATE_SESSION:
+	
+	session_bus_address = getenv("DBUS_SESSION_BUS_ADDRESS");
+	if ( session_bus_address == 0L )
+	{
+	    if(eh)(*eh)("dbus_svc_init failed: DBUS_SESSION_BUS_ADDRESS environment variable not set");
+	    return ( 0L );
+	}
+
+	if ( (connection = dbus_connection_open_private(session_bus_address, &error)) == 0L )
+	{
+	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
+	    return ( 0L );
+	}
+
+	if ( ! dbus_bus_register(connection,&error) )
+	{
+	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
+	    dbus_connection_close(connection);
+	    free(connection);
+	    return ( 0L );
+	}
+	break;
+
+    case DBUS_SYSTEM:
+    case DBUS_SESSION:
+
+	if ( (connection = dbus_bus_get (bus, &error)) == 0L )
+	{
+	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
+	    return ( 0L );
+	}
+	break;
+
+    default:
+	if(eh)(*eh)("dbus_svc_init failed: unknown bus type %d", bus);
+	return ( 0L );
+    }
+    
+    dbus_connection_set_exit_on_disconnect(connection, FALSE);
+
+    if ( (cs = connection_setup(connection, wh, eh, dh, wh_arg)) == 0L )
+    {
+	if(eh)(*eh)("dbus_svc_init failed: connection_setup failed");
+	return( 0L );
+    }
+
+    if( name == 0L )
+	return( cs );
+    
+    cs->unique_name = dbus_bus_get_unique_name(connection);
+
+    switch
+	(   dbus_bus_request_name 
+	    (   connection, name, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT , &error
+	    ) 
+	)
+    {   
+    case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:	
+	break;
+    case DBUS_REQUEST_NAME_REPLY_EXISTS:
+    case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
+    case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
+	if(eh)(*eh)("dbus_svc_init: dbus_bus_request_name failed:  Name already registered");
+	goto give_up;
+    default:
+	if(eh)(*eh)("dbus_svc_init: dbus_bus_request_name failed: %s %s", error.name, error.message);
+	goto give_up;
+    }
+    return ( cs );
+
+ give_up:
+    dbus_connection_close( connection );
+    dbus_connection_unref( connection );
+    if( cs )
+    {
+	dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
+	dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
+	dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
+	free(cs);    
+    }
+    return ( 0L );
+}
+
+const char *dbus_svc_unique_name(DBusConnectionState *cs)
+{
+    return cs->unique_name;
+}
+
+void
+dbus_svc_shutdown ( DBusConnectionState *cs )                          
+{
+    if (!dbus_connection_set_watch_functions 
+	 (   cs->connection,
+	     NULL, NULL, NULL, NULL, NULL
+	 )
+       ) if( cs->eh != 0L ) (*(cs->eh))("connection_shutdown: dbus_connection_set_watch_functions: No Memory."
+                     "Setting watch functions to NULL failed."
+	            );
+  
+    if (!dbus_connection_set_timeout_functions 
+	 (   cs->connection,
+	     NULL, NULL, NULL, NULL, NULL
+	 )
+       ) if( cs->eh != 0L ) (*(cs->eh))("connection_shutdown: dbus_connection_set_timeout_functions: No Memory."
+		     "Setting timeout functions to NULL failed."
+	            );
+
+    dbus_connection_set_dispatch_status_function (cs->connection, NULL, NULL, NULL);
+    
+    tdestroy( cs->timeouts, free);
+    cs->timeouts=0L;
+    tdestroy( cs->watches, no_free);
+    cs->watches=0L;
+    
+    dbus_connection_close( cs->connection );
+    dbus_connection_unref( cs->connection );
+
+    free( cs );
+}
diff --git a/contrib/dbus/dbus_service.h b/contrib/dbus/dbus_service.h
new file mode 100644
index 00000000..69e7faca
--- /dev/null
+++ b/contrib/dbus/dbus_service.h
@@ -0,0 +1,284 @@
+/*  D-BUS Service Utilities
+ *  
+ *  Provides utilities for construction of D-BUS "Services"  
+ *
+ *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation at 
+ *           http://www.fsf.org/licensing/licenses/gpl.txt
+ *  and included in this software distribution as the "LICENSE" file.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ */
+
+#ifndef D_BUS_SERVER_UTILITIES_H
+#define D_BUS_SERVER_UTILITIES_H
+
+#include <stdint.h>
+#include <stdarg.h>
+
+typedef struct dbcs_s* DBUS_SVC;
+
+typedef enum 
+{ HANDLED, NOT_HANDLED, HANDLED_NOW 
+} dbus_svc_HandlerResult;
+
+typedef enum 
+{  INVALID, CALL, RETURN, ERROR, SIGNAL 
+} dbus_svc_MessageType;
+
+typedef enum 
+{
+    DBUS_SESSION,
+    DBUS_SYSTEM, 
+    DBUS_STARTER,
+    DBUS_PRIVATE_SYSTEM,
+    DBUS_PRIVATE_SESSION
+} dbus_svc_DBUS_TYPE;
+
+typedef enum /* D-BUS Protocol Type Codes / Signature Chars */
+{
+   TYPE_INVALID  =   (int)'\0',
+   TYPE_BYTE     =   (int)'y',
+   TYPE_BOOLEAN  =   (int)'b',
+   TYPE_INT16    =   (int)'n',
+   TYPE_UINT16   =   (int)'q',
+   TYPE_INT32    =   (int)'i',
+   TYPE_UINT32   =   (int)'u',
+   TYPE_INT64    =   (int)'x',
+   TYPE_UINT64   =   (int)'t',
+   TYPE_DOUBLE   =   (int)'d',
+   TYPE_STRING   =   (int)'s',
+   TYPE_OBJECT_PATH =(int)'o',
+   TYPE_SIGNATURE=   (int)'g',
+   TYPE_ARRAY    =   (int)'a',
+   TYPE_VARIANT  =   (int)'v',
+   TYPE_STRUCT   =   (int)'r',
+   TYPE_DICT_ENTRY = (int)'e',
+   STRUCT_BEGIN  =   (int)'(',
+   STRUCT_END    =   (int)')',
+   DICT_ENTRY_BEGIN =(int)'{',
+   DICT_ENTRY_END   =(int)'}'
+} dbus_svc_DataType;
+
+typedef struct DBusMessage* dbus_svc_MessageHandle;
+
+typedef int 
+(*dbus_svc_ErrorHandler)
+( const char *errorFmt, ...
+); /* Error Handler function prototype - handle FATAL errors from D-BUS calls */
+
+typedef enum
+{
+    WATCH_ENABLE = 8,
+    WATCH_ERROR  = 4,
+    WATCH_WRITE  = 2,
+    WATCH_READ   = 1
+} dbus_svc_WatchFlags;
+
+typedef void (*dbus_svc_WatchHandler)( int, dbus_svc_WatchFlags, void *arg );
+
+typedef dbus_svc_HandlerResult 
+(*dbus_svc_MessageHandler)
+( DBUS_SVC dbus,
+  dbus_svc_MessageType type,
+  uint8_t  reply_expected,   /* 1 / 0 */
+  uint32_t serial,           /* serial number of message; needed to reply */
+  const char *destination,         /* D-BUS connection name / destination */
+  const char *path,                /* D-BUS Object Path */  
+  const char *member,              /* D-BUS Object Member */
+  const char *interface,           /* D-BUS Object interface */
+  const char *if_suffix,           /* remainder of interface prefixed by ifPrefix */
+  const char *sender,              /* Senders' connection destination */
+  const char *signature,           /* Signature String composed of Type Codes      */
+  dbus_svc_MessageHandle msg,/* Message pointer: call dbus_svc_get_args(msg,...) to get data */
+  const char *prefix,              /* If non-null, this is the root prefix for this sub-path message */ 
+  const char *suffix,              /* If non-null, this is the suffix of this sub-path message */
+  void *prefixObject,        /* If non-null, this is the object that was registered for the prefix */
+  void *object               /* If non-null, this is the object that was registered for the complete path */
+); /* Message Handler function prototype */
+
+#define DBusMsgHandlerArgs \
+  DBUS_SVC dbus, \
+  dbus_svc_MessageType type, \
+  uint8_t  reply_expected, \
+  uint32_t serial,         \
+  const char *destination,       \
+  const char *path,              \
+  const char *member,            \
+  const char *interface,         \
+  const char *if_suffix,         \
+  const char *sender,            \
+  const char *signature,         \
+  dbus_svc_MessageHandle msg, \
+  const char *prefix,            \
+  const char *suffix,            \
+  void *prefixObject,      \
+  void *object             
+
+#define SHUTDOWN 255
+
+extern  DBUS_SVC dbus_svc_init
+( dbus_svc_DBUS_TYPE bus, 
+  char *name,                         /* name to register with D-BUS */
+  dbus_svc_WatchHandler wh,           /* optional handler for watch events */
+  dbus_svc_ErrorHandler eh,           /* optional error log message handler */
+  dbus_svc_ErrorHandler dh,           /* optional debug / info log message handler */
+  void *wh_arg                        /* optional watch handler arg */
+); 
+/*
+ * Obtains connection to DBUS_BUS_STARTER and registers "name".
+ * "eh" will be called for all errors from this server session.
+ */
+
+/* EITHER :
+ *        pass a NULL WatchHandler to dbus_svc_init and use dbus_svc_main_loop
+ * OR:
+ *        supply a valid WatchHandler, and call dbus_svc_handle_watch when 
+ *        select() returns the watch fd as ready for the watch action, and
+ *        call dbus_svc_dispatch when all watches have been handled.
+ */        
+
+
+uint8_t
+dbus_svc_add_filter
+(  DBUS_SVC, dbus_svc_MessageHandler mh, void *obj, int n_matches, ... );
+/*
+ * Registers SINGLE message handler to handle ALL messages, adding match rules
+ */
+
+void  dbus_svc_main_loop( DBUS_SVC, void (*idle_handler)(DBUS_SVC) ); 
+ 
+void  dbus_svc_handle_watch( DBUS_SVC, int watch_fd, dbus_svc_WatchFlags action);
+
+void  dbus_svc_dispatch( DBUS_SVC );
+
+/*
+ * Enter message processing loop.
+ * If "idle_handler" is non-null, it will be called once per iteration of loop.
+ */
+
+const char *dbus_svc_unique_name( DBUS_SVC );
+/*
+ * Returns connection "unique" (socket) name
+ */
+
+void  dbus_svc_quit( DBUS_SVC );
+/*
+ * Exit message processing loop
+ */
+
+void  dbus_svc_shutdown( DBUS_SVC );
+/*
+ * Close connections and clean up. 
+ * DBUS_SVC pointer is invalid after this.
+ */
+
+uint8_t
+dbus_svc_get_args( DBUS_SVC, dbus_svc_MessageHandle, dbus_svc_DataType, ... );
+/* get arguments from message  */
+
+uint8_t
+dbus_svc_get_args_va( DBUS_SVC, dbus_svc_MessageHandle, dbus_svc_DataType, va_list );
+/* get arguments from message  */
+
+
+typedef void (*dbus_svc_ShutdownHandler) ( DBUS_SVC, void * );
+uint8_t
+dbus_svc_add_shutdown_filter
+(
+    DBUS_SVC, dbus_svc_ShutdownHandler sh, void *obj 
+);
+/* Registers a filter for D-BUS shutdown event.
+ * Cannot be used in conjunction with dbus_svc_add_message_filter.
+ */
+
+uint8_t
+dbus_svc_remove_message_filter
+( DBUS_SVC, dbus_svc_MessageHandler mh);
+/* Unregisters the message filter */
+
+uint8_t 
+dbus_svc_send
+( DBUS_SVC,
+  dbus_svc_MessageType type,
+  int32_t reply_serial,
+  uint32_t *new_serial,
+  const char *destination,
+  const char *path,
+  const char *member,
+  const char *interface,
+  dbus_svc_DataType firstType,
+  ... /* pointer, { (dbus_svc_DataType, pointer )...} */ 
+); /* sends messages / replies to "destination" */
+
+uint8_t 
+dbus_svc_send_va
+( DBUS_SVC cs,
+  dbus_svc_MessageType type,
+  int32_t reply_serial,
+  uint32_t *new_serial,
+  const char *destination,
+  const char *path,
+  const char *member,
+  const char *interface,
+  dbus_svc_DataType firstType,
+  va_list va
+); /* sends messages / replies to "destination" */
+
+dbus_svc_MessageHandle
+dbus_svc_call
+( DBUS_SVC cs,
+  const char *destination,
+  const char *path,
+  const char *member,
+  const char *interface,
+  dbus_svc_DataType firstType,
+  ...
+); /* constructs message, sends it, returns reply */
+
+dbus_svc_MessageHandle
+dbus_svc_new_message
+( DBUS_SVC cs,
+  dbus_svc_MessageType type,
+  int32_t reply_serial,
+  const char *destination,
+  const char *path,
+  const char *interface,
+  const char *member
+);
+
+uint8_t
+dbus_svc_send_message(DBUS_SVC , dbus_svc_MessageHandle , uint32_t *  );
+
+uint8_t
+dbus_svc_message_append_args( DBUS_SVC , dbus_svc_MessageHandle, dbus_svc_DataType, ...);
+
+typedef struct DBusMessageIter *dbus_svc_MessageIterator;
+
+dbus_svc_MessageIterator
+dbus_svc_message_iterator_new( DBUS_SVC, dbus_svc_MessageHandle );
+
+uint32_t
+dbus_svc_message_next_arg_type( DBUS_SVC, dbus_svc_MessageIterator );
+
+void
+dbus_svc_message_next_arg( DBUS_SVC, dbus_svc_MessageIterator,  void * );
+
+uint32_t
+dbus_svc_message_element_type( DBUS_SVC, dbus_svc_MessageIterator );
+
+void
+dbus_svc_message_get_elements( DBUS_SVC, dbus_svc_MessageIterator, uint32_t *n, void *array );
+
+uint8_t dbus_svc_message_type( dbus_svc_MessageHandle );
+
+void dbus_svc_message_iterator_free(  DBUS_SVC, dbus_svc_MessageIterator  );
+
+#endif
diff --git a/contrib/dbus/named-dbus-system.conf b/contrib/dbus/named-dbus-system.conf
new file mode 100644
index 00000000..2cb99bdc
--- /dev/null
+++ b/contrib/dbus/named-dbus-system.conf
@@ -0,0 +1,20 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+    <servicedir>/usr/share/dbus-1/services</servicedir>
+    <policy user="named">
+            <allow own="com.redhat.named"/>
+            <allow send_interface="com.redhat.named"/>
+            <allow send_destination="com.redhat.named"/>
+    </policy>
+    <policy user="root">
+            <allow send_interface="com.redhat.named"/>
+            <allow send_destination="com.redhat.named"/>
+    </policy>
+    <policy context="default">
+            <deny own="com.redhat.named"/>
+            <deny send_destination="com.redhat.named"/>
+            <deny send_interface="com.redhat.named"/>
+    </policy>
+</busconfig>
+
diff --git a/contrib/dbus/named-dbus.service b/contrib/dbus/named-dbus.service
new file mode 100644
index 00000000..ddf40e7d
--- /dev/null
+++ b/contrib/dbus/named-dbus.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.redhat.named
+Exec=/usr/sbin/named
diff --git a/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.3-patch b/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.3-patch
new file mode 100644
index 00000000..f84ab77d
--- /dev/null
+++ b/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.3-patch
@@ -0,0 +1,1277 @@
+IDN patch for bind-9.3.3
+========================
+
+
+This is a patch file for ISC BIND 9.3.3 to make it work with
+internationalized domain names.  With this patch you'll get IDN-aware
+dig/host/nslookup.
+
+To apply this patch, you should go to the top directory of the BIND
+distribution (where you see `README' file), then invoke `patch'
+command like this:
+
+        % patch -p0 < this-file
+
+Then follow the instructions described in `README.idnkit' to compile
+and install.
+
+
+Index: README.idnkit
+--- /dev/null	Fri May 26 13:45:50 2006
++++ README.idnkit	Fri May 26 12:51:31 2006
+@@ -0,0 +1,112 @@
++
++			BIND-9 IDN patch
++
++	       Japan Network Information Center (JPNIC)
++
++
++* What is this patch for?
++
++This patch adds internationalized domain name (IDN) support to BIND-9.
++You'll get internationalized version of dig/host/nslookup commands.
++
++    + internationalized dig/host/nslookup
++	dig/host/nslookup accepts non-ASCII domain names in the local
++	codeset (such as Shift JIS, Big5 or ISO8859-1) determined by
++	the locale information.  The domain names are normalized and
++	converted to the encoding on the DNS protocol, and sent to DNS
++	servers.  The replies are converted back to the local codeset
++	and displayed.
++
++
++* Compilation & installation
++
++0. Prerequisite
++
++You have to build and install idnkit before building this patched version
++of bind-9.
++
++1. Running configure script
++
++Run `configure' in the top directory.  See `README' for the
++configuration options.
++
++This patch adds the following 4 options to `configure'.  You should
++at least specify `--with-idn' option to enable IDN support.
++
++    --with-idn[=IDN_PREFIX]
++	To enable IDN support, you have to specify `--with-idn' option.
++	The argument IDN_PREFIX is the install prefix of idnkit.  If
++	IDN_PREFIX is omitted, PREFIX (derived from `--prefix=PREFIX')
++	is assumed.
++
++    --with-libiconv[=LIBICONV_PREFIX]
++	Specify this option if idnkit you have installed links GNU
++	libiconv.  The argument LIBICONV_PREFIX is install prefix of
++	GNU libiconv.  If the argument is omitted, PREFIX (derived
++	from `--prefix=PREFIX') is assumed.
++
++	`--with-libiconv' is shorthand option for GNU libiconv.
++
++	    --with-libiconv=/usr/local
++
++	This is equivalent to:
++
++	    --with-iconv='-L/usr/local/lib -R/usr/local/lib -liconv'
++
++	`--with-libiconv' assumes that your C compiler has `-R'
++	option, and that the option adds the specified run-time path
++	to an exacutable binary.  If `-R' option of your compiler has
++	different meaning, or your compiler lacks the option, you
++	should use `--with-iconv' option instead.  Binary command
++	without run-time path information might be unexecutable.
++	In that case, you would see an error message like:
++
++	    error in loading shared libraries: libiconv.so.2: cannot
++	    open shared object file
++
++	If both `--with-libiconv' and `--with-iconv' options are
++	specified, `--with-iconv' is prior to `--with-libiconv'.
++
++    --with-iconv=ICONV_LIBSPEC
++	If your libc doens't provide iconv(), you need to specify the
++	library containing iconv() with this option.  `ICONV_LIBSPEC'
++	is the argument(s) to `cc' or `ld' to link the library, for
++	example, `--with-iconv="-L/usr/local/lib -liconv"'.
++	You don't need to specify the header file directory for "iconv.h"
++	to the compiler, as it isn't included directly by bind-9 with
++	this patch.
++
++    --with-idnlib=IDN_LIBSPEC
++	With this option, you can explicitly specify the argument(s)
++	to `cc' or `ld' to link the idnkit's library, `libidnkit'.  If
++	this option is not specified, `-L${PREFIX}/lib -lidnkit' is
++	assumed, where ${PREFIX} is the installation prefix specified
++	with `--with-idn' option above.  You may need to use this
++	option to specify extra argments, for example,
++	`--with-idnlib="-L/usr/local/lib -R/usr/local/lib -lidnkit"'.
++
++Please consult `README' for other configuration options.
++
++Note that if you want to specify some extra header file directories,
++you should use the environment variable STD_CINCLUDES instead of
++CFLAGS, as described in README.
++
++2. Compilation and installation
++
++After running "configure", just do
++
++	make
++	make install
++
++for compiling and installing.
++
++
++* Contact information
++
++Please see http//www.nic.ad.jp/en/idn/ for the latest news
++about idnkit and this patch.
++
++Bug reports and comments on this kit should be sent to
++mdnkit-bugs@nic.ad.jp and idn-cmt@nic.ad.jp, respectively.
++
++; $Id: bind-9.2.2-patch,v 1.1.1.1 2003/06/04 00:27:32 marka Exp $
+Index: config.h.in
+===================================================================
+RCS file: /proj/cvs/prod/bind9/config.h.in,v
+retrieving revision 1.47.2.3.2.24
+diff -U2 -r1.47.2.3.2.24 config.h.in
+--- config.h.in	1 Mar 2006 02:41:36 -0000	1.47.2.3.2.24
++++ config.h.in	26 May 2006 03:49:41 -0000
+@@ -17,5 +17,5 @@
+  */
+ 
+-/* $Id: config.h.in,v 1.47.2.3.2.24 2006/03/01 02:41:36 marka Exp $ */
++/* $Id: acconfig.h,v 1.35.2.4.2.10 2004/12/04 06:50:02 marka Exp $ */
+ 
+ /***
+@@ -190,4 +190,7 @@
+ #undef HAVE_LINUX_CAPABILITY_H
+ 
++/* Define to 1 if you have the <locale.h> header file. */
++#undef HAVE_LOCALE_H
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+@@ -199,4 +202,7 @@
+ #undef HAVE_RSA_GENERATE_KEY
+ 
++/* Define to 1 if you have the `setlocale' function. */
++#undef HAVE_SETLOCALE
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+@@ -273,4 +279,7 @@
+ #undef USE_FIONBIO_IOCTL
+ 
++/* define if idnkit support is to be included. */
++#undef WITH_IDN
++
+ /* Define to 1 if your processor stores words with the most significant byte
+    first (like Motorola and SPARC, unlike Intel and VAX). */
+Index: configure
+===================================================================
+RCS file: /proj/cvs/prod/bind9/configure,v
+retrieving revision 1.284.2.19.2.55
+diff -U2 -r1.284.2.19.2.55 configure
+--- configure	6 Mar 2006 01:11:48 -0000	1.284.2.19.2.55
++++ configure	26 May 2006 03:50:35 -0000
+@@ -15,5 +15,5 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+-# $Id: configure,v 1.284.2.19.2.55 2006/03/06 01:11:48 marka Exp $
++# $Id: COPYRIGHT,v 1.6.2.2.8.4 2006/01/04 00:37:22 marka Exp $
+ #
+ # Portions Copyright (C) 1996-2001  Nominum, Inc.
+@@ -496,5 +496,5 @@
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STD_CINCLUDES STD_CDEFINES STD_CWARNINGS CCOPT AR ARFLAGS LN ETAGS PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP ISC_SOCKADDR_LEN_T ISC_PLATFORM_HAVELONGLONG ISC_PLATFORM_HAVELIFCONF ISC_PLATFORM_NEEDSYSSELECTH LWRES_PLATFORM_NEEDSYSSELECTH USE_OPENSSL DST_OPENSSL_INC USE_GSSAPI DST_GSSAPI_INC DNS_CRYPTO_LIBS ALWAYS_DEFINES ISC_PLATFORM_USETHREADS ISC_THREAD_DIR MKDEPCC MKDEPCFLAGS MKDEPPROG IRIX_DNSSEC_WARNINGS_HACK purify_path PURIFY LN_S ECHO ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL O A SA LIBTOOL_MKDEP_SED LIBTOOL_MODE_COMPILE LIBTOOL_MODE_INSTALL LIBTOOL_MODE_LINK LIBTOOL_ALLOW_UNDEFINED LIBTOOL_IN_MAIN LIBBIND ISC_PLATFORM_HAVEIPV6 LWRES_PLATFORM_HAVEIPV6 ISC_PLATFORM_NEEDNETINETIN6H LWRES_PLATFORM_NEEDNETINETIN6H ISC_PLATFORM_NEEDNETINET6IN6H LWRES_PLATFORM_NEEDNETINET6IN6H ISC_PLATFORM_HAVEINADDR6 LWRES_PLATFORM_HAVEINADDR6 ISC_PLATFORM_NEEDIN6ADDRANY LWRES_PLATFORM_NEEDIN6ADDRANY ISC_PLATFORM_NEEDIN6ADDRLOOPBACK LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK ISC_PLATFORM_HAVEIN6PKTINFO ISC_PLATFORM_FIXIN6ISADDR ISC_IPV6_H ISC_IPV6_O ISC_ISCIPV6_O ISC_IPV6_C LWRES_HAVE_SIN6_SCOPE_ID ISC_PLATFORM_HAVESCOPEID ISC_PLATFORM_HAVEIF_LADDRREQ ISC_PLATFORM_HAVEIF_LADDRCONF ISC_PLATFORM_NEEDNTOP ISC_PLATFORM_NEEDPTON ISC_PLATFORM_NEEDATON ISC_PLATFORM_HAVESALEN LWRES_PLATFORM_HAVESALEN ISC_PLATFORM_MSGHDRFLAVOR ISC_PLATFORM_NEEDPORTT ISC_LWRES_NEEDADDRINFO ISC_LWRES_NEEDRRSETINFO ISC_LWRES_SETHOSTENTINT ISC_LWRES_ENDHOSTENTINT ISC_LWRES_GETNETBYADDRINADDR ISC_LWRES_SETNETENTINT ISC_LWRES_ENDNETENTINT ISC_LWRES_GETHOSTBYADDRVOID ISC_LWRES_NEEDHERRNO ISC_LWRES_GETIPNODEPROTO ISC_LWRES_GETADDRINFOPROTO ISC_LWRES_GETNAMEINFOPROTO ISC_PLATFORM_NEEDSTRSEP ISC_PLATFORM_NEEDMEMMOVE ISC_PLATFORM_NEEDSTRTOUL LWRES_PLATFORM_NEEDSTRTOUL GENRANDOMLIB ISC_PLATFORM_NEEDSTRLCPY ISC_PLATFORM_NEEDSTRLCAT ISC_PLATFORM_NEEDSPRINTF LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDVSNPRINTF LWRES_PLATFORM_NEEDVSNPRINTF ISC_EXTRA_OBJS ISC_EXTRA_SRCS ISC_PLATFORM_QUADFORMAT LWRES_PLATFORM_QUADFORMAT ISC_PLATFORM_RLIMITTYPE ISC_PLATFORM_USEDECLSPEC LWRES_PLATFORM_USEDECLSPEC ISC_PLATFORM_BRACEPTHREADONCEINIT ISC_PLATFORM_HAVEIFNAMETOINDEX LATEX PDFLATEX XSLTPROC XMLLINT XSLT_DOCBOOK_STYLE_HTML XSLT_DOCBOOK_STYLE_XHTML XSLT_DOCBOOK_STYLE_MAN XSLT_DOCBOOK_CHUNK_HTML XSLT_DOCBOOK_CHUNK_XHTML XSLT_DB2LATEX_STYLE XSLT_DB2LATEX_ADMONITIONS BIND9_TOP_BUILDDIR BIND9_ISC_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE BIND9_ISCCFG_BUILDINCLUDE BIND9_DNS_BUILDINCLUDE BIND9_LWRES_BUILDINCLUDE BIND9_BIND9_BUILDINCLUDE BIND9_VERSION BUILD_CC BUILD_CFLAGS BUILD_CPPFLAGS BUILD_LDFLAGS BUILD_LIBS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STD_CINCLUDES STD_CDEFINES STD_CWARNINGS CCOPT AR ARFLAGS LN ETAGS PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP ISC_SOCKADDR_LEN_T ISC_PLATFORM_HAVELONGLONG ISC_PLATFORM_HAVELIFCONF ISC_PLATFORM_NEEDSYSSELECTH LWRES_PLATFORM_NEEDSYSSELECTH USE_OPENSSL DST_OPENSSL_INC USE_GSSAPI DST_GSSAPI_INC DNS_CRYPTO_LIBS ALWAYS_DEFINES ISC_PLATFORM_USETHREADS ISC_THREAD_DIR MKDEPCC MKDEPCFLAGS MKDEPPROG IRIX_DNSSEC_WARNINGS_HACK purify_path PURIFY LN_S ECHO ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL O A SA LIBTOOL_MKDEP_SED LIBTOOL_MODE_COMPILE LIBTOOL_MODE_INSTALL LIBTOOL_MODE_LINK LIBTOOL_ALLOW_UNDEFINED LIBTOOL_IN_MAIN LIBBIND ISC_PLATFORM_HAVEIPV6 LWRES_PLATFORM_HAVEIPV6 ISC_PLATFORM_NEEDNETINETIN6H LWRES_PLATFORM_NEEDNETINETIN6H ISC_PLATFORM_NEEDNETINET6IN6H LWRES_PLATFORM_NEEDNETINET6IN6H ISC_PLATFORM_HAVEINADDR6 LWRES_PLATFORM_HAVEINADDR6 ISC_PLATFORM_NEEDIN6ADDRANY LWRES_PLATFORM_NEEDIN6ADDRANY ISC_PLATFORM_NEEDIN6ADDRLOOPBACK LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK ISC_PLATFORM_HAVEIN6PKTINFO ISC_PLATFORM_FIXIN6ISADDR ISC_IPV6_H ISC_IPV6_O ISC_ISCIPV6_O ISC_IPV6_C LWRES_HAVE_SIN6_SCOPE_ID ISC_PLATFORM_HAVESCOPEID ISC_PLATFORM_HAVEIF_LADDRREQ ISC_PLATFORM_HAVEIF_LADDRCONF ISC_PLATFORM_NEEDNTOP ISC_PLATFORM_NEEDPTON ISC_PLATFORM_NEEDATON ISC_PLATFORM_HAVESALEN LWRES_PLATFORM_HAVESALEN ISC_PLATFORM_MSGHDRFLAVOR ISC_PLATFORM_NEEDPORTT ISC_LWRES_NEEDADDRINFO ISC_LWRES_NEEDRRSETINFO ISC_LWRES_SETHOSTENTINT ISC_LWRES_ENDHOSTENTINT ISC_LWRES_GETNETBYADDRINADDR ISC_LWRES_SETNETENTINT ISC_LWRES_ENDNETENTINT ISC_LWRES_GETHOSTBYADDRVOID ISC_LWRES_NEEDHERRNO ISC_LWRES_GETIPNODEPROTO ISC_LWRES_GETADDRINFOPROTO ISC_LWRES_GETNAMEINFOPROTO ISC_PLATFORM_NEEDSTRSEP ISC_PLATFORM_NEEDMEMMOVE ISC_PLATFORM_NEEDSTRTOUL LWRES_PLATFORM_NEEDSTRTOUL GENRANDOMLIB ISC_PLATFORM_NEEDSTRLCPY ISC_PLATFORM_NEEDSTRLCAT ISC_PLATFORM_NEEDSPRINTF LWRES_PLATFORM_NEEDSPRINTF ISC_PLATFORM_NEEDVSNPRINTF LWRES_PLATFORM_NEEDVSNPRINTF ISC_EXTRA_OBJS ISC_EXTRA_SRCS ISC_PLATFORM_QUADFORMAT LWRES_PLATFORM_QUADFORMAT ISC_PLATFORM_RLIMITTYPE ISC_PLATFORM_USEDECLSPEC LWRES_PLATFORM_USEDECLSPEC ISC_PLATFORM_BRACEPTHREADONCEINIT ISC_PLATFORM_HAVEIFNAMETOINDEX LATEX PDFLATEX XSLTPROC XMLLINT XSLT_DOCBOOK_STYLE_HTML XSLT_DOCBOOK_STYLE_XHTML XSLT_DOCBOOK_STYLE_MAN XSLT_DOCBOOK_CHUNK_HTML XSLT_DOCBOOK_CHUNK_XHTML XSLT_DB2LATEX_STYLE XSLT_DB2LATEX_ADMONITIONS IDNLIBS BIND9_TOP_BUILDDIR BIND9_ISC_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE BIND9_ISCCFG_BUILDINCLUDE BIND9_DNS_BUILDINCLUDE BIND9_LWRES_BUILDINCLUDE BIND9_BIND9_BUILDINCLUDE BIND9_VERSION BUILD_CC BUILD_CFLAGS BUILD_CPPFLAGS BUILD_LDFLAGS BUILD_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files='BIND9_MAKE_INCLUDES BIND9_MAKE_RULES LIBISC_API LIBISCCC_API LIBISCCFG_API LIBDNS_API LIBBIND9_API LIBLWRES_API'
+ 
+@@ -1081,4 +1081,8 @@
+                           include additional configurations [automatic]
+   --with-kame=PATH	use Kame IPv6 default path /usr/local/v6
++  --with-idn=MPREFIX   enable IDN support using idnkit default PREFIX
++  --with-libiconv=IPREFIX   GNU libiconv are in IPREFIX default PREFIX
++  --with-iconv=LIBSPEC   specify iconv library default -liconv
++  --with-idnlib=ARG    specify libidnkit
+ 
+ Some influential environment variables:
+@@ -8437,5 +8441,5 @@
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 8439 "configure"' > conftest.$ac_ext
++  echo '#line 8443 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -9434,5 +9438,5 @@
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:9436:" \
++echo "$as_me:9440:" \
+      "checking for Fortran 77 compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+@@ -10495,9 +10499,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10497: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10501: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10501: \$? = $ac_status" >&5
++   echo "$as_me:10505: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10738,9 +10742,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10740: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10744: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10744: \$? = $ac_status" >&5
++   echo "$as_me:10748: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10798,9 +10802,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:10800: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10804: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10804: \$? = $ac_status" >&5
++   echo "$as_me:10808: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+@@ -12983,5 +12987,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12985 "configure"
++#line 12989 "configure"
+ #include "confdefs.h"
+ 
+@@ -13081,5 +13085,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 13083 "configure"
++#line 13087 "configure"
+ #include "confdefs.h"
+ 
+@@ -15278,9 +15282,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15280: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15284: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15284: \$? = $ac_status" >&5
++   echo "$as_me:15288: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15338,9 +15342,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15340: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15344: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15344: \$? = $ac_status" >&5
++   echo "$as_me:15348: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+@@ -16699,5 +16703,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 16701 "configure"
++#line 16705 "configure"
+ #include "confdefs.h"
+ 
+@@ -16797,5 +16801,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 16799 "configure"
++#line 16803 "configure"
+ #include "confdefs.h"
+ 
+@@ -17634,9 +17638,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17640: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17640: \$? = $ac_status" >&5
++   echo "$as_me:17644: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -17694,9 +17698,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17696: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17700: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17700: \$? = $ac_status" >&5
++   echo "$as_me:17704: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+@@ -19733,9 +19737,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:19735: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19739: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19739: \$? = $ac_status" >&5
++   echo "$as_me:19743: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -19976,9 +19980,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:19978: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19982: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19982: \$? = $ac_status" >&5
++   echo "$as_me:19986: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -20036,9 +20040,9 @@
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:20038: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20042: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:20042: \$? = $ac_status" >&5
++   echo "$as_me:20046: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+@@ -22221,5 +22225,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 22223 "configure"
++#line 22227 "configure"
+ #include "confdefs.h"
+ 
+@@ -22319,5 +22323,5 @@
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 22321 "configure"
++#line 22325 "configure"
+ #include "confdefs.h"
+ 
+@@ -28096,4 +28100,354 @@
+ 
+ #
++# IDN support
++#
++
++# Check whether --with-idn or --without-idn was given.
++if test "${with_idn+set}" = set; then
++  withval="$with_idn"
++  use_idn="$withval"
++else
++  use_idn="no"
++fi;
++case "$use_idn" in
++yes)
++	if test X$prefix = XNONE ; then
++		idn_path=/usr/local
++	else
++		idn_path=$prefix
++	fi
++	;;
++no)
++	;;
++*)
++	idn_path="$use_idn"
++	;;
++esac
++
++iconvinc=
++iconvlib=
++
++# Check whether --with-libiconv or --without-libiconv was given.
++if test "${with_libiconv+set}" = set; then
++  withval="$with_libiconv"
++  use_libiconv="$withval"
++else
++  use_libiconv="no"
++fi;
++case "$use_libiconv" in
++yes)
++	if test X$prefix = XNONE ; then
++		iconvlib="-L/usr/local/lib -R/usr/local/lib -liconv"
++	else
++		iconvlib="-L$prefix/lib -R$prefix/lib -liconv"
++	fi
++	;;
++no)
++	iconvlib=
++	;;
++*)
++	iconvlib="-L$use_libiconv/lib -R$use_libiconv/lib -liconv"
++	;;
++esac
++
++
++# Check whether --with-iconv or --without-iconv was given.
++if test "${with_iconv+set}" = set; then
++  withval="$with_iconv"
++  iconvlib="$withval"
++fi;
++case "$iconvlib" in
++no)
++	iconvlib=
++	;;
++yes)
++	iconvlib=-liconv
++	;;
++esac
++
++
++# Check whether --with-idnlib or --without-idnlib was given.
++if test "${with_idnlib+set}" = set; then
++  withval="$with_idnlib"
++  idnlib="$withval"
++else
++  idnlib="no"
++fi;
++if test "$idnlib" = yes; then
++	{ { echo "$as_me:$LINENO: error: You must specify ARG for --with-idnlib." >&5
++echo "$as_me: error: You must specify ARG for --with-idnlib." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++IDNLIBS=
++if test "$use_idn" != no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define WITH_IDN 1
++_ACEOF
++
++	STD_CINCLUDES="$STD_CINCLUDES -I$idn_path/include"
++	if test "$idnlib" != no; then
++		IDNLIBS="$idnlib $iconvlib"
++	else
++		IDNLIBS="-L$idn_path/lib -lidnkit $iconvlib"
++	fi
++fi
++
++
++
++for ac_header in locale.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++for ac_func in setlocale
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++
++#
+ # Substitutions
+ #
+@@ -29009,4 +29363,5 @@
+ s,@XSLT_DB2LATEX_STYLE@,$XSLT_DB2LATEX_STYLE,;t t
+ s,@XSLT_DB2LATEX_ADMONITIONS@,$XSLT_DB2LATEX_ADMONITIONS,;t t
++s,@IDNLIBS@,$IDNLIBS,;t t
+ s,@BIND9_TOP_BUILDDIR@,$BIND9_TOP_BUILDDIR,;t t
+ s,@BIND9_ISC_BUILDINCLUDE@,$BIND9_ISC_BUILDINCLUDE,;t t
+Index: configure.in
+===================================================================
+RCS file: /proj/cvs/prod/bind9/configure.in,v
+retrieving revision 1.294.2.23.2.60
+diff -U2 -r1.294.2.23.2.60 configure.in
+--- configure.in	6 Mar 2006 01:10:29 -0000	1.294.2.23.2.60
++++ configure.in	26 May 2006 03:50:41 -0000
+@@ -2016,4 +2016,80 @@
+ 
+ #
++# IDN support
++#
++AC_ARG_WITH(idn,
++	[  --with-idn[=MPREFIX]   enable IDN support using idnkit [default PREFIX]],
++	use_idn="$withval", use_idn="no")
++case "$use_idn" in
++yes)
++	if test X$prefix = XNONE ; then
++		idn_path=/usr/local
++	else
++		idn_path=$prefix
++	fi
++	;;
++no)
++	;;
++*)
++	idn_path="$use_idn"
++	;;
++esac
++
++iconvinc=
++iconvlib=
++AC_ARG_WITH(libiconv,
++	[  --with-libiconv[=IPREFIX]   GNU libiconv are in IPREFIX [default PREFIX]],
++	use_libiconv="$withval", use_libiconv="no")
++case "$use_libiconv" in
++yes)
++	if test X$prefix = XNONE ; then
++		iconvlib="-L/usr/local/lib -R/usr/local/lib -liconv"
++	else
++		iconvlib="-L$prefix/lib -R$prefix/lib -liconv"
++	fi
++	;;
++no)
++	iconvlib=
++	;;
++*)
++	iconvlib="-L$use_libiconv/lib -R$use_libiconv/lib -liconv"
++	;;
++esac
++
++AC_ARG_WITH(iconv,
++	[  --with-iconv[=LIBSPEC]   specify iconv library [default -liconv]],
++	iconvlib="$withval")
++case "$iconvlib" in
++no)
++	iconvlib=
++	;;
++yes)
++	iconvlib=-liconv
++	;;
++esac
++
++AC_ARG_WITH(idnlib,
++	[  --with-idnlib=ARG    specify libidnkit],
++	idnlib="$withval", idnlib="no")
++if test "$idnlib" = yes; then
++	AC_MSG_ERROR([You must specify ARG for --with-idnlib.])
++fi
++
++IDNLIBS=
++if test "$use_idn" != no; then
++	AC_DEFINE(WITH_IDN, 1, [define if idnkit support is to be included.])
++	STD_CINCLUDES="$STD_CINCLUDES -I$idn_path/include"
++	if test "$idnlib" != no; then
++		IDNLIBS="$idnlib $iconvlib"
++	else
++		IDNLIBS="-L$idn_path/lib -lidnkit $iconvlib"
++	fi
++fi
++AC_SUBST(IDNLIBS)
++
++AC_CHECK_HEADERS(locale.h)
++AC_CHECK_FUNCS(setlocale)
++
++#
+ # Substitutions
+ #
+Index: bin/dig/Makefile.in
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/Makefile.in,v
+retrieving revision 1.25.12.12
+diff -U2 -r1.25.12.12 Makefile.in
+--- bin/dig/Makefile.in	18 Aug 2004 23:25:57 -0000	1.25.12.12
++++ bin/dig/Makefile.in	26 May 2006 03:50:41 -0000
+@@ -46,5 +46,5 @@
+ 
+ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
+-		${ISCCFGLIBS} @LIBS@
++		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
+ 
+ SUBDIRS =
+Index: bin/dig/dig.1
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/dig.1,v
+retrieving revision 1.14.2.4.2.10
+diff -U2 -r1.14.2.4.2.10 dig.1
+--- bin/dig/dig.1	13 Oct 2005 02:33:42 -0000	1.14.2.4.2.10
++++ bin/dig/dig.1	26 May 2006 03:50:43 -0000
+@@ -14,5 +14,5 @@
+ .\" PERFORMANCE OF THIS SOFTWARE.
+ .\"
+-.\" $Id: dig.1,v 1.14.2.4.2.10 2005/10/13 02:33:42 marka Exp $
++.\" $Id$
+ .\"
+ .hy 0
+@@ -408,4 +408,15 @@
+ will not print the initial query when it looks up the NS records for
+ isc.org.
++.SH "IDN SUPPORT"
++.PP
++If
++\fBdig\fR
++has been built with IDN (internationalized domain name) support, it can accept and display non\-ASCII domain names.
++\fBdig\fR
++appropriately converts character encoding of domain name before sending a request to DNS server or displaying a reply from the server. If you'd like to turn off the IDN support for some reason, defines the
++\fBIDN_DISABLE\fR
++environment variable. The IDN support is disabled if the the variable is set when
++\fBdig\fR
++runs.
+ .SH "FILES"
+ .PP
+Index: bin/dig/dig.docbook
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/dig.docbook,v
+retrieving revision 1.4.2.7.4.12
+diff -U2 -r1.4.2.7.4.12 dig.docbook
+--- bin/dig/dig.docbook	30 Aug 2005 00:50:29 -0000	1.4.2.7.4.12
++++ bin/dig/dig.docbook	26 May 2006 03:50:45 -0000
+@@ -608,4 +608,19 @@
+ 
+ <refsect1>
++<title>IDN SUPPORT</title>
++<para>
++If <command>dig</command> has been built with IDN (internationalized
++domain name) support, it can accept and display non-ASCII domain names.
++<command>dig</command> appropriately converts character encoding of
++domain name before sending a request to DNS server or displaying a
++reply from the server.
++If you'd like to turn off the IDN support for some reason, defines
++the <envar>IDN_DISABLE</envar> environment variable.
++The IDN support is disabled if the the variable is set when 
++<command>dig</command> runs.
++</para>
++</refsect1>
++
++<refsect1>
+ <title>FILES</title>
+ <para>
+Index: bin/dig/dighost.c
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/dighost.c,v
+retrieving revision 1.221.2.19.2.31
+diff -U2 -r1.221.2.19.2.31 dighost.c
+--- bin/dig/dighost.c	14 Oct 2005 01:38:40 -0000	1.221.2.19.2.31
++++ bin/dig/dighost.c	26 May 2006 03:51:01 -0000
+@@ -33,4 +33,15 @@
+ #include <limits.h>
+ 
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
++#ifdef WITH_IDN
++#include <idn/result.h>
++#include <idn/log.h>
++#include <idn/resconf.h>
++#include <idn/api.h>
++#endif
++
+ #include <dns/byaddr.h>
+ #ifdef DIG_SIGCHASE
+@@ -120,4 +131,16 @@
+ int lookup_counter = 0;
+ 
++#ifdef WITH_IDN
++static void	      initialize_idn(void);
++static isc_result_t   output_filter(isc_buffer_t *buffer,
++				    unsigned int used_org,
++				    isc_boolean_t absolute);
++static idn_result_t   append_textname(char *name, const char *origin,
++				      size_t namesize);
++static void	      idn_check_result(idn_result_t r, const char *msg);
++
++#define MAXDLEN               256
++#endif
++
+ /*
+  * Exit Codes:
+@@ -986,4 +1009,8 @@
+ 		copy_server_list(lwconf, &server_list);
+ 
++#ifdef WITH_IDN
++	initialize_idn();
++#endif
++
+ 	if (keyfile[0] != 0)
+ 		setup_file_key();
+@@ -1602,4 +1629,12 @@
+ 	dns_compress_t cctx;
+ 	char store[MXNAME];
++#ifdef WITH_IDN
++	idn_result_t mr;
++	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
++#endif
++
++#ifdef WITH_IDN
++	dns_name_settotextfilter(output_filter);
++#endif
+ 
+ 	REQUIRE(lookup != NULL);
+@@ -1630,4 +1665,15 @@
+ 			sizeof(lookup->onamespace));
+ 
++#ifdef WITH_IDN
++	/*
++	 * We cannot convert `textname' and `origin' separately.
++	 * `textname' doesn't contain TLD, but local mapping needs
++	 * TLD.
++	 */
++	mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
++			    utf8_textname, sizeof(utf8_textname));
++	idn_check_result(mr, "convert textname to UTF-8");
++#endif
++
+ 	/*
+ 	 * If the name has too many dots, force the origin to be NULL
+@@ -1638,4 +1684,11 @@
+ 	 */
+ 	/* XXX New search here? */
++#ifdef WITH_IDN
++	if ((count_dots(utf8_textname) >= ndots) || !usesearch)
++		lookup->origin = NULL; /* Force abs lookup */
++	else if (lookup->origin == NULL && lookup->new_search && usesearch) {
++		lookup->origin = ISC_LIST_HEAD(search_list);
++	}
++#else
+ 	if ((count_dots(lookup->textname) >= ndots) || !usesearch)
+ 		lookup->origin = NULL; /* Force abs lookup */
+@@ -1643,5 +1696,27 @@
+ 		lookup->origin = ISC_LIST_HEAD(search_list);
+ 
++#endif
++
++#ifdef WITH_IDN
++	if (lookup->origin != NULL) {
++		mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP,
++				    lookup->origin->origin, utf8_origin,
++				    sizeof(utf8_origin));
++		idn_check_result(mr, "convert origin to UTF-8");
++		mr = append_textname(utf8_textname, utf8_origin,
++				     sizeof(utf8_textname));
++		idn_check_result(mr, "append origin to textname");
++	}
++	mr = idn_encodename(IDN_LOCALMAP | IDN_NAMEPREP | IDN_ASCCHECK |
++			    IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
++			    idn_textname, sizeof(idn_textname));
++	idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
++#endif
++
++#ifdef WITH_IDN
++	if (0) {
++#else
+ 	if (lookup->origin != NULL) {
++#endif
+ 		debug("trying origin %s", lookup->origin->origin);
+ 		result = dns_message_gettempname(lookup->sendmsg,
+@@ -1688,4 +1763,13 @@
+ 			dns_name_clone(dns_rootname, lookup->name);
+ 		else {
++#ifdef WITH_IDN
++			len = strlen(idn_textname);
++			isc_buffer_init(&b, idn_textname, len);
++			isc_buffer_add(&b, len);
++			result = dns_name_fromtext(lookup->name, &b,
++						   dns_rootname,
++						   ISC_FALSE,
++						   &lookup->namebuf);
++#else
+ 			len = strlen(lookup->textname);
+ 			isc_buffer_init(&b, lookup->textname, len);
+@@ -1695,4 +1779,5 @@
+ 						   ISC_FALSE,
+ 						   &lookup->namebuf);
++#endif
+ 		}
+ 		if (result != ISC_R_SUCCESS) {
+@@ -3198,6 +3283,101 @@
+ }
+ 
++#ifdef WITH_IDN
++static void
++initialize_idn(void) {
++	idn_result_t r;
++
++#ifdef HAVE_SETLOCALE
++	/* Set locale */
++	(void)setlocale(LC_ALL, "");
++#endif
++	/* Create configuration context. */
++	r = idn_nameinit(1);
++	if (r != idn_success)
++		fatal("idn api initialization failed: %s",
++		      idn_result_tostring(r));
++
++	/* Set domain name -> text post-conversion filter. */
++	dns_name_settotextfilter(output_filter);
++}
++
++static isc_result_t
++output_filter(isc_buffer_t *buffer, unsigned int used_org,
++	      isc_boolean_t absolute)
++{
++	char tmp1[MAXDLEN], tmp2[MAXDLEN];
++	size_t fromlen, tolen;
++	isc_boolean_t end_with_dot;
++
++	/*
++	 * Copy contents of 'buffer' to 'tmp1', supply trailing dot
++	 * if 'absolute' is true, and terminate with NUL.
++	 */
++	fromlen = isc_buffer_usedlength(buffer) - used_org;
++	if (fromlen >= MAXDLEN)
++		return (ISC_R_SUCCESS);
++	memcpy(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
++	end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
++	if (absolute && !end_with_dot) {
++		fromlen++;
++		if (fromlen >= MAXDLEN)
++			return (ISC_R_SUCCESS);
++		tmp1[fromlen - 1] = '.';
++	}
++	tmp1[fromlen] = '\0';
++
++	/*
++	 * Convert contents of 'tmp1' to local encoding.
++	 */
++	if (idn_decodename(IDN_DECODE_APP, tmp1, tmp2, MAXDLEN) != idn_success)
++		return (ISC_R_SUCCESS);
++	strcpy(tmp1, tmp2);
++
++	/*
++	 * Copy the converted contents in 'tmp1' back to 'buffer'.
++	 * If we have appended trailing dot, remove it.
++	 */
++	tolen = strlen(tmp1);
++	if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
++		tolen--;
++
++	if (isc_buffer_length(buffer) < used_org + tolen)
++		return (ISC_R_NOSPACE);
++
++	isc_buffer_subtract(buffer, isc_buffer_usedlength(buffer) - used_org);
++	memcpy(isc_buffer_used(buffer), tmp1, tolen);
++	isc_buffer_add(buffer, tolen);
++
++	return (ISC_R_SUCCESS);
++}
++
++static idn_result_t
++append_textname(char *name, const char *origin, size_t namesize) {
++	size_t namelen = strlen(name);
++	size_t originlen = strlen(origin);
++
++	/* Already absolute? */
++	if (namelen > 0 && name[namelen - 1] == '.')
++		return idn_success;
++
++	/* Append dot and origin */
++
++	if (namelen + 1 + originlen >= namesize)
++		return idn_buffer_overflow;
++
++	name[namelen++] = '.';
++	(void)strcpy(name + namelen, origin);
++	return idn_success;
++}
+ 
++static void
++idn_check_result(idn_result_t r, const char *msg) {
++	if (r != idn_success) {
++		exitcode = 1;
++		fatal("%s: %s", msg, idn_result_tostring(r));
++	}
++}
+ 
++#endif /* WITH_IDN */
+ 
+ #ifdef DIG_SIGCHASE
+Index: bin/dig/host.1
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/host.1,v
+retrieving revision 1.11.2.1.4.7
+diff -U2 -r1.11.2.1.4.7 host.1
+--- bin/dig/host.1	13 Oct 2005 02:33:43 -0000	1.11.2.1.4.7
++++ bin/dig/host.1	26 May 2006 03:51:02 -0000
+@@ -14,5 +14,5 @@
+ .\" PERFORMANCE OF THIS SOFTWARE.
+ .\"
+-.\" $Id: host.1,v 1.11.2.1.4.7 2005/10/13 02:33:43 marka Exp $
++.\" $Id$
+ .\"
+ .hy 0
+@@ -177,4 +177,15 @@
+ \fBhost\fR
+ will effectively wait forever for a reply. The time to wait for a response will be set to the number of seconds given by the hardware's maximum value for an integer quantity.
++.SH "IDN SUPPORT"
++.PP
++If
++\fBhost\fR
++has been built with IDN (internationalized domain name) support, it can accept and display non\-ASCII domain names.
++\fBhost\fR
++appropriately converts character encoding of domain name before sending a request to DNS server or displaying a reply from the server. If you'd like to turn off the IDN support for some reason, defines the
++\fBIDN_DISABLE\fR
++environment variable. The IDN support is disabled if the the variable is set when
++\fBhost\fR
++runs.
+ .SH "FILES"
+ .PP
+Index: bin/dig/host.docbook
+===================================================================
+RCS file: /proj/cvs/prod/bind9/bin/dig/host.docbook,v
+retrieving revision 1.2.2.2.4.7
+diff -U2 -r1.2.2.2.4.7 host.docbook
+--- bin/dig/host.docbook	13 May 2005 01:22:32 -0000	1.2.2.2.4.7
++++ bin/dig/host.docbook	26 May 2006 03:51:04 -0000
+@@ -208,4 +208,19 @@
+ 
+ <refsect1>
++<title>IDN SUPPORT</title>
++<para>
++If <command>host</command> has been built with IDN (internationalized
++domain name) support, it can accept and display non-ASCII domain names.
++<command>host</command> appropriately converts character encoding of
++domain name before sending a request to DNS server or displaying a
++reply from the server.
++If you'd like to turn off the IDN support for some reason, defines
++the <envar>IDN_DISABLE</envar> environment variable.
++The IDN support is disabled if the the variable is set when
++<command>host</command> runs.
++</para>
++</refsect1>
++
++<refsect1>
+ <title>FILES</title>
+ <para>
+Index: lib/dns/name.c
+===================================================================
+RCS file: /proj/cvs/prod/bind9/lib/dns/name.c,v
+retrieving revision 1.127.2.7.2.16
+diff -U2 -r1.127.2.7.2.16 name.c
+--- lib/dns/name.c	2 Mar 2006 00:37:20 -0000	1.127.2.7.2.16
++++ lib/dns/name.c	26 May 2006 03:51:07 -0000
+@@ -183,4 +183,11 @@
+ dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive);
+ 
++#ifdef WITH_IDN
++/*
++ * dns_name_t to text post-conversion procedure.
++ */
++static dns_name_totextfilter_t totext_filter_proc = NULL;
++#endif
++
+ static void
+ set_offsets(const dns_name_t *name, unsigned char *offsets,
+@@ -1201,4 +1208,7 @@
+ 	unsigned int labels;
+ 	isc_boolean_t saw_root = ISC_FALSE;
++#ifdef WITH_IDN
++	unsigned int oused = target->used;
++#endif
+ 
+ 	/*
+@@ -1340,4 +1350,9 @@
+ 	isc_buffer_add(target, tlen - trem);
+ 
++#ifdef WITH_IDN
++	if (totext_filter_proc != NULL)
++		return ((*totext_filter_proc)(target, oused, saw_root));
++#endif
++
+ 	return (ISC_R_SUCCESS);
+ }
+@@ -2199,2 +2214,8 @@
+ }
+ 
++#ifdef WITH_IDN
++void
++dns_name_settotextfilter(dns_name_totextfilter_t proc) {
++	totext_filter_proc = proc;
++}
++#endif
+Index: lib/dns/include/dns/name.h
+===================================================================
+RCS file: /proj/cvs/prod/bind9/lib/dns/include/dns/name.h,v
+retrieving revision 1.95.2.3.2.14
+diff -U2 -r1.95.2.3.2.14 name.h
+--- lib/dns/include/dns/name.h	2 Mar 2006 00:37:20 -0000	1.95.2.3.2.14
++++ lib/dns/include/dns/name.h	26 May 2006 03:51:07 -0000
+@@ -156,4 +156,15 @@
+ #define DNS_NAME_MAXWIRE 255
+ 
++#ifdef WITH_IDN
++/*
++ * Text output filter procedure.
++ * 'target' is the buffer to be converted.  The region to be converted
++ * is from 'buffer'->base + 'used_org' to the end of the used region.
++ */
++typedef isc_result_t (*dns_name_totextfilter_t)(isc_buffer_t *target,
++						unsigned int used_org,
++						isc_boolean_t absolute);
++#endif
++
+ /***
+  *** Initialization
+@@ -1117,4 +1128,12 @@
+  */
+ 
++#ifdef WITH_IDN
++void
++dns_name_settotextfilter(dns_name_totextfilter_t proc);
++/*
++ * Call 'proc' at the end of dns_name_totext.
++ */
++#endif /* WITH_IDN */
++
+ #define DNS_NAME_FORMATSIZE (DNS_NAME_MAXTEXT + 1)
+ /*
diff --git a/contrib/queryperf/queryperf.c b/contrib/queryperf/queryperf.c
index 4656c0a3..057e783f 100644
--- a/contrib/queryperf/queryperf.c
+++ b/contrib/queryperf/queryperf.c
@@ -18,7 +18,7 @@
 /***
  ***	DNS Query Performance Testing Tool  (queryperf.c)
  ***
- ***	Version $Id: queryperf.c,v 1.1.1.2.2.5.4.3 2004/06/21 00:45:30 marka Exp $
+ ***	Version $Id: queryperf.c,v 1.1.1.2.2.5.4.4 2006/01/05 02:06:09 marka Exp $
  ***
  ***	Stephen Jacob <sj@nominum.com>
  ***/
@@ -53,6 +53,9 @@
 #define DEF_SERVER_PORT			"53"
 #define DEF_BUFFER_SIZE			32		/* in k */
 
+#define DEF_RTTARRAY_SIZE		50000
+#define DEF_RTTARRAY_UNIT		100		/* in usec */
+
 /*
  * Other constants / definitions
  */
@@ -131,6 +134,9 @@ struct addrinfo *server_ai;				/* init NULL */
 int run_only_once = FALSE;
 int use_timelimit = FALSE;
 unsigned int run_timelimit;				/* init 0 */
+unsigned int print_interval;				/* init 0 */
+
+unsigned int target_qps;				/* init 0 */
 
 int serverset = FALSE, portset = FALSE;
 int queriesset = FALSE, timeoutset = FALSE;
@@ -150,12 +156,37 @@ FILE *datafile_ptr;					/* init NULL */
 unsigned int runs_through_file;				/* init 0 */
 
 unsigned int num_queries_sent;				/* init 0 */
+unsigned int num_queries_sent_interval;
 unsigned int num_queries_outstanding;			/* init 0 */
 unsigned int num_queries_timed_out;			/* init 0 */
+unsigned int num_queries_possiblydelayed;		/* init 0 */
+unsigned int num_queries_timed_out_interval;
+unsigned int num_queries_possiblydelayed_interval;
 
 struct timeval time_of_program_start;
 struct timeval time_of_first_query;
+double time_of_first_query_sec;
+struct timeval time_of_first_query_interval;
 struct timeval time_of_end_of_run;
+struct timeval time_of_stop_sending;
+
+struct timeval time_of_queryset_start;
+double query_interval;
+struct timeval time_of_next_queryset;
+
+double rtt_max = -1;
+double rtt_max_interval = -1;
+double rtt_min = -1;
+double rtt_min_interval = -1;
+double rtt_total;
+double rtt_total_interval;
+int rttarray_size = DEF_RTTARRAY_SIZE;
+int rttarray_unit = DEF_RTTARRAY_UNIT;
+unsigned int *rttarray = NULL;
+unsigned int *rttarray_interval = NULL;
+unsigned int rtt_overflows;
+unsigned int rtt_overflows_interval;
+char *rtt_histogram_file = NULL;
 
 struct query_status *status;				/* init NULL */
 unsigned int query_status_allocated;			/* init 0 */
@@ -186,7 +217,7 @@ void
 show_startup_info(void) {
 	printf("\n"
 "DNS Query Performance Testing Tool\n"
-"Version: $Id: queryperf.c,v 1.1.1.2.2.5.4.3 2004/06/21 00:45:30 marka Exp $\n"
+"Version: $Id: queryperf.c,v 1.1.1.2.2.5.4.4 2006/01/05 02:06:09 marka Exp $\n"
 "\n");
 }
 
@@ -200,7 +231,8 @@ show_usage(void) {
 "\n"
 "Usage: queryperf [-d datafile] [-s server_addr] [-p port] [-q num_queries]\n"
 "                 [-b bufsize] [-t timeout] [-n] [-l limit] [-f family] [-1]\n"
-"                 [-e] [-D] [-c] [-v] [-h]\n"
+"                 [-i interval] [-r arraysize] [-u unit] [-H histfile]\n"
+"                 [-T qps] [-e] [-D] [-c] [-v] [-h]\n"
 "  -d specifies the input data file (default: stdin)\n"
 "  -s sets the server to query (default: %s)\n"
 "  -p sets the port on which to query the server (default: %s)\n"
@@ -210,7 +242,12 @@ show_usage(void) {
 "  -l specifies how a limit for how long to run tests in seconds (no default)\n"
 "  -1 run through input only once (default: multiple iff limit given)\n"
 "  -b set input/output buffer size in kilobytes (default: %d k)\n"
+"  -i specifies interval of intermediate outputs in seconds (default: 0=none)\n"
 "  -f specify address family of DNS transport, inet or inet6 (default: any)\n"
+"  -r set RTT statistics array size (default: %d)\n"
+"  -u set RTT statistics time unit in usec (default: %d)\n"
+"  -H specifies RTT histogram data file (default: none)\n"
+"  -T specify the target qps (default: 0=unspecified)\n"
 "  -e enable EDNS 0\n"
 "  -D set the DNSSEC OK bit (implies EDNS)\n"
 "  -c print the number of packets with each rcode\n"
@@ -219,7 +256,7 @@ show_usage(void) {
 "\n",
 	        DEF_SERVER_TO_QUERY, DEF_SERVER_PORT,
 	        DEF_MAX_QUERIES_OUTSTANDING, DEF_QUERY_TIMEOUT,
-		DEF_BUFFER_SIZE);
+		DEF_BUFFER_SIZE, DEF_RTTARRAY_SIZE, DEF_RTTARRAY_UNIT);
 }
 
 /*
@@ -473,7 +510,8 @@ parse_args(int argc, char **argv) {
 	int c;
 	unsigned int uint_arg_val;
 
-	while ((c = getopt(argc, argv, "f:q:t:nd:s:p:1l:b:eDcvh")) != -1) {
+	while ((c = getopt(argc, argv,
+			   "f:q:t:i:nd:s:p:1l:b:eDcvr:T::u:H:h")) != -1) {
 		switch (c) {
 		case 'f':
 			if (strcmp(optarg, "inet") == 0)
@@ -534,7 +572,7 @@ parse_args(int argc, char **argv) {
 			}
 			serverset = TRUE;
 			break;
-			
+
 		case 'p':
 			if (is_uint(optarg, &uint_arg_val) == TRUE &&
 			    uint_arg_val < MAX_PORT)
@@ -588,6 +626,45 @@ parse_args(int argc, char **argv) {
 		case 'v':
 			verbose = 1;
 			break;
+		case 'i':
+			if (is_uint(optarg, &uint_arg_val) == TRUE)
+				print_interval = uint_arg_val;
+			else {
+				fprintf(stderr, "Invalid interval: %s\n",
+					optarg);
+				return (-1);
+			}
+			break;
+		case 'r':
+			if (is_uint(optarg, &uint_arg_val) == TRUE)
+				rttarray_size = uint_arg_val;
+			else {
+				fprintf(stderr, "Invalid RTT array size: %s\n",
+					optarg);
+				return (-1);
+			}
+			break;
+		case 'u':
+			if (is_uint(optarg, &uint_arg_val) == TRUE)
+				rttarray_unit = uint_arg_val;
+			else {
+				fprintf(stderr, "Invalid RTT unit: %s\n",
+					optarg);
+				return (-1);
+			}
+			break;
+		case 'H':
+			rtt_histogram_file = optarg;
+			break;
+		case 'T':
+			if (is_uint(optarg, &uint_arg_val) == TRUE)
+				target_qps = uint_arg_val;
+			else {
+				fprintf(stderr, "Invalid target qps: %s\n",
+					optarg);
+				return (-1);
+			}
+			break;
 		case 'h':
 			return (-1);
 		default:
@@ -781,6 +858,65 @@ change_socket(void) {
 }
 
 /*
+ * reset_rttarray:
+ *   (re)allocate RTT array and zero-clear the whole buffer.
+ *   if array is being used, it is freed.
+ *   Returns -1 on failure
+ *   Returns a non-negative integer otherwise
+ */
+int
+reset_rttarray(int size) {
+	if (rttarray != NULL)
+		free(rttarray);
+	if (rttarray_interval != NULL)
+		free(rttarray_interval);
+
+	rttarray = NULL;
+	rttarray_interval = NULL;
+	rtt_max = -1;
+	rtt_min = -1;
+
+	if (size > 0) {
+		rttarray = malloc(size * sizeof(rttarray[0]));
+		if (rttarray == NULL) {
+			fprintf(stderr,
+				"Error: allocating memory for RTT array\n");
+			return (-1);
+		}
+		memset(rttarray, 0, size * sizeof(rttarray[0]));
+
+		rttarray_interval = malloc(size *
+					   sizeof(rttarray_interval[0]));
+		if (rttarray_interval == NULL) {
+			fprintf(stderr,
+				"Error: allocating memory for RTT array\n");
+			return (-1);
+		}
+
+		memset(rttarray_interval, 0,
+		       size * sizeof(rttarray_interval[0]));
+	}
+
+	return (0);
+}
+
+/*
+ * set_query_interval:
+ *   set the interval of consecutive queries if the target qps are specified.
+ *   Returns -1 on failure
+ *   Returns a non-negative integer otherwise
+ */
+int
+set_query_interval(unsigned int qps) {
+	if (qps == 0)
+		return (0);
+
+	query_interval = (1.0 / (double)qps);
+
+	return (0);
+}
+
+/*
  * setup:
  *   Set configuration options from command line arguments
  *   Open datafile ready for reading
@@ -824,6 +960,12 @@ setup(int argc, char **argv) {
 	if ((query_socket = change_socket()) == -1)
 		return (-1);
 
+	if (reset_rttarray(rttarray_size) == -1)
+		return (-1);
+
+	if (set_query_interval(target_qps) == -1)
+		return (-1);
+
 	return (0);
 }
 
@@ -842,6 +984,20 @@ set_timenow(struct timeval *tv) {
 }
 
 /*
+ * addtv:
+ *   add tv1 and tv2, store the result in tv_result.
+ */
+void
+addtv(struct timeval *tv1, struct timeval *tv2, struct timeval *tv_result) {
+	tv_result->tv_sec = tv1->tv_sec + tv2->tv_sec;
+	tv_result->tv_usec = tv1->tv_usec + tv2->tv_usec;
+	if (tv_result->tv_usec > 1000000) {
+		tv_result->tv_sec++;
+		tv_result->tv_usec -= 1000000;
+	}
+}
+
+/*
  * difftv:
  *   Find the difference in seconds between two timeval structs.
  *
@@ -921,6 +1077,7 @@ keep_sending(int *reached_end_input) {
 	} else {
 		if (*reached_end_input == TRUE)
 			runs_through_file++;
+		set_timenow(&time_of_stop_sending);
 		stop = TRUE;
 		return (FALSE);
 	}
@@ -1299,6 +1456,8 @@ send_query(char *query_desc) {
 
 	if (setup_phase == TRUE) {
 		set_timenow(&time_of_first_query);
+		time_of_first_query_sec = (double)time_of_first_query.tv_sec +
+			((double)time_of_first_query.tv_usec / 1000000.0);
 		setup_phase = FALSE;
 		if (getnameinfo(server_ai->ai_addr, server_ai->ai_addrlen,
 				serveraddr, sizeof(serveraddr), NULL, 0,
@@ -1311,12 +1470,12 @@ send_query(char *query_desc) {
 	}
 
 	/* Find the first slot in status[] that is not in use */
-	for(count = 0; (status[count].in_use == TRUE)
-	    && (count < max_queries_outstanding); count++);
+	for (count = 0; (status[count].in_use == TRUE)
+	     && (count < max_queries_outstanding); count++);
 
 	if (status[count].in_use == TRUE) {
 		fprintf(stderr, "Unexpected error: We have run out of "
-		        "status[] space!\n");
+			"status[] space!\n");
 		return;
 	}
 
@@ -1327,10 +1486,62 @@ send_query(char *query_desc) {
 		status[count].desc = strdup(query_desc);
 	set_timenow(&status[count].sent_timestamp);
 
+	if (num_queries_sent_interval == 0)
+		set_timenow(&time_of_first_query_interval);
+
 	num_queries_sent++;
+	num_queries_sent_interval++;
 	num_queries_outstanding++;
 }
 
+void
+register_rtt(struct timeval *timestamp) {
+	int i;
+	int oldquery = FALSE;
+	struct timeval now;
+	double rtt;
+
+	set_timenow(&now);
+	rtt = difftv(now, *timestamp);
+
+	if (difftv(*timestamp, time_of_first_query_interval) < 0)
+		oldquery = TRUE;
+
+	if (rtt_max < 0 || rtt_max < rtt)
+		rtt_max = rtt;
+
+	if (rtt_min < 0 || rtt_min > rtt)
+		rtt_min = rtt;
+
+	rtt_total += rtt;
+
+	if (!oldquery) {
+		if (rtt_max_interval < 0 || rtt_max_interval < rtt)
+			rtt_max_interval = rtt;
+
+		if (rtt_min_interval < 0 || rtt_min_interval > rtt)
+			rtt_min_interval = rtt;
+
+		rtt_total_interval += rtt;
+	}
+
+	if (rttarray == NULL)
+		return;
+
+	i = (int)(rtt * (1000000.0 / rttarray_unit));
+	if (i < rttarray_size) {
+		rttarray[i]++;
+		if (!oldquery)
+			rttarray_interval[i]++;
+	} else {
+		fprintf(stderr, "Warning: RTT is out of range: %.6lf\n",
+			rtt);
+		rtt_overflows++;
+		if (!oldquery)
+			rtt_overflows_interval++;
+	}
+}
+
 /*
  * register_response:
  *   Register receipt of a query
@@ -1342,12 +1553,17 @@ void
 register_response(unsigned short int id, unsigned int rcode) {
 	unsigned int ct = 0;
 	int found = FALSE;
+	struct timeval now;
+	double rtt;
 
-	for(; (ct < query_status_allocated) && (found == FALSE); ct++) {
+	for (; (ct < query_status_allocated) && (found == FALSE); ct++) {
 		if ((status[ct].in_use == TRUE) && (status[ct].id == id)) {
 			status[ct].in_use = FALSE;
 			num_queries_outstanding--;
 			found = TRUE;
+
+			register_rtt(&status[ct].sent_timestamp);
+
 			if (status[ct].desc) {
 				printf("> %s %s\n", rcode_strings[rcode],
 				       status[ct].desc);
@@ -1358,9 +1574,15 @@ register_response(unsigned short int id, unsigned int rcode) {
 		}
 	}
 
-	if (found == FALSE)
-		fprintf(stderr, "Warning: Received a response with an "
-		        "unexpected (maybe timed out) id: %u\n", id);
+	if (found == FALSE) {
+		if (target_qps > 0) {
+			num_queries_possiblydelayed++;
+			num_queries_possiblydelayed_interval++;
+		} else {
+			fprintf(stderr, "Warning: Received a response with an "
+				"unexpected (maybe timed out) id: %u\n", id);
+		}
+	}
 }
 
 /*
@@ -1449,21 +1671,57 @@ data_available(double wait) {
  *   decrementing the number of outstanding queries.
  */
 void
-process_responses(void) {
+process_responses(int adjust_rate) {
+	double wait;
+	struct timeval now, waituntil;
 	double first_packet_wait = RESPONSE_BLOCKING_WAIT_TIME;
 	unsigned int outstanding = queries_outstanding();
 
-	/*
-	 * Don't block waiting for packets at all if we aren't looking for
-	 * any responses or if we are now able to send new queries.
-	 */
-	if ((outstanding == 0) || (outstanding < max_queries_outstanding)) {
-		first_packet_wait = 0.0;
-	}
+	if (adjust_rate == TRUE) {
+		double u;
+
+		u = time_of_first_query_sec +
+			query_interval * num_queries_sent;
+		waituntil.tv_sec = (long)floor(u);
+		waituntil.tv_usec = (long)(1000000.0 * (u - waituntil.tv_sec));
+
+		/*
+		 * Wait until a response arrives or the specified limit is
+		 * reached.
+		 */
+		while (1) {
+			set_timenow(&now);
+			wait = difftv(waituntil, now);
+			if (wait <= 0)
+				wait = 0.0;
+			if (data_available(wait) != TRUE)
+				break;
 
-	if (data_available(first_packet_wait) == TRUE) {
-		while (data_available(0.0) == TRUE)
-			;
+			/*
+			 * We have reached the limit.  Read as many responses
+			 * as possible without waiting, and exit.
+			 */
+			if (wait == 0) {
+				while (data_available(0.0) == TRUE)
+					;
+				break;
+			}
+		}
+	} else {
+		/*
+		 * Don't block waiting for packets at all if we aren't
+		 * looking for any responses or if we are now able to send new
+		 * queries.
+		 */
+		if ((outstanding == 0) ||
+		    (outstanding < max_queries_outstanding)) {
+			first_packet_wait = 0.0;
+		}
+
+		if (data_available(first_packet_wait) == TRUE) {
+			while (data_available(0.0) == TRUE)
+				;
+		}
 	}
 }
 
@@ -1474,90 +1732,207 @@ process_responses(void) {
  *   the number of queries outstanding for each one removed.
  */
 void
-retire_old_queries(void) {
+retire_old_queries(int sending) {
 	unsigned int count = 0;
 	struct timeval curr_time;
+	double timeout = query_timeout;
+	int timeout_reduced = FALSE;
+
+	/*
+	 * If we have target qps and would not be able to send any packets
+	 * due to buffer full, check whether we are behind the schedule.
+	 * If we are, purge some queries more aggressively.
+	 */
+	if (target_qps > 0 && sending == TRUE && count == 0 &&
+	    queries_outstanding() == max_queries_outstanding) {
+		struct timeval next, now;
+		double n;
+
+		n = time_of_first_query_sec +
+			query_interval * num_queries_sent;
+		next.tv_sec = (long)floor(n);
+		next.tv_usec = (long)(1000000.0 * (n - next.tv_sec));
+
+		set_timenow(&now);
+		if (difftv(next, now) <= 0) {
+			timeout_reduced = TRUE;
+			timeout = 0.001; /* XXX: ad-hoc value */
+		}
+	}
 
 	set_timenow(&curr_time);
 
-	for(; count < query_status_allocated; count++) {
+	for (; count < query_status_allocated; count++) {
 
 		if ((status[count].in_use == TRUE)
 		    && (difftv(curr_time, status[count].sent_timestamp)
-		    >= (double)query_timeout)) {
+		    >= (double)timeout)) {
 
 			status[count].in_use = FALSE;
 			num_queries_outstanding--;
 			num_queries_timed_out++;
-
-			if (status[count].desc) {
-				printf("> T %s\n", status[count].desc);
-				free(status[count].desc);
-			} else {
-				printf("[Timeout] Query timed out: msg id %u\n",
-				       status[count].id);
+			num_queries_timed_out_interval++;
+
+			if (timeout_reduced == FALSE) {
+				if (status[count].desc) {
+					printf("> T %s\n", status[count].desc);
+					free(status[count].desc);
+				} else {
+					printf("[Timeout] Query timed out: "
+					       "msg id %u\n",
+					       status[count].id);
+				}
 			}
 		}
 	}
 }
 
 /*
+ * print_histogram
+ *   Print RTT histogram to the specified file in the gnuplot format
+ */
+void
+print_histogram(unsigned int total) {
+	int i;
+	double ratio;
+	FILE *fp;
+
+	if (rtt_histogram_file == NULL || rttarray == NULL)
+		return;
+
+	fp = fopen((const char *)rtt_histogram_file, "w+");
+	if (fp == NULL) {
+		fprintf(stderr, "Error opening RTT histogram file: %s\n",
+			rtt_histogram_file);
+		return;
+	}
+
+	for (i = 0; i < rttarray_size; i++) {
+		ratio = ((double)rttarray[i] / (double)total) * 100;
+		fprintf(fp, "%.6lf %.3lf\n",
+			(double)(i * rttarray_unit) +
+			(double)rttarray_unit / 2,
+			ratio);
+	}
+
+	(void)fclose(fp);
+}
+
+/*
  * print_statistics:
  *   Print out statistics based on the results of the test
  */
 void
-print_statistics(void) {
+print_statistics(int intermediate, unsigned int sent, unsigned int timed_out,
+		 unsigned int possibly_delayed,
+		 struct timeval *first_query,
+		 struct timeval *program_start,
+		 struct timeval *end_perf, struct timeval *end_query,
+		 double rmax, double rmin, double rtotal,
+		 unsigned int roverflows, unsigned int *rarray)
+{
 	unsigned int num_queries_completed;
-	double per_lost, per_completed;
-	double run_time, queries_per_sec;
+	double per_lost, per_completed, per_lost2, per_completed2; 
+	double run_time, queries_per_sec, queries_per_sec2;
+	double queries_per_sec_total;
+	double rtt_average, rtt_stddev;
 	struct timeval start_time;
 
-	num_queries_completed = num_queries_sent - num_queries_timed_out;
+	num_queries_completed = sent - timed_out;
 
 	if (num_queries_completed == 0) {
 		per_lost = 0.0;
 		per_completed = 0.0;
+
+		per_lost2 = 0.0;
+		per_completed2 = 0.0;
 	} else {
-		per_lost = 100.0 * (double)num_queries_timed_out
-		           / (double)num_queries_sent;
+		per_lost = (100.0 * (double)timed_out) / (double)sent;
 		per_completed = 100.0 - per_lost;
+
+		per_lost2 = (100.0 * (double)(timed_out - possibly_delayed))
+			/ (double)sent;
+		per_completed2 = 100 - per_lost2;
 	}
 
-	if (num_queries_sent == 0) {
-		start_time.tv_sec = time_of_program_start.tv_sec;
-		start_time.tv_usec = time_of_program_start.tv_usec;
+	if (sent == 0) {
+		start_time.tv_sec = program_start->tv_sec;
+		start_time.tv_usec = program_start->tv_usec;
 		run_time = 0.0;
 		queries_per_sec = 0.0;
+		queries_per_sec2 = 0.0;
+		queries_per_sec_total = 0.0;
 	} else {
-		start_time.tv_sec = time_of_first_query.tv_sec;
-		start_time.tv_usec = time_of_first_query.tv_usec;
-		run_time = difftv(time_of_end_of_run, time_of_first_query);
+		start_time.tv_sec = first_query->tv_sec;
+		start_time.tv_usec = first_query->tv_usec;
+		run_time = difftv(*end_perf, *first_query);
 		queries_per_sec = (double)num_queries_completed / run_time;
+		queries_per_sec2 = (double)(num_queries_completed +
+					    possibly_delayed) / run_time;
+
+		queries_per_sec_total = (double)sent /
+			difftv(*end_query, *first_query);
 	}
 
-	printf("\n");
+	if (num_queries_completed > 0) {
+		int i;
+		double sum = 0;
 
-	printf("Statistics:\n");
+		rtt_average = rtt_total / (double)num_queries_completed;
+		for (i = 0; i < rttarray_size; i++) {
+			if (rarray[i] != 0) {
+				double mean, diff;
+
+				mean = (double)(i * rttarray_unit) +
+				(double)rttarray_unit / 2;
+				diff = rtt_average - (mean / 1000000.0);
+				sum += (diff * diff) * rarray[i];
+			}
+		}
+		rtt_stddev = sqrt(sum / (double)num_queries_completed);
+	} else {
+		rtt_average = 0.0;
+		rtt_stddev = 0.0;
+	}
 
 	printf("\n");
 
-	printf("  Parse input file:     %s\n",
-	       ((run_only_once == TRUE) ? "once" : "multiple times"));
-	if (use_timelimit)
-		printf("  Run time limit:       %u seconds\n", run_timelimit);
-	if (run_only_once == FALSE)
-		printf("  Ran through file:     %u times\n",
-		       runs_through_file);
-	else
-		printf("  Ended due to:         reaching %s\n",
-		       ((runs_through_file == 0) ? "time limit"
-		       : "end of file"));
+	printf("%sStatistics:\n", intermediate ? "Intermediate " : "");
 
 	printf("\n");
 
-	printf("  Queries sent:         %u queries\n", num_queries_sent);
+	if (!intermediate) {
+		printf("  Parse input file:     %s\n",
+		       ((run_only_once == TRUE) ? "once" : "multiple times"));
+		if (use_timelimit)
+			printf("  Run time limit:       %u seconds\n",
+			       run_timelimit);
+		if (run_only_once == FALSE)
+			printf("  Ran through file:     %u times\n",
+			       runs_through_file);
+		else
+			printf("  Ended due to:         reaching %s\n",
+			       ((runs_through_file == 0) ? "time limit"
+				: "end of file"));
+
+		printf("\n");
+	}
+
+	printf("  Queries sent:         %u queries\n", sent);
 	printf("  Queries completed:    %u queries\n", num_queries_completed);
-	printf("  Queries lost:         %u queries\n", num_queries_timed_out);
+	printf("  Queries lost:         %u queries\n", timed_out);
+	printf("  Queries delayed(?):   %u queries\n", possibly_delayed);
+
+	printf("\n");
+
+	printf("  RTT max:         	%3.6lf sec\n", rmax);
+	printf("  RTT min:              %3.6lf sec\n", rmin);
+	printf("  RTT average:          %3.6lf sec\n", rtt_average);
+	printf("  RTT std deviation:    %3.6lf sec\n", rtt_stddev);
+	printf("  RTT out of range:     %u queries\n", roverflows);
+
+	if (!intermediate)	/* XXX should we print this case also? */
+		print_histogram(num_queries_completed);
 
 	printf("\n");
 
@@ -1574,28 +1949,88 @@ print_statistics(void) {
 	}
 
 	printf("  Percentage completed: %6.2lf%%\n", per_completed);
+	if (possibly_delayed > 0)
+		printf("     (w/ delayed qrys): %6.2lf%%\n", per_completed2);
 	printf("  Percentage lost:      %6.2lf%%\n", per_lost);
+	if (possibly_delayed > 0)
+		printf("    (w/o delayed qrys): %6.2lf%%\n", per_lost2);
 
 	printf("\n");
 
 	printf("  Started at:           %s",
 	       ctime((const time_t *)&start_time.tv_sec));
 	printf("  Finished at:          %s",
-	       ctime((const time_t *)&time_of_end_of_run.tv_sec));
+	       ctime((const time_t *)&end_perf->tv_sec));
 	printf("  Ran for:              %.6lf seconds\n", run_time);
 
 	printf("\n");
 
 	printf("  Queries per second:   %.6lf qps\n", queries_per_sec);
+	if (possibly_delayed > 0) {
+		printf("   (w/ delayed qrys):   %.6lf qps\n",
+		       queries_per_sec2);
+	}
+	if (target_qps > 0) {
+		printf("  Total QPS/target:     %.6lf/%d qps\n",
+		       queries_per_sec_total, target_qps);		
+	}
 
 	printf("\n");
 }
 
+void
+print_interval_statistics() {
+	struct timeval time_now;
+
+	if (use_timelimit == FALSE)
+		return;
+
+	if (setup_phase == TRUE)
+		return;
+
+	if (print_interval == 0)
+		return;
+
+	if (timelimit_reached() == TRUE)
+		return;
+
+	set_timenow(&time_now);
+	if (difftv(time_now, time_of_first_query_interval)
+	    <= (double)print_interval)
+		return;
+
+	/* Don't count currently outstanding queries */
+	num_queries_sent_interval -= queries_outstanding();
+	print_statistics(TRUE, num_queries_sent_interval,
+			 num_queries_timed_out_interval,
+			 num_queries_possiblydelayed_interval,
+			 &time_of_first_query_interval,
+			 &time_of_first_query_interval, &time_now, &time_now,
+			 rtt_max_interval, rtt_min_interval,
+			 rtt_total_interval, rtt_overflows_interval,
+			 rttarray_interval);
+
+	/* Reset intermediate counters */
+	num_queries_sent_interval = 0;
+	num_queries_timed_out_interval = 0;
+	num_queries_possiblydelayed_interval = 0;
+	rtt_max_interval = -1;
+	rtt_min_interval = -1;
+	rtt_total_interval = 0.0;
+	rtt_overflows_interval = 0;
+	if (rttarray_interval != NULL) {
+		memset(rttarray_interval, 0,
+		       sizeof(rttarray_interval[0]) * rttarray_size);
+	}
+}
+
 /*
- * dnsqtest Program Mainline
+ * queryperf Program Mainline
  */
 int
 main(int argc, char **argv) {
+	int adjust_rate;
+	int sending = FALSE;
 	int got_eof = FALSE;
 	int input_length = MAX_INPUT_LEN;
 	char input_line[MAX_INPUT_LEN + 1];
@@ -1603,6 +2038,8 @@ main(int argc, char **argv) {
 	set_timenow(&time_of_program_start);
 	time_of_first_query.tv_sec = 0;
 	time_of_first_query.tv_usec = 0;
+	time_of_first_query_interval.tv_sec = 0;
+	time_of_first_query_interval.tv_usec = 0;
 	time_of_end_of_run.tv_sec = 0;
 	time_of_end_of_run.tv_usec = 0;
 
@@ -1615,9 +2052,13 @@ main(int argc, char **argv) {
 
 	printf("[Status] Processing input data\n");
 
-	while (keep_sending(&got_eof) == TRUE || queries_outstanding() > 0) {
-		while (keep_sending(&got_eof) == TRUE
-		       && queries_outstanding() < max_queries_outstanding) {
+	while ((sending = keep_sending(&got_eof)) == TRUE ||
+	       queries_outstanding() > 0) {
+		print_interval_statistics();
+		adjust_rate = FALSE;
+
+		while ((sending = keep_sending(&got_eof)) == TRUE &&
+		       queries_outstanding() < max_queries_outstanding) {
 			int len = next_input_line(input_line, input_length);
 			if (len == 0) {
 				got_eof = TRUE;
@@ -1639,12 +2080,17 @@ main(int argc, char **argv) {
 					update_config(input_line);
 				else {
 					send_query(input_line);
+					if (target_qps > 0 &&
+					    (num_queries_sent %
+					     max_queries_outstanding) == 0) {
+						adjust_rate = TRUE;
+					}
 				}
 			}
 		}
 
-		retire_old_queries();
-		process_responses();
+		process_responses(adjust_rate);
+		retire_old_queries(sending);
 	}
 
 	set_timenow(&time_of_end_of_run);
@@ -1654,7 +2100,11 @@ main(int argc, char **argv) {
 	close_socket();
 	close_datafile();
 
-	print_statistics();
+	print_statistics(FALSE, num_queries_sent, num_queries_timed_out,
+			 num_queries_possiblydelayed,
+			 &time_of_first_query, &time_of_program_start,
+			 &time_of_end_of_run, &time_of_stop_sending,
+			 rtt_max, rtt_min, rtt_total, rtt_overflows, rttarray);
 
 	return (0);
 }
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 28ccb360..f37bd0ed 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.59 2005/10/10 00:22:24 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.27.2.69 2006/05/17 02:18:05 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -27,6 +27,7 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -729,7 +730,7 @@ of a server.</para>
                 <arg choice="plain"><replaceable>command</replaceable></arg>
                 <arg rep="repeat"><replaceable>command</replaceable></arg>
               </cmdsynopsis>
-              <para><command>command</command> is one of the following:</para>
+              <para>The <command>command</command> is one of the following:</para>
 
 <variablelist>
 
@@ -776,11 +777,6 @@ of a server.</para>
     will no longer be refused.</para></listitem>
    </varlistentry>
 
-   <varlistentry><term><userinput>notify <replaceable>zone</replaceable>
-       <optional><replaceable>class</replaceable>
-           <optional><replaceable>view</replaceable></optional></optional></userinput></term>
-   <listitem><para>Resend NOTIFY messages for the zone</para></listitem></varlistentry>
-
    <varlistentry><term><userinput>reconfig</userinput></term>
    <listitem><para>Reload the configuration file and load new zones,
    but do not reload existing zone files even if they have changed.
@@ -809,13 +805,16 @@ of a server.</para>
    <varlistentry><term><userinput>stop <optional>-p</optional></userinput></term>
    <listitem><para>Stop the server, making sure any recent changes
    made through dynamic update or IXFR are first saved to the master files
-   of the updated zones.  If -p is specified named's process id is returned.</para></listitem></varlistentry>
+   of the updated zones.  If -p is specified named's process id is returned.
+   This allows an external process to determine when named had completed stopping.</para></listitem></varlistentry>
 
    <varlistentry><term><userinput>halt <optional>-p</optional></userinput></term>
    <listitem><para>Stop the server immediately.  Recent changes
    made through dynamic update or IXFR are not saved to the master files,
    but will be rolled forward from the journal files when the server
-   is restarted.  If -p is specified named's process id is returned.</para></listitem></varlistentry>
+   is restarted.  If -p is specified named's process id is returned.
+   This allows an external process to determine when named had completed
+   stopping.</para></listitem></varlistentry>
 
    <varlistentry><term><userinput>trace</userinput></term>
    <listitem><para>Increment the servers debugging level by one. </para></listitem></varlistentry>
@@ -1196,7 +1195,7 @@ internal clients will now be able to:</para>
     <para>Here is an example configuration for the setup we just
     described above. Note that this is only configuration information;
     for information on how to configure your zone files, see <xref
-    linkend="sample_configuration"/></para>
+    linkend="sample_configuration"/>.</para>
 
 <para>Internal DNS server config:</para>
 <programlisting>
@@ -1402,11 +1401,12 @@ allow-update { key host1-host2. ;};
       <title>Errors</title>
 
       <para>The processing of TSIG signed messages can result in
-      several errors. If a signed message is sent to a non-TSIG aware
-      server, a FORMERR will be returned, since the server will not
-      understand the record. This is a result of misconfiguration,
-      since the server must be explicitly configured to send a TSIG
-      signed message to a specific server.</para>
+      several errors. If a signed message is sent to a non-TSIG
+      aware server, a FORMERR (format error) will be returned, since
+      the server will not understand the record. This is a result
+      of misconfiguration, since the server must be explicitly
+      configured to send a TSIG signed message to a specific
+      server.</para>
 
       <para>If a TSIG aware server receives a message signed by an
       unknown key, the response will be unsigned with the TSIG
@@ -1418,7 +1418,7 @@ allow-update { key host1-host2. ;};
       the TSIG extended error code set to BADTIME, and the time values
       will be adjusted so that the response can be successfully
       verified. In any of these cases, the message's rcode is set to
-      NOTAUTH.</para>
+      NOTAUTH (not authenticated).</para>
 
     </sect2>
   </sect1>
@@ -1475,9 +1475,10 @@ allow-update { key host1-host2. ;};
     <title>DNSSEC</title>
 
     <para>Cryptographic authentication of DNS information is possible
-    through the DNS Security (<emphasis>DNSSEC-bis</emphasis>) extensions,
-    defined in RFC &lt;TBA&gt;. This section describes the creation and use
-    of DNSSEC signed zones.</para>
+    through the DNS Security (<emphasis>DNSSEC-bis</emphasis>)
+    extensions, defined in RFC 4033, RFC4034 and RFC4035.  This
+    section describes the creation and use of DNSSEC signed
+    zones.</para>
 
     <para>In order to set up a DNSSEC secure zone, there are a series
     of steps which must be followed.  <acronym>BIND</acronym> 9 ships
@@ -1493,7 +1494,7 @@ allow-update { key host1-host2. ;};
     <para>There must also be communication with the administrators of
     the parent and/or child zone to transmit keys.  A zone's security
     status must be indicated by the parent zone for a DNSSEC capable 
-    resolver to trust its data.  This is done through the presense
+    resolver to trust its data.  This is done through the presence
     or absence of a <literal>DS</literal> record at the delegation
     point.</para>
 
@@ -1577,14 +1578,93 @@ allow-update { key host1-host2. ;};
 
 <sect2><title>Configuring Servers</title>
 
-<para>Unlike <acronym>BIND</acronym> 8, 
-<acronym>BIND</acronym> 9 does not verify signatures on load,
-so zone keys for authoritative zones do not need to be specified
-in the configuration file.</para>
+	<para>
+	  To enable <command>named</command> to respond appropriately
+	  to DNS requests from DNSSEC aware clients
+	  <command>dnssec-enable</command> must be set to yes.
+          </para>
+  
+	<para>
+	  To enable <command>named</command> to validate answers from
+	  other servers <command>dnssec-enable</command> and
+	  some <command>trusted-keys</command> must be configured
+	  into <filename>named.conf</filename>.
+          </para>
+
+	<para>
+	  <command>trusted-keys</command> are copies of DNSKEY RRs
+	  for zones that are used to form the first link in the
+	  cryptographic chain of trust.  All keys listed in
+	  <command>trusted-keys</command> (and corresponding zones)
+	  are deemed to exist and only the listed keys will be used
+	  to validated the DNSKEY RRset that they are from.
+	</para>
+
+	<para>
+	  <command>trusted-keys</command> are described in more detail
+	  later in this document.
+	</para>
+
+	<para>
+	  Unlike <acronym>BIND</acronym> 8, <acronym>BIND</acronym>
+	  9 does not verify signatures on load, so zone keys for
+	  authoritative zones do not need to be specified in the
+	  configuration file.
+	</para>
+
+	<para>
+	  After DNSSEC gets established, a typical DNSSEC configuration
+	  will look something like the following.  It has a one or
+	  more public keys for the root.  This allows answers from
+	  outside the organization to be validated.  It will also
+	  have several keys for parts of the namespace the organization
+	  controls.  These are here to ensure that named is immune
+	  to compromises in the DNSSEC components of the security
+	  of parent zones.
+	</para>
+
+<programlisting>
+trusted-keys {
+
+	/* Root Key */
+"." 257 3 3 "BNY4wrWM1nCfJ+CXd0rVXyYmobt7sEEfK3clRbGaTwSJxrGkxJWoZu6I7PzJu/
+	     E9gx4UC1zGAHlXKdE4zYIpRhaBKnvcC2U9mZhkdUpd1Vso/HAdjNe8LmMlnzY3
+	     zy2Xy4klWOADTPzSv9eamj8V18PHGjBLaVtYvk/ln5ZApjYghf+6fElrmLkdaz
+	     MQ2OCnACR817DF4BBa7UR/beDHyp5iWTXWSi6XmoJLbG9Scqc7l70KDqlvXR3M
+	     /lUUVRbkeg1IPJSidmK3ZyCllh4XSKbje/45SKucHgnwU5jefMtq66gKodQj+M
+	     iA21AfUVe7u99WzTLzY3qlxDhxYQQ20FQ97S+LKUTpQcq27R7AT3/V5hRQxScI
+	     Nqwcz4jYqZD2fQdgxbcDTClU0CRBdiieyLMNzXG3";
+
+/* Key for out organizations forward zone */
+example.com. 257 3 5 "AwEAAaxPMcR2x0HbQV4WeZB6oEDX+r0QM65KbhTjrW1ZaARmPhEZZe
+                      3Y9ifgEuq7vZ/zGZUdEGNWy+JZzus0lUptwgjGwhUS1558Hb4JKUbb
+	              OTcM8pwXlj0EiX3oDFVmjHO444gLkBO UKUf/mC7HvfwYH/Be22GnC
+		      lrinKJp1Og4ywzO9WglMk7jbfW33gUKvirTHr25GL7STQUzBb5Usxt
+		      8lgnyTUHs1t3JwCY5hKZ6CqFxmAVZP20igTixin/1LcrgX/KMEGd/b
+		      iuvF4qJCyduieHukuY3H4XMAcR+xia2 nIUPvm/oyWR8BW/hWdzOvn
+		      SCThlHf3xiYleDbt/o1OTQ09A0=";
+
+/* Key for our reverse zone. */
+2.0.192.IN-ADDRPA.NET. 257 3 5 "AQOnS4xn/IgOUpBPJ3bogzwcxOdNax071L18QqZnQQQA
+                                VVr+iLhGTnNGp3HoWQLUIzKrJVZ3zggy3WwNT6kZo6c0
+				tszYqbtvchmgQC8CzKojM/W16i6MG/ea fGU3siaOdS0
+				yOI6BgPsw+YZdzlYMaIJGf4M4dyoKIhzdZyQ2bYQrjyQ
+				4LB0lC7aOnsMyYKHHYeRv PxjIQXmdqgOJGq+vsevG06
+			        zW+1xgYJh9rCIfnm1GX/KMgxLPG2vXTD/RnLX+D3T3UL
+				7HJYHJhAZD5L59VvjSPsZJHeDCUyWYrvPZesZDIRvhDD
+				52SKvbheeTJUm6EhkzytNN2SN96QRk8j/iI8ib";
+};
+
+options {
+	...
+	dnssec-enable yes;
+};
+</programlisting>
 
-<para>The public key for any security root must be present in
-the configuration file's <command>trusted-keys</command>
-statement, as described later in this document. </para>
+	<note>
+	  None of the keys listed in this example are valid.  In particular,
+	  the root key is not valid.
+	</note>
 
 </sect2>
 
@@ -1930,7 +2010,7 @@ in the C, C++, or shell/perl style.</para>
       </sect3>
       <sect3>
         <title>Definition and Usage</title>
-<para>Comments may appear anywhere that whitespace may appear in
+<para>Comments may appear anywhere that white space may appear in
 a <acronym>BIND</acronym> configuration file.</para>
 <para>C-style comments start with the two characters /* (slash,
 star) and end with */ (star, slash). Because they are completely
@@ -2018,7 +2098,7 @@ the log messages are sent.</para></entry>
           <row rowsep = "0">
             <entry colname = "1"><para><command>lwres</command></para></entry>
             <entry colname = "2"><para>configures <command>named</command> to
-also act as a light weight resolver daemon (<command>lwresd</command>).</para></entry>
+also act as a light-weight resolver daemon (<command>lwresd</command>).</para></entry>
           </row>
           <row rowsep = "0">
             <entry colname = "1"><para><command>masters</command></para></entry>
@@ -2132,7 +2212,7 @@ IPv6 addresses, just like <command>localhost</command>.
       <command>ip_port</command> on the specified
       <command>ip_addr</command>, which can be an IPv4 or IPv6
       address.  An <command>ip_addr</command>
-      of <literal>*</literal> is interpreted as the IPv4 wildcard
+      of <literal>*</literal> (asterisk) is interpreted as the IPv4 wildcard
       address; connections will be accepted on any of the system's
       IPv4 addresses.  To listen on the IPv6 wildcard address,
       use an <command>ip_addr</command> of <literal>::</literal>.
@@ -2144,7 +2224,7 @@ IPv6 addresses, just like <command>localhost</command>.
 
       <para>
       If no port is specified, port 953
-      is used.  "<literal>*</literal>" cannot be used for
+      is used.  The asterisk "<literal>*</literal>" cannot be used for
       <command>ip_port</command>.</para>
 
       <para>The ability to issue commands over the control channel is
@@ -2211,8 +2291,9 @@ installed.
       that contains the users who should have access.</para>
 
       <para>The UNIX control channel type of <acronym>BIND</acronym> 8 is not supported
-      in <acronym>BIND</acronym> 9, and is not expected to be added in future
-      releases.  If it is present in the controls statement from a
+      in <acronym>BIND</acronym> 9.0, <acronym>BIND</acronym> 9.1,
+      <acronym>BIND</acronym> 9.2 and <acronym>BIND</acronym> 9.3.
+      If it is present in the controls statement from a
       <acronym>BIND</acronym> 8 configuration file, it is ignored
       and a warning is logged.</para>
 
@@ -2436,7 +2517,7 @@ level is set either by starting the <command>named</command> server
 with the <option>-d</option> flag followed by a positive integer,
 or by running <command>rndc trace</command>.
 The global debug level
-can be set to zero, and debugging mode turned off, by running <command>ndc
+can be set to zero, and debugging mode turned off, by running <command>rndc
 notrace</command>. All debugging messages in the server have a debug
 level, and higher debug levels give more detailed output. Channels
 that specify a specific debug severity, for example:</para>
@@ -2499,7 +2580,7 @@ channel null {
 
 <para>The <command>default_debug</command> channel has the special
 property that it only produces output when the server's debug level is
-nonzero.  It normally writes to a file <filename>named.run</filename>
+nonzero.  It normally writes to a file called <filename>named.run</filename>
 in the server's working directory.</para>
 
 <para>For security reasons, when the "<option>-u</option>"
@@ -2619,7 +2700,7 @@ the <command>null</command> channel.</para></entry>
 <entry colname = "1"><para><command>queries</command></para></entry>
 <entry colname = "2"><para>Specify where queries should be logged to.</para>
 <para>
-At startup, specifing the category <command>queries</command> will also
+At startup, specifying the category <command>queries</command> will also
 enable query logging unless <command>querylog</command> option has been
 specified.
 </para>
@@ -2683,8 +2764,8 @@ statement in the <filename>named.conf</filename> file:</para>
 <title><command>lwres</command> Statement Definition and Usage</title>
 
 <para>The <command>lwres</command> statement configures the name
-server to also act as a lightweight resolver server, see
-<xref linkend="lwresd"/>.  There may be be multiple
+server to also act as a lightweight resolver server. (See
+<xref linkend="lwresd"/>.)  There may be be multiple
 <command>lwres</command> statements configuring
 lightweight resolver servers with different properties.</para>
 
@@ -2925,7 +3006,7 @@ double quotes.</para>
 to when instructed to do so using <command>rndc stats</command>.
 If not specified, the default is <filename>named.stats</filename> in the
 server's current directory.  The format of the file is described
-in <xref linkend="statsfile"/></para>
+in <xref linkend="statsfile"/>.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>port</command></term>
@@ -2962,8 +3043,8 @@ The default is not to preference any type (NONE).
 
 <varlistentry><term><command>root-delegation-only</command></term>
 <listitem><para>
-Turn on enforcement of delegation-only in TLDs and root zones with an optional
-exclude list.
+Turn on enforcement of delegation-only in TLDs (top level domains)
+and root zones with an optional exclude list.
 </para>
 <para>
 Note some TLDs are NOT delegation only (e.g. "DE", "LV", "US" and "MUSEUM").
@@ -3129,7 +3210,7 @@ and BIND 9 never does it.</para></listitem></varlistentry>
 
 <varlistentry><term><command>flush-zones-on-shutdown</command></term>
 <listitem><para>When the nameserver exits due receiving SIGTERM,
-flush / do not flush any pending zone writes.  The default is
+flush or do not flush any pending zone writes.  The default is
 <command>flush-zones-on-shutdown</command> <userinput>no</userinput>.
 </para></listitem></varlistentry>
 
@@ -3238,7 +3319,7 @@ in <xref linkend="server_statement_definition_and_usage"/>. See also
 <para>
 See the description of
 <command>provide-ixfr</command> in
-<xref linkend="server_statement_definition_and_usage"/>
+<xref linkend="server_statement_definition_and_usage"/>.
 </para></listitem></varlistentry>
 
 <varlistentry><term><command>request-ixfr</command></term>
@@ -3246,7 +3327,7 @@ See the description of
 <para>
 See the description of
 <command>request-ixfr</command> in
-<xref linkend="server_statement_definition_and_usage"/>
+<xref linkend="server_statement_definition_and_usage"/>.
 </para></listitem></varlistentry>
 
 <varlistentry><term><command>treat-cr-as-space</command></term>
@@ -3393,7 +3474,7 @@ For <command>slave</command> zones the default is <command>warn</command>.
 For answer received from the network (<command>response</command>)
 the default is <command>ignore</command>.
 </para>
-<para>The rules for legal hostnames / mail domains are derived from RFC 952
+<para>The rules for legal hostnames or mail domains are derived from RFC 952
 and RFC 821 as modified by RFC 1123.
 </para>
 <para><command>check-names</command> applies to the owner names of A, AAA and
@@ -3448,7 +3529,7 @@ on the host machine.</para>
 
 <variablelist>
 <varlistentry><term><command>dual-stack-servers</command></term>
-<listitem><para>Specifies host names / addresses of machines with access to
+<listitem><para>Specifies host names or addresses of machines with access to
 both IPv4 and IPv6 transports. If a hostname is used the server must be able
 to resolve the name using only the transport it has.  If the machine is dual
 stacked then the <command>dual-stack-servers</command> have no effect unless
@@ -3617,6 +3698,12 @@ unprivileged port.</para></note>
 <note>
 <para>See also <command>transfer-source</command> and
 <command>notify-source</command>.</para></note>
+	<note>
+	  <para>
+	    Solaris 2.5.1 and earlier does not support setting the source
+	    address for TCP sockets.
+	  </para>
+        </note>
 </sect3>
 
 <sect3 id="zone_transfers"><title>Zone Transfers</title>
@@ -3699,7 +3786,8 @@ resource record transferred.
 possible into a message. <command>many-answers</command> is more
 efficient, but is only supported by relatively new slave servers,
 such as <acronym>BIND</acronym> 9, <acronym>BIND</acronym> 8.x and patched
-versions of <acronym>BIND</acronym> 4.9.5. The default is
+versions of <acronym>BIND</acronym> 4.9.5. The <command>many-answers</command>
+format is also supported by recent Microsoft Windows nameservers. The default is
 <command>many-answers</command>. <command>transfer-format</command>
 may be overridden on a per-server basis by using the
 <command>server</command> statement.
@@ -3791,9 +3879,15 @@ send NOTIFY messages.
 This address must appear in the slave server's <command>masters</command>
 zone clause or in an <command>allow-notify</command> clause.
 This statement sets the <command>notify-source</command> for all zones,
-but can be overridden on a per-zone / per-view basis by including a
+but can be overridden on a per-zone or per-view basis by including a
 <command>notify-source</command> statement within the <command>zone</command>
 or <command>view</command> block in the configuration file.</para>
+               <note>
+                 <para>
+                   Solaris 2.5.1 and earlier does not support setting the
+                   source address for TCP sockets.
+                 </para>
+                 </note>
 </listitem></varlistentry>
 
 <varlistentry><term><command>notify-source-v6</command></term>
@@ -3827,8 +3921,8 @@ example, <command>1G</command> can be used instead of
 <command>1073741824</command> to specify a limit of one
 gigabyte. <command>unlimited</command> requests unlimited use, or the
 maximum available amount. <command>default</command> uses the limit
-that was in force when the server was started. See the description of
-<command>size_spec</command> in <xref
+that was in force when the server was started. See the description
+of <command>size_spec</command> in <xref
 linkend="configuration_file_elements"/>.</para>
 
 <para>The following options set operating system resource limits for
@@ -3894,7 +3988,7 @@ function in BIND 8.
 
 <varlistentry><term><command>max-journal-size</command></term>
 <listitem><para>Sets a maximum size for each journal file
-(<xref linkend="journal"/>).  When the journal file approaches
+(see <xref linkend="journal"/>).  When the journal file approaches
 the specified size, some of the oldest transactions in the journal
 will be automatically removed.  The default is
 <literal>unlimited</literal>.</para>
@@ -4179,7 +4273,7 @@ be silently truncated to 7 days if set to a greater value.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>max-cache-ttl</command></term>
-<listitem><para><command>max-cache-ttl</command> sets
+<listitem><para>Sets
 the maximum time for which the server will cache ordinary (positive)
 answers. The default is one week (7 days).</para>
 </listitem></varlistentry>
@@ -4189,7 +4283,7 @@ answers. The default is one week (7 days).</para>
 is required for a request for the root servers to be accepted. Default
 is <userinput>2</userinput>.</para>
 <note>
-<simpara>Not implemented in <acronym>BIND</acronym>9.</simpara></note>
+<simpara>Not implemented in <acronym>BIND</acronym> 9.</simpara></note>
 </listitem></varlistentry>
 
 <varlistentry><term><command>sig-validity-interval</command></term>
@@ -4266,7 +4360,7 @@ disables processing of the queries.</para>
 the name <filename>hostname.bind</filename>
 with type <command>TXT</command>, class <command>CHAOS</command>.
 This defaults to the hostname of the machine hosting the name server as
-found by gethostname().  The primary purpose of such queries is to
+found by the gethostname() function.  The primary purpose of such queries is to
 identify which of a group of anycast servers is actually
 answering your queries.  Specifying <command>hostname none;</command>
 disables processing of the queries.</para> 
@@ -4281,7 +4375,7 @@ identify which of a group of anycast servers is actually
 answering your queries.  Specifying <command>server-id none;</command>
 disables processing of the queries.
 Specifying <command>server-id hostname;</command> will cause named to
-use the hostname as found by gethostname().
+use the hostname as found by the gethostname() function.
 The default <command>server-id</command> is <command>none</command>.
 </para> 
 </listitem></varlistentry>
@@ -4297,16 +4391,25 @@ The default <command>server-id</command> is <command>none</command>.
 is similar, but not identical, to that
 generated by <acronym>BIND</acronym> 8.
 </para>
-<para>The statistics dump begins with the line <command>+++ Statistics Dump
-+++ (973798949)</command>, where the number in parentheses is a standard
+<para>The statistics dump begins with a line, like:</para>
+ <para>
+ <command>+++ Statistics Dump +++ (973798949)</command>
+ </para>
+ <para>The numberr in parentheses is a standard
 Unix-style timestamp, measured as seconds since January 1, 1970.  Following
 that line are a series of lines containing a counter type, the value of the
 counter, optionally a zone name, and optionally a view name.
 The lines without view and zone listed are global statistics for the entire server.
 Lines with a zone and view name for the given view and zone (the view name is
-omitted for the default view).  The statistics dump ends
-with the line <command>--- Statistics Dump --- (973798949)</command>, where the
-number is identical to the number in the beginning line.</para>
+omitted for the default view).
+</para>
+<para>
+The statistics dump ends with the line where the
+number is identical to the number in the beginning line; for example:
+</para>
+<para>
+<command>--- Statistics Dump --- (973798949)</command>
+</para>
 <para>The following statistics counters are maintained:</para>
 <informaltable
     colsep = "0" rowsep = "0"><tgroup cols = "2"
@@ -4479,19 +4582,37 @@ Form more details, see the description of
 };
 </programlisting>
 </sect2>
-<sect2><title><command>trusted-keys</command> Statement Definition
-and Usage</title>
-<para>The <command>trusted-keys</command> statement defines DNSSEC
-security roots. DNSSEC is described in <xref linkend="DNSSEC"/>. A security root is defined when the public key for a non-authoritative
-zone is known, but cannot be securely obtained through DNS, either
-because it is the  DNS root zone or because its parent zone is unsigned.
-Once a key has been configured as a trusted key, it is treated as
-if it had been validated and proven secure. The resolver attempts
-DNSSEC validation on all DNS data in subdomains of a security root.</para>
-<para>The <command>trusted-keys</command> statement can contain
-multiple key entries, each consisting of the key's domain name,
-flags, protocol, algorithm, and the base-64 representation of the
-key data.</para></sect2>
+
+	<sect2>
+	  <title><command>trusted-keys</command> Statement Definition
+	    and Usage</title>
+	  <para>
+	    The <command>trusted-keys</command> statement defines
+	    DNSSEC security roots. DNSSEC is described in <xref
+	    linkend="DNSSEC"/>. A security root is defined when the
+	    public key for a non-authoritative zone is known, but
+	    cannot be securely obtained through DNS, either because
+	    it is the DNS root zone or because its parent zone is
+	    unsigned.  Once a key has been configured as a trusted
+	    key, it is treated as if it had been validated and
+	    proven secure. The resolver attempts DNSSEC validation
+	    on all DNS data in subdomains of a security root.
+  	  </para>
+  	  <para>
+	    All keys (and corresponding zones) listed in
+	    <command>trusted-keys</command> are deemed to exist regardless
+	    of what parent zones say.  Similarly for all keys listed in
+	    <command>trusted-keys</command> only those keys are
+	    used to validate the DNSKEY RRset.  The parents DS RRset
+	    will not be used.
+  	  </para>
+	  <para>
+	    The <command>trusted-keys</command> statement can contain
+	    multiple key entries, each consisting of the key's
+	    domain name, flags, protocol, algorithm, and the Base-64
+	    representation of the key data.
+	  </para>
+	</sect2>
 
 <sect2 id="view_statement_grammar">
 <title><command>view</command> Statement Grammar</title>
@@ -4591,18 +4712,47 @@ view "external" {
 </sect2>
 <sect2 id="zone_statement_grammar"><title><command>zone</command>
 Statement Grammar</title>
-      <programlisting>zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> <optional>{ 
-    type ( master | slave | hint | stub | forward | delegation-only ) ;
-    <optional> allow-notify { <replaceable>address_match_list</replaceable> } ; </optional>
+<programlisting>zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type master;
     <optional> allow-query { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> allow-transfer { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> allow-update { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> update-policy { <replaceable>update_policy_rule</replaceable> <optional>...</optional> } ; </optional>
+    <optional> also-notify { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
+    <optional> check-names (<constant>warn</constant>|<constant>fail</constant>|<constant>ignore</constant>) ; </optional>
+    <optional> dialup <replaceable>dialup_option</replaceable> ; </optional>
+    <optional> file <replaceable>string</replaceable> ; </optional>
+    <optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
+    <optional> forwarders { <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
+    <optional> ixfr-base <replaceable>string</replaceable> ; </optional>
+    <optional> ixfr-tmp-file <replaceable>string</replaceable> ; </optional>
+    <optional> maintain-ixfr-base <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> max-ixfr-log-size <replaceable>number</replaceable> ; </optional>
+    <optional> max-transfer-idle-out <replaceable>number</replaceable> ; </optional>
+    <optional> max-transfer-time-out <replaceable>number</replaceable> ; </optional>
+    <optional> notify <replaceable>yes_or_no</replaceable> | <replaceable>explicit</replaceable> ; </optional>
+    <optional> pubkey <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ; </optional>
+    <optional> notify-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> notify-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> zone-statistics <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> sig-validity-interval <replaceable>number</replaceable> ; </optional>
+    <optional> database <replaceable>string</replaceable> ; </optional>
+    <optional> min-refresh-time <replaceable>number</replaceable> ; </optional>
+    <optional> max-refresh-time <replaceable>number</replaceable> ; </optional>
+    <optional> min-retry-time <replaceable>number</replaceable> ; </optional>
+    <optional> max-retry-time <replaceable>number</replaceable> ; </optional>
+    <optional> key-directory <replaceable>path_name</replaceable>; </optional>
+};
+
+zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type slave;
+    <optional> allow-notify { <replaceable>address_match_list</replaceable> } ; </optional>
+    <optional> allow-query { <replaceable>address_match_list</replaceable> } ; </optional>
+    <optional> allow-transfer { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> allow-update-forwarding { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> also-notify { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
     <optional> check-names (<constant>warn</constant>|<constant>fail</constant>|<constant>ignore</constant>) ; </optional>
     <optional> dialup <replaceable>dialup_option</replaceable> ; </optional>
-    <optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> file <replaceable>string</replaceable> ; </optional>
     <optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
     <optional> forwarders { <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
@@ -4625,6 +4775,40 @@ Statement Grammar</title>
     <optional> notify-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
     <optional> notify-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
     <optional> zone-statistics <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> database <replaceable>string</replaceable> ; </optional>
+    <optional> min-refresh-time <replaceable>number</replaceable> ; </optional>
+    <optional> max-refresh-time <replaceable>number</replaceable> ; </optional>
+    <optional> min-retry-time <replaceable>number</replaceable> ; </optional>
+    <optional> max-retry-time <replaceable>number</replaceable> ; </optional>
+    <optional> multi-master <replaceable>yes_or_no</replaceable> ; </optional>
+};
+
+zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type hint;
+    <optional> file <replaceable>string</replaceable> ; </optional>
+    <optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> check-names (<constant>warn</constant>|<constant>fail</constant>|<constant>ignore</constant>) ; // Not Implemented. </optional>
+};
+
+zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type stub;
+    <optional> allow-query { <replaceable>address_match_list</replaceable> } ; </optional>
+    <optional> check-names (<constant>warn</constant>|<constant>fail</constant>|<constant>ignore</constant>) ; </optional>
+    <optional> dialup <replaceable>dialup_option</replaceable> ; </optional>
+    <optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> file <replaceable>string</replaceable> ; </optional>
+    <optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
+    <optional> forwarders { <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
+    <optional> masters <optional>port <replaceable>ip_port</replaceable></optional> { ( <replaceable>masters_list</replaceable> | <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> <optional>key <replaceable>key</replaceable></optional> ) ; <optional>...</optional> } ; </optional>
+    <optional> max-transfer-idle-in <replaceable>number</replaceable> ; </optional>
+    <optional> max-transfer-time-in <replaceable>number</replaceable> ; </optional>
+    <optional> pubkey <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>number</replaceable> <replaceable>string</replaceable> ; </optional>
+    <optional> transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> alt-transfer-source (<replaceable>ip4_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> alt-transfer-source-v6 (<replaceable>ip6_addr</replaceable> | <constant>*</constant>) <optional>port <replaceable>ip_port</replaceable></optional> ; </optional>
+    <optional> use-alt-transfer-source <replaceable>yes_or_no</replaceable>; </optional>
+    <optional> zone-statistics <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> sig-validity-interval <replaceable>number</replaceable> ; </optional>
     <optional> database <replaceable>string</replaceable> ; </optional>
     <optional> min-refresh-time <replaceable>number</replaceable> ; </optional>
@@ -4632,9 +4816,18 @@ Statement Grammar</title>
     <optional> min-retry-time <replaceable>number</replaceable> ; </optional>
     <optional> max-retry-time <replaceable>number</replaceable> ; </optional>
     <optional> multi-master <replaceable>yes_or_no</replaceable> ; </optional>
-    <optional> key-directory <replaceable>path_name</replaceable>; </optional>
+};
+
+zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type forward;
+    <optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
+    <optional> forwarders { <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
+    <optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
+};
 
-}</optional>;
+zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> { 
+    type delegation-only;
+};
 </programlisting>
 </sect2>
 <sect2><title><command>zone</command> Statement Definition and Usage</title>
@@ -4664,7 +4857,7 @@ Authentication to the master can also be done with per-server TSIG keys.
 If a file is specified, then the
 replica will be written to this file whenever the zone is changed,
 and reloaded from this file on a server restart. Use of a file is
-recommended, since it often speeds server start-up and eliminates
+recommended, since it often speeds server startup and eliminates
 a needless waste of bandwidth. Note that for large numbers (in the
 tens or hundreds of thousands) of zones per server, it is best to
 use a two level naming scheme for zone file names. For example,
@@ -4701,7 +4894,7 @@ configured.</para>
 <para>Stub zones can also be used as a way of forcing the resolution
 of a given domain to use a particular set of authoritative servers.
 For example, the caching name servers on a private network using
-RFC1981 addressing may be configured with stub zones for
+RFC1918 addressing may be configured with stub zones for
 <literal>10.in-addr.arpa</literal>
 to use a set of internal name servers as the authoritative
 servers for that domain.</para>
@@ -4765,12 +4958,12 @@ in the mid-1970s. Zone data for it can be specified with the <literal>CHAOS</lit
 
 <varlistentry><term><command>allow-notify</command></term>
 <listitem><para>See the description of
-<command>allow-notify</command> in <xref linkend="access_control"/></para>
+<command>allow-notify</command> in <xref linkend="access_control"/>.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>allow-query</command></term>
 <listitem><para>See the description of
-<command>allow-query</command> in <xref linkend="access_control"/></para>
+<command>allow-query</command> in <xref linkend="access_control"/>.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>allow-transfer</command></term>
@@ -4916,31 +5109,31 @@ information for this zone, which can be dumped to the
 
 <varlistentry><term><command>transfer-source</command></term>
 <listitem><para>See the description of
-<command>transfer-source</command> in <xref linkend="zone_transfers"/>
+<command>transfer-source</command> in <xref linkend="zone_transfers"/>.
 </para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>transfer-source-v6</command></term>
 <listitem><para>See the description of
-<command>transfer-source-v6</command> in <xref linkend="zone_transfers"/>
+<command>transfer-source-v6</command> in <xref linkend="zone_transfers"/>.
 </para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>alt-transfer-source</command></term>
 <listitem><para>See the description of
-<command>alt-transfer-source</command> in <xref linkend="zone_transfers"/>
+<command>alt-transfer-source</command> in <xref linkend="zone_transfers"/>.
 </para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>alt-transfer-source-v6</command></term>
 <listitem><para>See the description of
-<command>alt-transfer-source-v6</command> in <xref linkend="zone_transfers"/>
+<command>alt-transfer-source-v6</command> in <xref linkend="zone_transfers"/>.
 </para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>use-alt-transfer-source</command></term>
 <listitem><para>See the description of
-<command>use-alt-transfer-source</command> in <xref linkend="zone_transfers"/>
+<command>use-alt-transfer-source</command> in <xref linkend="zone_transfers"/>.
 </para>
 </listitem></varlistentry>
 
@@ -4973,7 +5166,7 @@ See the description in <xref linkend="tuning"/>.
 
 <varlistentry><term><command>key-directory</command></term>
 <listitem><para>See the description of
-<command>key-directory</command> in <xref linkend="options"/></para>
+<command>key-directory</command> in <xref linkend="options"/>.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>multi-master</command></term>
@@ -5217,7 +5410,7 @@ Experimental.</para></entry>
 <row rowsep = "0">
 <entry colname = "1"><para>MX</para></entry>
 <entry colname = "2"><para>identifies a mail exchange for the domain.
-a 16 bit preference value (lower is better)
+A 16 bit preference value (lower is better)
 followed by the host name of the mail exchange.
 Described in RFC 974, RFC 1035.</para></entry>
 </row>
@@ -5662,8 +5855,8 @@ e.g. <command>\$</command>. The <command>$</command> may optionally be followed
 by modifiers which change the offset from the iterator, field width and base. 
 Modifiers are introduced by a <command>{</command> immediately following the
 <command>$</command> as <command>${offset[,width[,base]]}</command>.
-e.g. <command>${-20,3,d}</command> which subtracts 20 from the current value,
-prints the result as a decimal in a zero padded field of with 3.  Available
+For example, <command>${-20,3,d}</command> which subtracts 20 from the current value,
+prints the result as a decimal in a zero padded field of width 3.  Available
 output forms are decimal (<command>d</command>), octal (<command>o</command>)
 and hexadecimal (<command>x</command> or <command>X</command> for uppercase).
 The default modifier is <command>${0,0,d}</command>.
@@ -5671,11 +5864,11 @@ If the <command>lhs</command> is not
 absolute, the current <command>$ORIGIN</command> is appended to
 the name.</para>
 <para>For compatibility with earlier versions <command>$$</command> is still
-recognized a indicating a literal $ in the output.</para></entry>
+recognized as indicating a literal $ in the output.</para></entry>
         </row>
         <row rowsep = "0">
           <entry colname = "1"><para><command>ttl</command></para></entry>
-          <entry colname = "2"><para><command>ttl</command> specifies the
+          <entry colname = "2"><para>Specifies the
 	  ttl of the generated records. If not specified this will be
 	  inherited using the normal ttl inheritance rules.</para>
 	  <para><command>class</command> and <command>ttl</command> can be
@@ -5683,7 +5876,7 @@ recognized a indicating a literal $ in the output.</para></entry>
 	</row>
         <row rowsep = "0">
           <entry colname = "1"><para><command>class</command></para></entry>
-          <entry colname = "2"><para><command>class</command> specifies the
+          <entry colname = "2"><para>Specifies the
 	  class of the generated records.  This must match the zone class if
 	  it is specified.</para>
 	  <para><command>class</command> and <command>ttl</command> can be
@@ -5696,7 +5889,7 @@ PTR, CNAME, DNAME, A, AAAA and NS.</para></entry>
         </row>
         <row rowsep = "0">
           <entry colname = "1"><para><command>rhs</command></para></entry>
-          <entry colname = "2"><para>rhs is a domain name. It is processed
+          <entry colname = "2"><para>A domain name. It is processed
 similarly to lhs.</para></entry>
         </row>
       </tbody>
@@ -5726,6 +5919,7 @@ your server.</para>
 // Set up an ACL named "bogusnets" that will block RFC1918 space,
 // which is commonly used in spoofing attacks.
 acl bogusnets { 0.0.0.0/8; 1.0.0.0/8; 2.0.0.0/8; 192.0.2.0/24; 224.0.0.0/3; 10.0.0.0/8; 172.16.0.0/12; 192.168.0.0/16; };
+
 // Set up an ACL called our-nets. Replace this with the real IP numbers.
 acl our-nets { x.x.x.x/24; x.x.x.x/21; }; 
 options {
@@ -5737,6 +5931,7 @@ options {
   blackhole { bogusnets; };
   ...
 };
+
 zone "example.com" {
   type master;
   file "m/example.com";
@@ -5764,7 +5959,7 @@ user 202:</para>
 
 <sect2><title>The <command>chroot</command> Environment</title>
 
-<para>In order for a <command>chroot()</command> environment to
+<para>In order for a <command>chroot</command> environment to
 work properly in a particular directory
 (for example, <filename>/var/named</filename>),
 you will need to set up an environment that includes everything
@@ -5782,7 +5977,7 @@ However, depending on your operating system, you may need
 to set up things like
 <filename>/dev/zero</filename>,
 <filename>/dev/random</filename>,
-<filename>/dev/log</filename>, and/or
+<filename>/dev/log</filename>, and
 <filename>/etc/localtime</filename>.
 </para>
 </sect2>
@@ -5919,7 +6114,10 @@ Center (SRI-NIC). A <acronym>DNS</acronym> server for Unix machines, the Berkele
 Name Domain (<acronym>BIND</acronym>) package, was written soon after by a group of
 graduate students at the University of California at Berkeley under
 a grant from the US Defense Advanced Research Projects Administration
-(DARPA). Versions of <acronym>BIND</acronym> through 4.8.3 were maintained by the Computer
+(DARPA).
+</para>
+<para>
+Versions of <acronym>BIND</acronym> through 4.8.3 were maintained by the Computer
 Systems Research Group (CSRG) at UC Berkeley. Douglas Terry, Mark
 Painter, David Riggle and Songnian Zhou made up the initial <acronym>BIND</acronym>
 project team. After that, additional work on the software package
diff --git a/doc/arm/Bv9ARM.ch01.html b/doc/arm/Bv9ARM.ch01.html
index 37f1eec3..4a507275 100644
--- a/doc/arm/Bv9ARM.ch01.html
+++ b/doc/arm/Bv9ARM.ch01.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch01.html,v 1.12.2.2.8.9 2005/10/13 02:33:58 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch01.html,v 1.12.2.2.8.12 2006/05/08 15:46:00 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,17 +45,17 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545879">Scope of Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545905">Organization of This Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545976">Conventions Used in This Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2546234">The Domain Name System (<span class="acronym">DNS</span>)</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545129">Scope of Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545155">Organization of This Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545226">Conventions Used in This Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545484">The Domain Name System (<span class="acronym">DNS</span>)</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546254">DNS Fundamentals</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2544105">Domains and Domain Names</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546579">Zones</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546653">Authoritative Name Servers</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546950">Caching Name Servers</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2547076">Name Servers in Multiple Roles</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545505">DNS Fundamentals</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2544038">Domains and Domain Names</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545829">Zones</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545972">Authoritative Name Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546200">Caching Name Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546326">Name Servers in Multiple Roles</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -67,7 +67,7 @@
   hierarchical databases.</p>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2545879"></a>Scope of Document</h2></div></div></div>
+<a name="id2545129"></a>Scope of Document</h2></div></div></div>
 <p>The Berkeley Internet Name Domain (<span class="acronym">BIND</span>) implements an
     domain name server for a number of operating systems. This
     document provides basic information about the installation and
@@ -78,7 +78,7 @@
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2545905"></a>Organization of This Document</h2></div></div></div>
+<a name="id2545155"></a>Organization of This Document</h2></div></div></div>
 <p>In this document, <span class="emphasis"><em>Section 1</em></span> introduces
     the basic <span class="acronym">DNS</span> and <span class="acronym">BIND</span> concepts. <span class="emphasis"><em>Section 2</em></span>
     describes resource requirements for running <span class="acronym">BIND</span> in various
@@ -103,7 +103,7 @@
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2545976"></a>Conventions Used in This Document</h2></div></div></div>
+<a name="id2545226"></a>Conventions Used in This Document</h2></div></div></div>
 <p>In this document, we use the following general typographic
     conventions:</p>
 <div class="informaltable"><table border="1">
@@ -169,7 +169,7 @@ describe:</em></span></p></td>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2546234"></a>The Domain Name System (<span class="acronym">DNS</span>)</h2></div></div></div>
+<a name="id2545484"></a>The Domain Name System (<span class="acronym">DNS</span>)</h2></div></div></div>
 <p>The purpose of this document is to explain the installation
 and upkeep of the <span class="acronym">BIND</span> software package, and we
 begin by reviewing the fundamentals of the Domain Name System
@@ -177,7 +177,7 @@ begin by reviewing the fundamentals of the Domain Name System
 </p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2546254"></a>DNS Fundamentals</h3></div></div></div>
+<a name="id2545505"></a>DNS Fundamentals</h3></div></div></div>
 <p>The Domain Name System (DNS) is the hierarchical, distributed
 database.  It stores information for mapping Internet host names to IP
 addresses and vice versa, mail routing information, and other data
@@ -192,7 +192,7 @@ libraries, <span><strong class="command">liblwres</strong></span> and <span><str
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2544105"></a>Domains and Domain Names</h3></div></div></div>
+<a name="id2544038"></a>Domains and Domain Names</h3></div></div></div>
 <p>The data stored in the DNS is identified by <span class="emphasis"><em>domain
 names</em></span> that are organized as a tree according to
 organizational or administrative boundaries. Each node of the tree,
@@ -229,7 +229,7 @@ the DNS protocol, please refer to the standards documents listed in
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2546579"></a>Zones</h3></div></div></div>
+<a name="id2545829"></a>Zones</h3></div></div></div>
 <p>To properly operate a name server, it is important to understand
 the difference between a <span class="emphasis"><em>zone</em></span>
 and a <span class="emphasis"><em>domain</em></span>.</p>
@@ -269,7 +269,7 @@ actually asking for slave service for some collection of zones.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2546653"></a>Authoritative Name Servers</h3></div></div></div>
+<a name="id2545972"></a>Authoritative Name Servers</h3></div></div></div>
 <p>Each zone is served by at least
 one <span class="emphasis"><em>authoritative name server</em></span>,
 which contains the complete data for the zone.
@@ -282,7 +282,7 @@ easy to identify when debugging DNS configurations using tools like
 <span><strong class="command">dig</strong></span> (<a href="Bv9ARM.ch03.html#diagnostic_tools" title="Diagnostic Tools">the section called &#8220;Diagnostic Tools&#8221;</a>).</p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2546676"></a>The Primary Master</h4></div></div></div>
+<a name="id2545994"></a>The Primary Master</h4></div></div></div>
 <p>
 The authoritative server where the master copy of the zone data is maintained is
 called the <span class="emphasis"><em>primary master</em></span> server, or simply the
@@ -293,7 +293,7 @@ the <span class="emphasis"><em>zone file</em></span> or <span class="emphasis"><
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2546902"></a>Slave Servers</h4></div></div></div>
+<a name="id2546152"></a>Slave Servers</h4></div></div></div>
 <p>The other authoritative servers, the <span class="emphasis"><em>slave</em></span>
 servers (also known as <span class="emphasis"><em>secondary</em></span> servers) load
 the zone contents from another server using a replication process
@@ -304,7 +304,7 @@ may itself act as a master to a subordinate slave server.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2546921"></a>Stealth Servers</h4></div></div></div>
+<a name="id2546171"></a>Stealth Servers</h4></div></div></div>
 <p>Usually all of the zone's authoritative servers are listed in 
 NS records in the parent zone.  These NS records constitute
 a <span class="emphasis"><em>delegation</em></span> of the zone from the parent.
@@ -329,7 +329,7 @@ with the outside world.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2546950"></a>Caching Name Servers</h3></div></div></div>
+<a name="id2546200"></a>Caching Name Servers</h3></div></div></div>
 <p>The resolver libraries provided by most operating systems are 
 <span class="emphasis"><em>stub resolvers</em></span>, meaning that they are not capable of
 performing the full DNS resolution process by themselves by talking
@@ -348,7 +348,7 @@ Time To Live (TTL) field associated with each resource record.
 </p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2547050"></a>Forwarding</h4></div></div></div>
+<a name="id2546300"></a>Forwarding</h4></div></div></div>
 <p>Even a caching name server does not necessarily perform
 the complete recursive lookup itself.  Instead, it can
 <span class="emphasis"><em>forward</em></span> some or all of the queries
@@ -371,7 +371,7 @@ of.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2547076"></a>Name Servers in Multiple Roles</h3></div></div></div>
+<a name="id2546326"></a>Name Servers in Multiple Roles</h3></div></div></div>
 <p>The <span class="acronym">BIND</span> name server can simultaneously act as
 a master for some zones, a slave for other zones, and as a caching
 (recursive) server for a set of local clients.</p>
diff --git a/doc/arm/Bv9ARM.ch02.html b/doc/arm/Bv9ARM.ch02.html
index d3e946ad..7bd3723b 100644
--- a/doc/arm/Bv9ARM.ch02.html
+++ b/doc/arm/Bv9ARM.ch02.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch02.html,v 1.10.2.1.8.8 2005/10/13 02:33:59 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch02.html,v 1.10.2.1.8.11 2006/05/08 15:46:00 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,16 +45,16 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547108">Hardware requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547132">CPU Requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547143">Memory Requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547158">Name Server Intensive Environment Issues</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547303">Supported Operating Systems</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546358">Hardware requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546382">CPU Requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546393">Memory Requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546408">Name Server Intensive Environment Issues</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546485">Supported Operating Systems</a></span></dt>
 </dl>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547108"></a>Hardware requirements</h2></div></div></div>
+<a name="id2546358"></a>Hardware requirements</h2></div></div></div>
 <p><span class="acronym">DNS</span> hardware requirements have traditionally been quite modest.
 For many installations, servers that have been pensioned off from
 active duty have performed admirably as <span class="acronym">DNS</span> servers.</p>
@@ -66,7 +66,7 @@ multiprocessor systems for installations that need it.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547132"></a>CPU Requirements</h2></div></div></div>
+<a name="id2546382"></a>CPU Requirements</h2></div></div></div>
 <p>CPU requirements for <span class="acronym">BIND</span> 9 range from i486-class machines
 for serving of static zones without caching, to enterprise-class
 machines if you intend to process many dynamic updates and DNSSEC
@@ -74,7 +74,7 @@ signed zones, serving many thousands of queries per second.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547143"></a>Memory Requirements</h2></div></div></div>
+<a name="id2546393"></a>Memory Requirements</h2></div></div></div>
 <p>The memory of the server has to be large enough to fit the
 cache and zones loaded off disk.  The <span><strong class="command">max-cache-size</strong></span>
 option can be used to limit the amount of memory used by the cache,
@@ -88,7 +88,7 @@ fast as they are being inserted.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547158"></a>Name Server Intensive Environment Issues</h2></div></div></div>
+<a name="id2546408"></a>Name Server Intensive Environment Issues</h2></div></div></div>
 <p>For name server intensive environments, there are two alternative
 configurations that may be used. The first is where clients and
 any second-level internal name servers query a main name server, which
@@ -102,7 +102,7 @@ as none of the name servers share their cached data.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547303"></a>Supported Operating Systems</h2></div></div></div>
+<a name="id2546485"></a>Supported Operating Systems</h2></div></div></div>
 <p>ISC <span class="acronym">BIND</span> 9 compiles and runs on a large number
 of Unix-like operating system and on Windows NT / 2000.  For an up-to-date
 list of supported systems, see the README file in the top level directory
diff --git a/doc/arm/Bv9ARM.ch03.html b/doc/arm/Bv9ARM.ch03.html
index 4d6d93be..0e61d199 100644
--- a/doc/arm/Bv9ARM.ch03.html
+++ b/doc/arm/Bv9ARM.ch03.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch03.html,v 1.26.2.5.4.11 2005/10/13 02:33:59 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch03.html,v 1.26.2.5.4.15 2006/05/17 02:38:09 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -47,14 +47,14 @@
 <dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch03.html#sample_configuration">Sample Configurations</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547334">A Caching-only Name Server</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547350">An Authoritative-only Name Server</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546516">A Caching-only Name Server</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546532">An Authoritative-only Name Server</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2547372">Load Balancing</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2547656">Name Server Operations</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2546622">Load Balancing</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2546906">Name Server Operations</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547661">Tools for Use With the Name Server Daemon</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2548915">Signals</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546912">Tools for Use With the Name Server Daemon</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2548076">Signals</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -66,7 +66,7 @@ option setting.</p>
 <a name="sample_configuration"></a>Sample Configurations</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2547334"></a>A Caching-only Name Server</h3></div></div></div>
+<a name="id2546516"></a>A Caching-only Name Server</h3></div></div></div>
 <p>The following sample configuration is appropriate for a caching-only
 name server for use by clients internal to a corporation.  All queries
 from outside clients are refused using the <span><strong class="command">allow-query</strong></span>
@@ -89,7 +89,7 @@ zone "0.0.127.in-addr.arpa" {
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2547350"></a>An Authoritative-only Name Server</h3></div></div></div>
+<a name="id2546532"></a>An Authoritative-only Name Server</h3></div></div></div>
 <p>This sample configuration is for an authoritative-only server
 that is the master server for "<code class="filename">example.com</code>"
 and a slave for the subdomain "<code class="filename">eng.example.com</code>".</p>
@@ -128,7 +128,7 @@ zone "eng.example.com" {
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547372"></a>Load Balancing</h2></div></div></div>
+<a name="id2546622"></a>Load Balancing</h2></div></div></div>
 <p>A primitive form of load balancing can be achieved in
 the <span class="acronym">DNS</span> by using multiple A records for one name.</p>
 <p>For example, if you have three WWW servers with network addresses
@@ -189,10 +189,10 @@ of the time:</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2547656"></a>Name Server Operations</h2></div></div></div>
+<a name="id2546906"></a>Name Server Operations</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2547661"></a>Tools for Use With the Name Server Daemon</h3></div></div></div>
+<a name="id2546912"></a>Tools for Use With the Name Server Daemon</h3></div></div></div>
 <p>There are several indispensable diagnostic, administrative
 and monitoring tools available to the system administrator for controlling
 and debugging the name server daemon. We describe several in this
@@ -283,7 +283,7 @@ of a server.</p>
               If you run <span><strong class="command">rndc</strong></span> without any options
               it will display a usage message as follows:</p>
 <div class="cmdsynopsis"><p><code class="command">rndc</code>  [-c <em class="replaceable"><code>config</code></em>] [-s <em class="replaceable"><code>server</code></em>] [-p <em class="replaceable"><code>port</code></em>] [-y <em class="replaceable"><code>key</code></em>]  <em class="replaceable"><code>command</code></em>  [<em class="replaceable"><code>command</code></em>...]</p></div>
-<p><span><strong class="command">command</strong></span> is one of the following:</p>
+<p>The <span><strong class="command">command</strong></span> is one of the following:</p>
 <div class="variablelist"><dl>
 <dt><span class="term"><strong class="userinput"><code>reload</code></strong></span></dt>
 <dd><p>Reload configuration file and zones.</p></dd>
@@ -316,10 +316,6 @@ of a server.</p>
     the server to reload the zone from disk, and re-enables dynamic updates
     after the load has completed.  After a zone is thawed, dynamic updates
     will no longer be refused.</p></dd>
-<dt><span class="term"><strong class="userinput"><code>notify <em class="replaceable"><code>zone</code></em>
-       [<span class="optional"><em class="replaceable"><code>class</code></em>
-           [<span class="optional"><em class="replaceable"><code>view</code></em></span>]</span>]</code></strong></span></dt>
-<dd><p>Resend NOTIFY messages for the zone</p></dd>
 <dt><span class="term"><strong class="userinput"><code>reconfig</code></strong></span></dt>
 <dd><p>Reload the configuration file and load new zones,
    but do not reload existing zone files even if they have changed.
@@ -342,12 +338,15 @@ of a server.</p>
 <dt><span class="term"><strong class="userinput"><code>stop [<span class="optional">-p</span>]</code></strong></span></dt>
 <dd><p>Stop the server, making sure any recent changes
    made through dynamic update or IXFR are first saved to the master files
-   of the updated zones.  If -p is specified named's process id is returned.</p></dd>
+   of the updated zones.  If -p is specified named's process id is returned.
+   This allows an external process to determine when named had completed stopping.</p></dd>
 <dt><span class="term"><strong class="userinput"><code>halt [<span class="optional">-p</span>]</code></strong></span></dt>
 <dd><p>Stop the server immediately.  Recent changes
    made through dynamic update or IXFR are not saved to the master files,
    but will be rolled forward from the journal files when the server
-   is restarted.  If -p is specified named's process id is returned.</p></dd>
+   is restarted.  If -p is specified named's process id is returned.
+   This allows an external process to determine when named had completed
+   stopping.</p></dd>
 <dt><span class="term"><strong class="userinput"><code>trace</code></strong></span></dt>
 <dd><p>Increment the servers debugging level by one. </p></dd>
 <dt><span class="term"><strong class="userinput"><code>trace <em class="replaceable"><code>level</code></em></code></strong></span></dt>
@@ -474,7 +473,7 @@ a <code class="filename">rndc.key</code> file and not modify
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2548915"></a>Signals</h3></div></div></div>
+<a name="id2548076"></a>Signals</h3></div></div></div>
 <p>Certain UNIX signals cause the name server to take specific
 actions, as described in the following table.  These signals can
 be sent using the <span><strong class="command">kill</strong></span> command.</p>
diff --git a/doc/arm/Bv9ARM.ch04.html b/doc/arm/Bv9ARM.ch04.html
index 8165dbba..d0bc35b2 100644
--- a/doc/arm/Bv9ARM.ch04.html
+++ b/doc/arm/Bv9ARM.ch04.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch04.html,v 1.30.2.6.2.14 2005/10/13 02:33:59 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch04.html,v 1.30.2.6.2.20 2006/05/17 02:38:09 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -49,28 +49,28 @@
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#dynamic_update">Dynamic Update</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch04.html#journal">The journal file</a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#incremental_zone_transfers">Incremental Zone Transfers (IXFR)</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549203">Split DNS</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2548569">Split DNS</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#tsig">TSIG</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549627">Generate Shared Keys for Each Pair of Hosts</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549830">Copying the Shared Secret to Both Machines</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549838">Informing the Servers of the Key's Existence</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549878">Instructing the Server to Use the Key</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549998">TSIG Key Based Access Control</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550042">Errors</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2548926">Generate Shared Keys for Each Pair of Hosts</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549061">Copying the Shared Secret to Both Machines</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549069">Informing the Servers of the Key's Existence</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549109">Instructing the Server to Use the Key</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549229">TSIG Key Based Access Control</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549273">Errors</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550056">TKEY</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550173">SIG(0)</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549287">TKEY</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549336">SIG(0)</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#DNSSEC">DNSSEC</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550308">Generating Keys</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550375">Signing the Zone</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550450">Configuring Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549470">Generating Keys</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549606">Signing the Zone</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549681">Configuring Servers</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550473">IPv6 Support in <span class="acronym">BIND</span> 9</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549750">IPv6 Support in <span class="acronym">BIND</span> 9</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550600">Address Lookups Using AAAA Records</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550620">Address to Name Lookups Using Nibble Format</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549877">Address Lookups Using AAAA Records</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549965">Address to Name Lookups Using Nibble Format</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -168,7 +168,7 @@ of the <span><strong class="command">server</strong></span> statement.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2549203"></a>Split DNS</h2></div></div></div>
+<a name="id2548569"></a>Split DNS</h2></div></div></div>
 <p>Setting up different views, or visibility, of the DNS space to
 internal and external resolvers is usually referred to as a <span class="emphasis"><em>Split
 DNS</em></span> setup. There are several reasons an organization
@@ -254,7 +254,7 @@ internal clients will now be able to:</p>
 </ul></div>
 <p>Here is an example configuration for the setup we just
     described above. Note that this is only configuration information;
-    for information on how to configure your zone files, see <a href="Bv9ARM.ch03.html#sample_configuration" title="Sample Configurations">the section called &#8220;Sample Configurations&#8221;</a></p>
+    for information on how to configure your zone files, see <a href="Bv9ARM.ch03.html#sample_configuration" title="Sample Configurations">the section called &#8220;Sample Configurations&#8221;</a>.</p>
 <p>Internal DNS server config:</p>
 <pre class="programlisting">
 
@@ -372,13 +372,13 @@ for TSIG.</p>
     <code class="option">-y</code> command line options.</p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2549627"></a>Generate Shared Keys for Each Pair of Hosts</h3></div></div></div>
+<a name="id2548926"></a>Generate Shared Keys for Each Pair of Hosts</h3></div></div></div>
 <p>A shared secret is generated to be shared between <span class="emphasis"><em>host1</em></span> and <span class="emphasis"><em>host2</em></span>.
 An arbitrary key name is chosen: "host1-host2.". The key name must
 be the same on both hosts.</p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2549643"></a>Automatic Generation</h4></div></div></div>
+<a name="id2549011"></a>Automatic Generation</h4></div></div></div>
 <p>The following command will generate a 128 bit (16 byte) HMAC-MD5
 key as described above. Longer keys are better, but shorter keys
 are easier to read. Note that the maximum key length is 512 bits;
@@ -395,7 +395,7 @@ be used as the shared secret.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2549677"></a>Manual Generation</h4></div></div></div>
+<a name="id2549045"></a>Manual Generation</h4></div></div></div>
 <p>The shared secret is simply a random sequence of bits, encoded
 in base-64. Most ASCII strings are valid base-64 strings (assuming
 the length is a multiple of 4 and only valid characters are used),
@@ -406,13 +406,13 @@ a similar program to generate base-64 encoded data.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2549830"></a>Copying the Shared Secret to Both Machines</h3></div></div></div>
+<a name="id2549061"></a>Copying the Shared Secret to Both Machines</h3></div></div></div>
 <p>This is beyond the scope of DNS. A secure transport mechanism
 should be used. This could be secure FTP, ssh, telephone, etc.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2549838"></a>Informing the Servers of the Key's Existence</h3></div></div></div>
+<a name="id2549069"></a>Informing the Servers of the Key's Existence</h3></div></div></div>
 <p>Imagine <span class="emphasis"><em>host1</em></span> and <span class="emphasis"><em>host 2</em></span> are
 both servers. The following is added to each server's <code class="filename">named.conf</code> file:</p>
 <pre class="programlisting">
@@ -433,7 +433,7 @@ response is signed by the same key.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2549878"></a>Instructing the Server to Use the Key</h3></div></div></div>
+<a name="id2549109"></a>Instructing the Server to Use the Key</h3></div></div></div>
 <p>Since keys are shared between two hosts only, the server must
 be told when keys are to be used. The following is added to the <code class="filename">named.conf</code> file
 for <span class="emphasis"><em>host1</em></span>, if the IP address of <span class="emphasis"><em>host2</em></span> is
@@ -456,7 +456,7 @@ sign request messages to <span class="emphasis"><em>host1</em></span>.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2549998"></a>TSIG Key Based Access Control</h3></div></div></div>
+<a name="id2549229"></a>TSIG Key Based Access Control</h3></div></div></div>
 <p><span class="acronym">BIND</span> allows IP addresses and ranges to be specified in ACL
 definitions and
 <span><strong class="command">allow-{ query | transfer | update }</strong></span> directives.
@@ -474,13 +474,14 @@ allow-update { key host1-host2. ;};
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550042"></a>Errors</h3></div></div></div>
+<a name="id2549273"></a>Errors</h3></div></div></div>
 <p>The processing of TSIG signed messages can result in
-      several errors. If a signed message is sent to a non-TSIG aware
-      server, a FORMERR will be returned, since the server will not
-      understand the record. This is a result of misconfiguration,
-      since the server must be explicitly configured to send a TSIG
-      signed message to a specific server.</p>
+      several errors. If a signed message is sent to a non-TSIG
+      aware server, a FORMERR (format error) will be returned, since
+      the server will not understand the record. This is a result
+      of misconfiguration, since the server must be explicitly
+      configured to send a TSIG signed message to a specific
+      server.</p>
 <p>If a TSIG aware server receives a message signed by an
       unknown key, the response will be unsigned with the TSIG
       extended error code set to BADKEY. If a TSIG aware server
@@ -491,12 +492,12 @@ allow-update { key host1-host2. ;};
       the TSIG extended error code set to BADTIME, and the time values
       will be adjusted so that the response can be successfully
       verified. In any of these cases, the message's rcode is set to
-      NOTAUTH.</p>
+      NOTAUTH (not authenticated).</p>
 </div>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2550056"></a>TKEY</h2></div></div></div>
+<a name="id2549287"></a>TKEY</h2></div></div></div>
 <p><span><strong class="command">TKEY</strong></span> is a mechanism for automatically
     generating a shared secret between two hosts.  There are several
     "modes" of <span><strong class="command">TKEY</strong></span> that specify how the key is
@@ -523,7 +524,7 @@ allow-update { key host1-host2. ;};
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2550173"></a>SIG(0)</h2></div></div></div>
+<a name="id2549336"></a>SIG(0)</h2></div></div></div>
 <p><span class="acronym">BIND</span> 9 partially supports DNSSEC SIG(0)
     transaction signatures as specified in RFC 2535 and RFC2931.  SIG(0)
     uses public/private keys to authenticate messages.  Access control
@@ -541,9 +542,10 @@ allow-update { key host1-host2. ;};
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="DNSSEC"></a>DNSSEC</h2></div></div></div>
 <p>Cryptographic authentication of DNS information is possible
-    through the DNS Security (<span class="emphasis"><em>DNSSEC-bis</em></span>) extensions,
-    defined in RFC &lt;TBA&gt;. This section describes the creation and use
-    of DNSSEC signed zones.</p>
+    through the DNS Security (<span class="emphasis"><em>DNSSEC-bis</em></span>)
+    extensions, defined in RFC 4033, RFC4034 and RFC4035.  This
+    section describes the creation and use of DNSSEC signed
+    zones.</p>
 <p>In order to set up a DNSSEC secure zone, there are a series
     of steps which must be followed.  <span class="acronym">BIND</span> 9 ships
     with several tools
@@ -557,7 +559,7 @@ allow-update { key host1-host2. ;};
 <p>There must also be communication with the administrators of
     the parent and/or child zone to transmit keys.  A zone's security
     status must be indicated by the parent zone for a DNSSEC capable 
-    resolver to trust its data.  This is done through the presense
+    resolver to trust its data.  This is done through the presence
     or absence of a <code class="literal">DS</code> record at the delegation
     point.</p>
 <p>For other servers to trust data in this zone, they must
@@ -565,7 +567,7 @@ allow-update { key host1-host2. ;};
     zone key of another zone above this one in the DNS tree.</p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550308"></a>Generating Keys</h3></div></div></div>
+<a name="id2549470"></a>Generating Keys</h3></div></div></div>
 <p>The <span><strong class="command">dnssec-keygen</strong></span> program is used to
       generate keys.</p>
 <p>A secure zone must contain one or more zone keys.  The
@@ -598,7 +600,7 @@ allow-update { key host1-host2. ;};
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550375"></a>Signing the Zone</h3></div></div></div>
+<a name="id2549606"></a>Signing the Zone</h3></div></div></div>
 <p>The <span><strong class="command">dnssec-signzone</strong></span> program is used to
       sign a zone.</p>
 <p>Any <code class="filename">keyset</code> files corresponding
@@ -625,19 +627,93 @@ allow-update { key host1-host2. ;};
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550450"></a>Configuring Servers</h3></div></div></div>
-<p>Unlike <span class="acronym">BIND</span> 8, 
-<span class="acronym">BIND</span> 9 does not verify signatures on load,
-so zone keys for authoritative zones do not need to be specified
-in the configuration file.</p>
-<p>The public key for any security root must be present in
-the configuration file's <span><strong class="command">trusted-keys</strong></span>
-statement, as described later in this document. </p>
+<a name="id2549681"></a>Configuring Servers</h3></div></div></div>
+<p>
+	  To enable <span><strong class="command">named</strong></span> to respond appropriately
+	  to DNS requests from DNSSEC aware clients
+	  <span><strong class="command">dnssec-enable</strong></span> must be set to yes.
+          </p>
+<p>
+	  To enable <span><strong class="command">named</strong></span> to validate answers from
+	  other servers <span><strong class="command">dnssec-enable</strong></span> and
+	  some <span><strong class="command">trusted-keys</strong></span> must be configured
+	  into <code class="filename">named.conf</code>.
+          </p>
+<p>
+	  <span><strong class="command">trusted-keys</strong></span> are copies of DNSKEY RRs
+	  for zones that are used to form the first link in the
+	  cryptographic chain of trust.  All keys listed in
+	  <span><strong class="command">trusted-keys</strong></span> (and corresponding zones)
+	  are deemed to exist and only the listed keys will be used
+	  to validated the DNSKEY RRset that they are from.
+	</p>
+<p>
+	  <span><strong class="command">trusted-keys</strong></span> are described in more detail
+	  later in this document.
+	</p>
+<p>
+	  Unlike <span class="acronym">BIND</span> 8, <span class="acronym">BIND</span>
+	  9 does not verify signatures on load, so zone keys for
+	  authoritative zones do not need to be specified in the
+	  configuration file.
+	</p>
+<p>
+	  After DNSSEC gets established, a typical DNSSEC configuration
+	  will look something like the following.  It has a one or
+	  more public keys for the root.  This allows answers from
+	  outside the organization to be validated.  It will also
+	  have several keys for parts of the namespace the organization
+	  controls.  These are here to ensure that named is immune
+	  to compromises in the DNSSEC components of the security
+	  of parent zones.
+	</p>
+<pre class="programlisting">
+trusted-keys {
+
+	/* Root Key */
+"." 257 3 3 "BNY4wrWM1nCfJ+CXd0rVXyYmobt7sEEfK3clRbGaTwSJxrGkxJWoZu6I7PzJu/
+	     E9gx4UC1zGAHlXKdE4zYIpRhaBKnvcC2U9mZhkdUpd1Vso/HAdjNe8LmMlnzY3
+	     zy2Xy4klWOADTPzSv9eamj8V18PHGjBLaVtYvk/ln5ZApjYghf+6fElrmLkdaz
+	     MQ2OCnACR817DF4BBa7UR/beDHyp5iWTXWSi6XmoJLbG9Scqc7l70KDqlvXR3M
+	     /lUUVRbkeg1IPJSidmK3ZyCllh4XSKbje/45SKucHgnwU5jefMtq66gKodQj+M
+	     iA21AfUVe7u99WzTLzY3qlxDhxYQQ20FQ97S+LKUTpQcq27R7AT3/V5hRQxScI
+	     Nqwcz4jYqZD2fQdgxbcDTClU0CRBdiieyLMNzXG3";
+
+/* Key for out organizations forward zone */
+example.com. 257 3 5 "AwEAAaxPMcR2x0HbQV4WeZB6oEDX+r0QM65KbhTjrW1ZaARmPhEZZe
+                      3Y9ifgEuq7vZ/zGZUdEGNWy+JZzus0lUptwgjGwhUS1558Hb4JKUbb
+	              OTcM8pwXlj0EiX3oDFVmjHO444gLkBO UKUf/mC7HvfwYH/Be22GnC
+		      lrinKJp1Og4ywzO9WglMk7jbfW33gUKvirTHr25GL7STQUzBb5Usxt
+		      8lgnyTUHs1t3JwCY5hKZ6CqFxmAVZP20igTixin/1LcrgX/KMEGd/b
+		      iuvF4qJCyduieHukuY3H4XMAcR+xia2 nIUPvm/oyWR8BW/hWdzOvn
+		      SCThlHf3xiYleDbt/o1OTQ09A0=";
+
+/* Key for our reverse zone. */
+2.0.192.IN-ADDRPA.NET. 257 3 5 "AQOnS4xn/IgOUpBPJ3bogzwcxOdNax071L18QqZnQQQA
+                                VVr+iLhGTnNGp3HoWQLUIzKrJVZ3zggy3WwNT6kZo6c0
+				tszYqbtvchmgQC8CzKojM/W16i6MG/ea fGU3siaOdS0
+				yOI6BgPsw+YZdzlYMaIJGf4M4dyoKIhzdZyQ2bYQrjyQ
+				4LB0lC7aOnsMyYKHHYeRv PxjIQXmdqgOJGq+vsevG06
+			        zW+1xgYJh9rCIfnm1GX/KMgxLPG2vXTD/RnLX+D3T3UL
+				7HJYHJhAZD5L59VvjSPsZJHeDCUyWYrvPZesZDIRvhDD
+				52SKvbheeTJUm6EhkzytNN2SN96QRk8j/iI8ib";
+};
+
+options {
+	...
+	dnssec-enable yes;
+};
+</pre>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+	  None of the keys listed in this example are valid.  In particular,
+	  the root key is not valid.
+	</div>
 </div>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2550473"></a>IPv6 Support in <span class="acronym">BIND</span> 9</h2></div></div></div>
+<a name="id2549750"></a>IPv6 Support in <span class="acronym">BIND</span> 9</h2></div></div></div>
 <p><span class="acronym">BIND</span> 9 fully supports all currently defined forms of IPv6
     name to address and address to name lookups.  It will also use
     IPv6 addresses to make queries when running on an IPv6 capable
@@ -666,7 +742,7 @@ statement, as described later in this document. </p>
     see <a href="Bv9ARM.ch09.html#ipv6addresses" title="IPv6 addresses (AAAA)">the section called &#8220;IPv6 addresses (AAAA)&#8221;</a>.</p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550600"></a>Address Lookups Using AAAA Records</h3></div></div></div>
+<a name="id2549877"></a>Address Lookups Using AAAA Records</h3></div></div></div>
 <p>The AAAA record is a parallel to the IPv4 A record.  It
       specifies the entire address in a single record.  For
       example,</p>
@@ -681,7 +757,7 @@ host            3600    IN      AAAA    2001:db8::1
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2550620"></a>Address to Name Lookups Using Nibble Format</h3></div></div></div>
+<a name="id2549965"></a>Address to Name Lookups Using Nibble Format</h3></div></div></div>
 <p>When looking up an address in nibble format, the address
       components are simply reversed, just as in IPv4, and
       <code class="literal">ip6.arpa.</code> is appended to the resulting name.
diff --git a/doc/arm/Bv9ARM.ch05.html b/doc/arm/Bv9ARM.ch05.html
index 1720660b..29e741c5 100644
--- a/doc/arm/Bv9ARM.ch05.html
+++ b/doc/arm/Bv9ARM.ch05.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch05.html,v 1.24.2.5.2.12 2005/10/13 02:34:00 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch05.html,v 1.24.2.5.2.16 2006/05/17 02:38:10 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,13 +45,13 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch05.html#id2550652">The Lightweight Resolver Library</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch05.html#id2549997">The Lightweight Resolver Library</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch05.html#lwresd">Running a Resolver Daemon</a></span></dt>
 </dl>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2550652"></a>The Lightweight Resolver Library</h2></div></div></div>
+<a name="id2549997"></a>The Lightweight Resolver Library</h2></div></div></div>
 <p>Traditionally applications have been linked with a stub resolver
 library that sends recursive DNS queries to a local caching name
 server.</p>
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 4b530006..aca0d906 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch06.html,v 1.56.2.12.2.30 2005/10/13 02:34:00 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch06.html,v 1.56.2.12.2.37 2006/05/17 02:38:10 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -48,46 +48,46 @@
 <dt><span class="sect1"><a href="Bv9ARM.ch06.html#configuration_file_elements">Configuration File Elements</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#address_match_lists">Address Match Lists</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551817">Comment Syntax</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551026">Comment Syntax</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch06.html#Configuration_File_Grammar">Configuration File Grammar</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552302"><span><strong class="command">acl</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551511"><span><strong class="command">acl</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#acl"><span><strong class="command">acl</strong></span> Statement Definition and
 Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552471"><span><strong class="command">controls</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551680"><span><strong class="command">controls</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#controls_statement_definition_and_usage"><span><strong class="command">controls</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552808"><span><strong class="command">include</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552823"><span><strong class="command">include</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552845"><span><strong class="command">key</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552867"><span><strong class="command">key</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553006"><span><strong class="command">logging</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553269"><span><strong class="command">logging</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554474"><span><strong class="command">lwres</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554547"><span><strong class="command">lwres</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554610"><span><strong class="command">masters</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554653"><span><strong class="command">masters</strong></span> Statement Definition and Usage </a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554668"><span><strong class="command">options</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552093"><span><strong class="command">include</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552108"><span><strong class="command">include</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552131"><span><strong class="command">key</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552220"><span><strong class="command">key</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552360"><span><strong class="command">logging</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552486"><span><strong class="command">logging</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553623"><span><strong class="command">lwres</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553696"><span><strong class="command">lwres</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553758"><span><strong class="command">masters</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553870"><span><strong class="command">masters</strong></span> Statement Definition and Usage </a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553885"><span><strong class="command">options</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#options"><span><strong class="command">options</strong></span> Statement Definition and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#server_statement_grammar"><span><strong class="command">server</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#server_statement_definition_and_usage"><span><strong class="command">server</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562233"><span><strong class="command">trusted-keys</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562281"><span><strong class="command">trusted-keys</strong></span> Statement Definition
-and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561410"><span><strong class="command">trusted-keys</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561526"><span><strong class="command">trusted-keys</strong></span> Statement Definition
+	    and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#view_statement_grammar"><span><strong class="command">view</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562349"><span><strong class="command">view</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561608"><span><strong class="command">view</strong></span> Statement Definition and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#zone_statement_grammar"><span><strong class="command">zone</strong></span>
 Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2563022"><span><strong class="command">zone</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562891"><span><strong class="command">zone</strong></span> Statement Definition and Usage</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch06.html#id2564557">Zone File</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch06.html#id2564293">Zone File</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them">Types of Resource Records and When to Use Them</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2565990">Discussion of MX Records</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2565862">Discussion of MX Records</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#Setting_TTLs">Setting TTLs</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566487">Inverse Mapping in IPv4</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566593">Other Zone File Directives</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566761"><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566291">Inverse Mapping in IPv4</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566396">Other Zone File Directives</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566565"><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -244,7 +244,7 @@ are restricted to slave and stub zones.</p></td>
 <a name="address_match_lists"></a>Address Match Lists</h3></div></div></div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2551560"></a>Syntax</h4></div></div></div>
+<a name="id2550837"></a>Syntax</h4></div></div></div>
 <pre class="programlisting"><code class="varname">address_match_list</code> = address_match_list_element ;
   [<span class="optional"> address_match_list_element; ... </span>]
 <code class="varname">address_match_list_element</code> = [<span class="optional"> ! </span>] (ip_address [<span class="optional">/length</span>] |
@@ -253,7 +253,7 @@ are restricted to slave and stub zones.</p></td>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2551587"></a>Definition and Usage</h4></div></div></div>
+<a name="id2550864"></a>Definition and Usage</h4></div></div></div>
 <p>Address match lists are primarily used to determine access
 control for various server operations. They are also used in
 the <span><strong class="command">listen-on</strong></span> and <span><strong class="command">sortlist</strong></span>
@@ -303,14 +303,14 @@ other 1.2.3.* hosts fall through.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2551817"></a>Comment Syntax</h3></div></div></div>
+<a name="id2551026"></a>Comment Syntax</h3></div></div></div>
 <p>The <span class="acronym">BIND</span> 9 comment syntax allows for comments to appear
 anywhere that white space may appear in a <span class="acronym">BIND</span> configuration
 file. To appeal to programmers of all kinds, they can be written
 in the C, C++, or shell/perl style.</p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2551832"></a>Syntax</h4></div></div></div>
+<a name="id2551041"></a>Syntax</h4></div></div></div>
 <pre class="programlisting">/* This is a <span class="acronym">BIND</span> comment as in C */</pre>
 <p>
 </p>
@@ -323,8 +323,8 @@ in the C, C++, or shell/perl style.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2551861"></a>Definition and Usage</h4></div></div></div>
-<p>Comments may appear anywhere that whitespace may appear in
+<a name="id2551138"></a>Definition and Usage</h4></div></div></div>
+<p>Comments may appear anywhere that white space may appear in
 a <span class="acronym">BIND</span> configuration file.</p>
 <p>C-style comments start with the two characters /* (slash,
 star) and end with */ (star, slash). Because they are completely
@@ -408,7 +408,7 @@ the log messages are sent.</p></td>
 <tr>
 <td><p><span><strong class="command">lwres</strong></span></p></td>
 <td><p>configures <span><strong class="command">named</strong></span> to
-also act as a light weight resolver daemon (<span><strong class="command">lwresd</strong></span>).</p></td>
+also act as a light-weight resolver daemon (<span><strong class="command">lwresd</strong></span>).</p></td>
 </tr>
 <tr>
 <td><p><span><strong class="command">masters</strong></span></p></td>
@@ -444,7 +444,7 @@ a per-server basis.</p></td>
     configuration.</p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552302"></a><span><strong class="command">acl</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2551511"></a><span><strong class="command">acl</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting"><span><strong class="command">acl</strong></span> acl-name { 
     address_match_list 
 };
@@ -495,7 +495,7 @@ IPv6 addresses, just like <span><strong class="command">localhost</strong></span
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552471"></a><span><strong class="command">controls</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2551680"></a><span><strong class="command">controls</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting"><span><strong class="command">controls</strong></span> {
    inet ( ip_addr | * ) [<span class="optional"> port ip_port </span>] allow { <em class="replaceable"><code> address_match_list </code></em> }
                 keys { <em class="replaceable"><code> key_list </code></em> };
@@ -516,7 +516,7 @@ IPv6 addresses, just like <span><strong class="command">localhost</strong></span
       <span><strong class="command">ip_port</strong></span> on the specified
       <span><strong class="command">ip_addr</strong></span>, which can be an IPv4 or IPv6
       address.  An <span><strong class="command">ip_addr</strong></span>
-      of <code class="literal">*</code> is interpreted as the IPv4 wildcard
+      of <code class="literal">*</code> (asterisk) is interpreted as the IPv4 wildcard
       address; connections will be accepted on any of the system's
       IPv4 addresses.  To listen on the IPv6 wildcard address,
       use an <span><strong class="command">ip_addr</strong></span> of <code class="literal">::</code>.
@@ -527,7 +527,7 @@ IPv6 addresses, just like <span><strong class="command">localhost</strong></span
       </p>
 <p>
       If no port is specified, port 953
-      is used.  "<code class="literal">*</code>" cannot be used for
+      is used.  The asterisk "<code class="literal">*</code>" cannot be used for
       <span><strong class="command">ip_port</strong></span>.</p>
 <p>The ability to issue commands over the control channel is
       restricted by the <span><strong class="command">allow</strong></span> and
@@ -588,8 +588,9 @@ installed.
       <code class="filename">rndc.conf</code> and make it group readable by a group
       that contains the users who should have access.</p>
 <p>The UNIX control channel type of <span class="acronym">BIND</span> 8 is not supported
-      in <span class="acronym">BIND</span> 9, and is not expected to be added in future
-      releases.  If it is present in the controls statement from a
+      in <span class="acronym">BIND</span> 9.0, <span class="acronym">BIND</span> 9.1,
+      <span class="acronym">BIND</span> 9.2 and <span class="acronym">BIND</span> 9.3.
+      If it is present in the controls statement from a
       <span class="acronym">BIND</span> 8 configuration file, it is ignored
       and a warning is logged.</p>
 <p>
@@ -599,12 +600,12 @@ statement: <span><strong class="command">controls { };</strong></span>.
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552808"></a><span><strong class="command">include</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2552093"></a><span><strong class="command">include</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting">include <em class="replaceable"><code>filename</code></em>;</pre>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552823"></a><span><strong class="command">include</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2552108"></a><span><strong class="command">include</strong></span> Statement Definition and Usage</h3></div></div></div>
 <p>The <span><strong class="command">include</strong></span> statement inserts the
       specified file at the point where the <span><strong class="command">include</strong></span>
       statement is encountered. The <span><strong class="command">include</strong></span>
@@ -615,7 +616,7 @@ statement: <span><strong class="command">controls { };</strong></span>.
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552845"></a><span><strong class="command">key</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2552131"></a><span><strong class="command">key</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting">key <em class="replaceable"><code>key_id</code></em> {
     algorithm <em class="replaceable"><code>string</code></em>;
     secret <em class="replaceable"><code>string</code></em>;
@@ -624,7 +625,7 @@ statement: <span><strong class="command">controls { };</strong></span>.
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2552867"></a><span><strong class="command">key</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2552220"></a><span><strong class="command">key</strong></span> Statement Definition and Usage</h3></div></div></div>
 <p>The <span><strong class="command">key</strong></span> statement defines a shared
 secret key for use with TSIG (see <a href="Bv9ARM.ch04.html#tsig" title="TSIG">the section called &#8220;TSIG&#8221;</a>)
 or the command channel
@@ -656,7 +657,7 @@ string.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2553006"></a><span><strong class="command">logging</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2552360"></a><span><strong class="command">logging</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting"><span><strong class="command">logging</strong></span> {
    [ <span><strong class="command">channel</strong></span> <em class="replaceable"><code>channel_name</code></em> {
      ( <span><strong class="command">file</strong></span> <em class="replaceable"><code>path name</code></em>
@@ -680,7 +681,7 @@ string.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2553269"></a><span><strong class="command">logging</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2552486"></a><span><strong class="command">logging</strong></span> Statement Definition and Usage</h3></div></div></div>
 <p>The <span><strong class="command">logging</strong></span> statement configures a wide
 variety of logging options for the name server. Its <span><strong class="command">channel</strong></span> phrase
 associates output methods, format options and severity levels with
@@ -703,7 +704,7 @@ channels, or to standard error if the "<code class="option">-g</code>" option
 was specified.</p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2553321"></a>The <span><strong class="command">channel</strong></span> Phrase</h4></div></div></div>
+<a name="id2552538"></a>The <span><strong class="command">channel</strong></span> Phrase</h4></div></div></div>
 <p>All log output goes to one or more <span class="emphasis"><em>channels</em></span>;
 you can make as many of them as you want.</p>
 <p>Every channel definition must include a destination clause that
@@ -794,7 +795,7 @@ level is set either by starting the <span><strong class="command">named</strong>
 with the <code class="option">-d</code> flag followed by a positive integer,
 or by running <span><strong class="command">rndc trace</strong></span>.
 The global debug level
-can be set to zero, and debugging mode turned off, by running <span><strong class="command">ndc
+can be set to zero, and debugging mode turned off, by running <span><strong class="command">rndc
 notrace</strong></span>. All debugging messages in the server have a debug
 level, and higher debug levels give more detailed output. Channels
 that specify a specific debug severity, for example:</p>
@@ -853,7 +854,7 @@ channel null {
 </pre>
 <p>The <span><strong class="command">default_debug</strong></span> channel has the special
 property that it only produces output when the server's debug level is
-nonzero.  It normally writes to a file <code class="filename">named.run</code>
+nonzero.  It normally writes to a file called <code class="filename">named.run</code>
 in the server's working directory.</p>
 <p>For security reasons, when the "<code class="option">-u</code>"
 command line option is used, the <code class="filename">named.run</code> file
@@ -972,7 +973,7 @@ the <span><strong class="command">null</strong></span> channel.</p></td>
 <td>
 <p>Specify where queries should be logged to.</p>
 <p>
-At startup, specifing the category <span><strong class="command">queries</strong></span> will also
+At startup, specifying the category <span><strong class="command">queries</strong></span> will also
 enable query logging unless <span><strong class="command">querylog</strong></span> option has been
 specified.
 </p>
@@ -1018,7 +1019,7 @@ a <span><strong class="command">delegation-only</strong></span> in a hint or stu
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2554474"></a><span><strong class="command">lwres</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2553623"></a><span><strong class="command">lwres</strong></span> Statement Grammar</h3></div></div></div>
 <p> This is the grammar of the <span><strong class="command">lwres</strong></span>
 statement in the <code class="filename">named.conf</code> file:</p>
 <pre class="programlisting"><span><strong class="command">lwres</strong></span> {
@@ -1031,10 +1032,10 @@ statement in the <code class="filename">named.conf</code> file:</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2554547"></a><span><strong class="command">lwres</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2553696"></a><span><strong class="command">lwres</strong></span> Statement Definition and Usage</h3></div></div></div>
 <p>The <span><strong class="command">lwres</strong></span> statement configures the name
-server to also act as a lightweight resolver server, see
-<a href="Bv9ARM.ch05.html#lwresd" title="Running a Resolver Daemon">the section called &#8220;Running a Resolver Daemon&#8221;</a>.  There may be be multiple
+server to also act as a lightweight resolver server. (See
+<a href="Bv9ARM.ch05.html#lwresd" title="Running a Resolver Daemon">the section called &#8220;Running a Resolver Daemon&#8221;</a>.)  There may be be multiple
 <span><strong class="command">lwres</strong></span> statements configuring
 lightweight resolver servers with different properties.</p>
 <p>The <span><strong class="command">listen-on</strong></span> statement specifies a list of
@@ -1059,20 +1060,20 @@ exact match lookup before search path elements are appended.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2554610"></a><span><strong class="command">masters</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2553758"></a><span><strong class="command">masters</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting">
 <span><strong class="command">masters</strong></span> <em class="replaceable"><code>name</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] { ( <em class="replaceable"><code>masters_list</code></em> | <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">key <em class="replaceable"><code>key</code></em></span>] ) ; [<span class="optional">...</span>] } ; 
 </pre>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2554653"></a><span><strong class="command">masters</strong></span> Statement Definition and Usage </h3></div></div></div>
+<a name="id2553870"></a><span><strong class="command">masters</strong></span> Statement Definition and Usage </h3></div></div></div>
 <p><span><strong class="command">masters</strong></span> lists allow for a common set of masters
 to be easily used by multiple stub and slave zones.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2554668"></a><span><strong class="command">options</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2553885"></a><span><strong class="command">options</strong></span> Statement Grammar</h3></div></div></div>
 <p>This is the grammar of the <span><strong class="command">options</strong></span>
 statement in the <code class="filename">named.conf</code> file:</p>
 <pre class="programlisting">options {
@@ -1254,7 +1255,7 @@ double quotes.</p></dd>
 to when instructed to do so using <span><strong class="command">rndc stats</strong></span>.
 If not specified, the default is <code class="filename">named.stats</code> in the
 server's current directory.  The format of the file is described
-in <a href="Bv9ARM.ch06.html#statsfile" title="The Statistics File">the section called &#8220;The Statistics File&#8221;</a></p></dd>
+in <a href="Bv9ARM.ch06.html#statsfile" title="The Statistics File">the section called &#8220;The Statistics File&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">port</strong></span></span></dt>
 <dd><p>
 The UDP/TCP port number the server uses for 
@@ -1284,8 +1285,8 @@ The default is not to preference any type (NONE).
 <dt><span class="term"><span><strong class="command">root-delegation-only</strong></span></span></dt>
 <dd>
 <p>
-Turn on enforcement of delegation-only in TLDs and root zones with an optional
-exclude list.
+Turn on enforcement of delegation-only in TLDs (top level domains)
+and root zones with an optional exclude list.
 </p>
 <p>
 Note some TLDs are NOT delegation only (e.g. "DE", "LV", "US" and "MUSEUM").
@@ -1441,7 +1442,7 @@ data section of a response.  This is now considered a bad idea
 and BIND 9 never does it.</p></dd>
 <dt><span class="term"><span><strong class="command">flush-zones-on-shutdown</strong></span></span></dt>
 <dd><p>When the nameserver exits due receiving SIGTERM,
-flush / do not flush any pending zone writes.  The default is
+flush or do not flush any pending zone writes.  The default is
 <span><strong class="command">flush-zones-on-shutdown</strong></span> <strong class="userinput"><code>no</code></strong>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">has-old-clients</strong></span></span></dt>
@@ -1545,13 +1546,13 @@ in <a href="Bv9ARM.ch06.html#server_statement_definition_and_usage" title="serve
 <dd><p>
 See the description of
 <span><strong class="command">provide-ixfr</strong></span> in
-<a href="Bv9ARM.ch06.html#server_statement_definition_and_usage" title="server Statement Definition and Usage">the section called &#8220;<span><strong class="command">server</strong></span> Statement Definition and Usage&#8221;</a>
+<a href="Bv9ARM.ch06.html#server_statement_definition_and_usage" title="server Statement Definition and Usage">the section called &#8220;<span><strong class="command">server</strong></span> Statement Definition and Usage&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">request-ixfr</strong></span></span></dt>
 <dd><p>
 See the description of
 <span><strong class="command">request-ixfr</strong></span> in
-<a href="Bv9ARM.ch06.html#server_statement_definition_and_usage" title="server Statement Definition and Usage">the section called &#8220;<span><strong class="command">server</strong></span> Statement Definition and Usage&#8221;</a>
+<a href="Bv9ARM.ch06.html#server_statement_definition_and_usage" title="server Statement Definition and Usage">the section called &#8220;<span><strong class="command">server</strong></span> Statement Definition and Usage&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">treat-cr-as-space</strong></span></span></dt>
 <dd><p>This option was used in <span class="acronym">BIND</span> 8 to make
@@ -1682,7 +1683,7 @@ For <span><strong class="command">slave</strong></span> zones the default is <sp
 For answer received from the network (<span><strong class="command">response</strong></span>)
 the default is <span><strong class="command">ignore</strong></span>.
 </p>
-<p>The rules for legal hostnames / mail domains are derived from RFC 952
+<p>The rules for legal hostnames or mail domains are derived from RFC 952
 and RFC 821 as modified by RFC 1123.
 </p>
 <p><span><strong class="command">check-names</strong></span> applies to the owner names of A, AAA and
@@ -1696,7 +1697,7 @@ IN-ADDR.ARPA, IP6.ARPA, IP6.INT).
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2557350"></a>Forwarding</h4></div></div></div>
+<a name="id2556500"></a>Forwarding</h4></div></div></div>
 <p>The forwarding facility can be used to create a large site-wide
 cache on a few servers, reducing traffic over links to external
 name servers. It can also be used to allow queries by servers that
@@ -1728,13 +1729,13 @@ Statement Grammar&#8221;</a>.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2557400"></a>Dual-stack Servers</h4></div></div></div>
+<a name="id2556550"></a>Dual-stack Servers</h4></div></div></div>
 <p>Dual-stack servers are used as servers of last resort to work around
 problems in reachability due the lack of support for either IPv4 or IPv6
 on the host machine.</p>
 <div class="variablelist"><dl>
 <dt><span class="term"><span><strong class="command">dual-stack-servers</strong></span></span></dt>
-<dd><p>Specifies host names / addresses of machines with access to
+<dd><p>Specifies host names or addresses of machines with access to
 both IPv4 and IPv6 transports. If a hostname is used the server must be able
 to resolve the name using only the transport it has.  If the machine is dual
 stacked then the <span><strong class="command">dual-stack-servers</strong></span> have no effect unless
@@ -1809,7 +1810,7 @@ from these addresses will not be responded to. The default is <strong class="use
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2557716"></a>Interfaces</h4></div></div></div>
+<a name="id2556934"></a>Interfaces</h4></div></div></div>
 <p>The interfaces and ports that the server will answer queries
 from may be specified using the <span><strong class="command">listen-on</strong></span> option. <span><strong class="command">listen-on</strong></span> takes
 an optional port, and an <code class="varname">address_match_list</code>.
@@ -1859,7 +1860,7 @@ the server will not listen on any IPv6 address.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2557804"></a>Query Address</h4></div></div></div>
+<a name="id2557022"></a>Query Address</h4></div></div></div>
 <p>If the server doesn't know the answer to a question, it will
 query other name servers. <span><strong class="command">query-source</strong></span> specifies
 the address and port used for such queries. For queries sent over
@@ -1885,6 +1886,13 @@ unprivileged port.</p>
 <p>See also <span><strong class="command">transfer-source</strong></span> and
 <span><strong class="command">notify-source</strong></span>.</p>
 </div>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+<p>
+	    Solaris 2.5.1 and earlier does not support setting the source
+	    address for TCP sockets.
+	  </p>
+</div>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
@@ -1950,7 +1958,8 @@ resource record transferred.
 possible into a message. <span><strong class="command">many-answers</strong></span> is more
 efficient, but is only supported by relatively new slave servers,
 such as <span class="acronym">BIND</span> 9, <span class="acronym">BIND</span> 8.x and patched
-versions of <span class="acronym">BIND</span> 4.9.5. The default is
+versions of <span class="acronym">BIND</span> 4.9.5. The <span><strong class="command">many-answers</strong></span>
+format is also supported by recent Microsoft Windows nameservers. The default is
 <span><strong class="command">many-answers</strong></span>. <span><strong class="command">transfer-format</strong></span>
 may be overridden on a per-server basis by using the
 <span><strong class="command">server</strong></span> statement.
@@ -2017,15 +2026,24 @@ except zone transfers are performed using IPv6.</p></dd>
 specified this defaults to <span><strong class="command">no</strong></span> otherwise it defaults to
 <span><strong class="command">yes</strong></span> (for BIND 8 compatibility).</p></dd>
 <dt><span class="term"><span><strong class="command">notify-source</strong></span></span></dt>
-<dd><p><span><strong class="command">notify-source</strong></span> determines
+<dd>
+<p><span><strong class="command">notify-source</strong></span> determines
 which local source address, and optionally UDP port, will be used to
 send NOTIFY messages.
 This address must appear in the slave server's <span><strong class="command">masters</strong></span>
 zone clause or in an <span><strong class="command">allow-notify</strong></span> clause.
 This statement sets the <span><strong class="command">notify-source</strong></span> for all zones,
-but can be overridden on a per-zone / per-view basis by including a
+but can be overridden on a per-zone or per-view basis by including a
 <span><strong class="command">notify-source</strong></span> statement within the <span><strong class="command">zone</strong></span>
-or <span><strong class="command">view</strong></span> block in the configuration file.</p></dd>
+or <span><strong class="command">view</strong></span> block in the configuration file.</p>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+<p>
+                   Solaris 2.5.1 and earlier does not support setting the
+                   source address for TCP sockets.
+                 </p>
+</div>
+</dd>
 <dt><span class="term"><span><strong class="command">notify-source-v6</strong></span></span></dt>
 <dd><p>Like <span><strong class="command">notify-source</strong></span>,
 but applies to notify messages sent to IPv6 addresses.</p></dd>
@@ -2033,7 +2051,7 @@ but applies to notify messages sent to IPv6 addresses.</p></dd>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2558398"></a>Bad UDP Port Lists</h4></div></div></div>
+<a name="id2545549"></a>Bad UDP Port Lists</h4></div></div></div>
 <p>
 <span><strong class="command">avoid-v4-udp-ports</strong></span> and <span><strong class="command">avoid-v6-udp-ports</strong></span>
 specify a list of IPv4 and IPv6 UDP ports that will not be used as system
@@ -2046,15 +2064,15 @@ to query again.
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2558414"></a>Operating System Resource Limits</h4></div></div></div>
+<a name="id2545565"></a>Operating System Resource Limits</h4></div></div></div>
 <p>The server's usage of many system resources can be limited.
 Scaled values are allowed when specifying resource limits.  For
 example, <span><strong class="command">1G</strong></span> can be used instead of
 <span><strong class="command">1073741824</strong></span> to specify a limit of one
 gigabyte. <span><strong class="command">unlimited</strong></span> requests unlimited use, or the
 maximum available amount. <span><strong class="command">default</strong></span> uses the limit
-that was in force when the server was started. See the description of
-<span><strong class="command">size_spec</strong></span> in <a href="Bv9ARM.ch06.html#configuration_file_elements" title="Configuration File Elements">the section called &#8220;Configuration File Elements&#8221;</a>.</p>
+that was in force when the server was started. See the description
+of <span><strong class="command">size_spec</strong></span> in <a href="Bv9ARM.ch06.html#configuration_file_elements" title="Configuration File Elements">the section called &#8220;Configuration File Elements&#8221;</a>.</p>
 <p>The following options set operating system resource limits for
 the name server process.  Some operating systems don't support some or
 any of the limits. On such systems, a warning will be issued if the
@@ -2090,7 +2108,7 @@ may use. The default is <code class="literal">default</code>.</p></dd>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2558584"></a>Server  Resource Limits</h4></div></div></div>
+<a name="id2545735"></a>Server  Resource Limits</h4></div></div></div>
 <p>The following options set limits on the server's
 resource consumption that are enforced internally by the
 server rather than the operating system.</p>
@@ -2103,7 +2121,7 @@ function in BIND 8.
 </p></dd>
 <dt><span class="term"><span><strong class="command">max-journal-size</strong></span></span></dt>
 <dd><p>Sets a maximum size for each journal file
-(<a href="Bv9ARM.ch04.html#journal" title="The journal file">the section called &#8220;The journal file&#8221;</a>).  When the journal file approaches
+(see <a href="Bv9ARM.ch04.html#journal" title="The journal file">the section called &#8220;The journal file&#8221;</a>).  When the journal file approaches
 the specified size, some of the oldest transactions in the journal
 will be automatically removed.  The default is
 <code class="literal">unlimited</code>.</p></dd>
@@ -2144,7 +2162,7 @@ silently raised.
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2558765"></a>Periodic Task Intervals</h4></div></div></div>
+<a name="id2559843"></a>Periodic Task Intervals</h4></div></div></div>
 <div class="variablelist"><dl>
 <dt><span class="term"><span><strong class="command">cleaning-interval</strong></span></span></dt>
 <dd><p>The server will remove expired resource records
@@ -2368,7 +2386,7 @@ in seconds. The default
 <span><strong class="command">max-ncache-ttl</strong></span> cannot exceed 7 days and will
 be silently truncated to 7 days if set to a greater value.</p></dd>
 <dt><span class="term"><span><strong class="command">max-cache-ttl</strong></span></span></dt>
-<dd><p><span><strong class="command">max-cache-ttl</strong></span> sets
+<dd><p>Sets
 the maximum time for which the server will cache ordinary (positive)
 answers. The default is one week (7 days).</p></dd>
 <dt><span class="term"><span><strong class="command">min-roots</strong></span></span></dt>
@@ -2378,7 +2396,7 @@ is required for a request for the root servers to be accepted. Default
 is <strong class="userinput"><code>2</code></strong>.</p>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
-<p>Not implemented in <span class="acronym">BIND</span>9.</p>
+<p>Not implemented in <span class="acronym">BIND</span> 9.</p>
 </div>
 </dd>
 <dt><span class="term"><span><strong class="command">sig-validity-interval</strong></span></span></dt>
@@ -2446,7 +2464,7 @@ disables processing of the queries.</p></dd>
 the name <code class="filename">hostname.bind</code>
 with type <span><strong class="command">TXT</strong></span>, class <span><strong class="command">CHAOS</strong></span>.
 This defaults to the hostname of the machine hosting the name server as
-found by gethostname().  The primary purpose of such queries is to
+found by the gethostname() function.  The primary purpose of such queries is to
 identify which of a group of anycast servers is actually
 answering your queries.  Specifying <span><strong class="command">hostname none;</strong></span>
 disables processing of the queries.</p></dd>
@@ -2459,7 +2477,7 @@ identify which of a group of anycast servers is actually
 answering your queries.  Specifying <span><strong class="command">server-id none;</strong></span>
 disables processing of the queries.
 Specifying <span><strong class="command">server-id hostname;</strong></span> will cause named to
-use the hostname as found by gethostname().
+use the hostname as found by the gethostname() function.
 The default <span><strong class="command">server-id</strong></span> is <span><strong class="command">none</strong></span>.
 </p></dd>
 </dl></div>
@@ -2471,16 +2489,25 @@ The default <span><strong class="command">server-id</strong></span> is <span><st
 is similar, but not identical, to that
 generated by <span class="acronym">BIND</span> 8.
 </p>
-<p>The statistics dump begins with the line <span><strong class="command">+++ Statistics Dump
-+++ (973798949)</strong></span>, where the number in parentheses is a standard
+<p>The statistics dump begins with a line, like:</p>
+<p>
+ <span><strong class="command">+++ Statistics Dump +++ (973798949)</strong></span>
+ </p>
+<p>The numberr in parentheses is a standard
 Unix-style timestamp, measured as seconds since January 1, 1970.  Following
 that line are a series of lines containing a counter type, the value of the
 counter, optionally a zone name, and optionally a view name.
 The lines without view and zone listed are global statistics for the entire server.
 Lines with a zone and view name for the given view and zone (the view name is
-omitted for the default view).  The statistics dump ends
-with the line <span><strong class="command">--- Statistics Dump --- (973798949)</strong></span>, where the
-number is identical to the number in the beginning line.</p>
+omitted for the default view).
+</p>
+<p>
+The statistics dump ends with the line where the
+number is identical to the number in the beginning line; for example:
+</p>
+<p>
+<span><strong class="command">--- Statistics Dump --- (973798949)</strong></span>
+</p>
 <p>The following statistics counters are maintained:</p>
 <div class="informaltable"><table border="1">
 <colgroup>
@@ -2630,7 +2657,7 @@ Form more details, see the description of
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2562233"></a><span><strong class="command">trusted-keys</strong></span> Statement Grammar</h3></div></div></div>
+<a name="id2561410"></a><span><strong class="command">trusted-keys</strong></span> Statement Grammar</h3></div></div></div>
 <pre class="programlisting">trusted-keys {
     <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>string</code></em> ;
     [<span class="optional"> <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>string</code></em> ; [<span class="optional">...</span>]</span>]
@@ -2639,19 +2666,33 @@ Form more details, see the description of
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2562281"></a><span><strong class="command">trusted-keys</strong></span> Statement Definition
-and Usage</h3></div></div></div>
-<p>The <span><strong class="command">trusted-keys</strong></span> statement defines DNSSEC
-security roots. DNSSEC is described in <a href="Bv9ARM.ch04.html#DNSSEC" title="DNSSEC">the section called &#8220;DNSSEC&#8221;</a>. A security root is defined when the public key for a non-authoritative
-zone is known, but cannot be securely obtained through DNS, either
-because it is the  DNS root zone or because its parent zone is unsigned.
-Once a key has been configured as a trusted key, it is treated as
-if it had been validated and proven secure. The resolver attempts
-DNSSEC validation on all DNS data in subdomains of a security root.</p>
-<p>The <span><strong class="command">trusted-keys</strong></span> statement can contain
-multiple key entries, each consisting of the key's domain name,
-flags, protocol, algorithm, and the base-64 representation of the
-key data.</p>
+<a name="id2561526"></a><span><strong class="command">trusted-keys</strong></span> Statement Definition
+	    and Usage</h3></div></div></div>
+<p>
+	    The <span><strong class="command">trusted-keys</strong></span> statement defines
+	    DNSSEC security roots. DNSSEC is described in <a href="Bv9ARM.ch04.html#DNSSEC" title="DNSSEC">the section called &#8220;DNSSEC&#8221;</a>. A security root is defined when the
+	    public key for a non-authoritative zone is known, but
+	    cannot be securely obtained through DNS, either because
+	    it is the DNS root zone or because its parent zone is
+	    unsigned.  Once a key has been configured as a trusted
+	    key, it is treated as if it had been validated and
+	    proven secure. The resolver attempts DNSSEC validation
+	    on all DNS data in subdomains of a security root.
+  	  </p>
+<p>
+	    All keys (and corresponding zones) listed in
+	    <span><strong class="command">trusted-keys</strong></span> are deemed to exist regardless
+	    of what parent zones say.  Similarly for all keys listed in
+	    <span><strong class="command">trusted-keys</strong></span> only those keys are
+	    used to validate the DNSKEY RRset.  The parents DS RRset
+	    will not be used.
+  	  </p>
+<p>
+	    The <span><strong class="command">trusted-keys</strong></span> statement can contain
+	    multiple key entries, each consisting of the key's
+	    domain name, flags, protocol, algorithm, and the Base-64
+	    representation of the key data.
+	  </p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
@@ -2668,7 +2709,7 @@ key data.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2562349"></a><span><strong class="command">view</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2561608"></a><span><strong class="command">view</strong></span> Statement Definition and Usage</h3></div></div></div>
 <p>The <span><strong class="command">view</strong></span> statement is a powerful new feature
 of <span class="acronym">BIND</span> 9 that lets a name server answer a DNS query differently
 depending on who is asking. It is particularly useful for implementing
@@ -2750,18 +2791,47 @@ view "external" {
 <div class="titlepage"><div><div><h3 class="title">
 <a name="zone_statement_grammar"></a><span><strong class="command">zone</strong></span>
 Statement Grammar</h3></div></div></div>
-<pre class="programlisting">zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] [<span class="optional">{ 
-    type ( master | slave | hint | stub | forward | delegation-only ) ;
-    [<span class="optional"> allow-notify { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
+<pre class="programlisting">zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type master;
     [<span class="optional"> allow-query { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
     [<span class="optional"> allow-transfer { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
     [<span class="optional"> allow-update { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
     [<span class="optional"> update-policy { <em class="replaceable"><code>update_policy_rule</code></em> [<span class="optional">...</span>] } ; </span>]
+    [<span class="optional"> also-notify { <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
+    [<span class="optional"> dialup <em class="replaceable"><code>dialup_option</code></em> ; </span>]
+    [<span class="optional"> file <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> forward (<code class="constant">only</code>|<code class="constant">first</code>) ; </span>]
+    [<span class="optional"> forwarders { [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> ixfr-base <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> ixfr-tmp-file <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> maintain-ixfr-base <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+    [<span class="optional"> max-ixfr-log-size <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-transfer-idle-out <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-transfer-time-out <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> notify <em class="replaceable"><code>yes_or_no</code></em> | <em class="replaceable"><code>explicit</code></em> ; </span>]
+    [<span class="optional"> pubkey <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> notify-source (<em class="replaceable"><code>ip4_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> notify-source-v6 (<em class="replaceable"><code>ip6_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> zone-statistics <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+    [<span class="optional"> sig-validity-interval <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> database <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> min-refresh-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-refresh-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> min-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> key-directory <em class="replaceable"><code>path_name</code></em>; </span>]
+};
+
+zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type slave;
+    [<span class="optional"> allow-notify { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
+    [<span class="optional"> allow-query { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
+    [<span class="optional"> allow-transfer { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
     [<span class="optional"> allow-update-forwarding { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
     [<span class="optional"> also-notify { <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
     [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
     [<span class="optional"> dialup <em class="replaceable"><code>dialup_option</code></em> ; </span>]
-    [<span class="optional"> delegation-only <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
     [<span class="optional"> file <em class="replaceable"><code>string</code></em> ; </span>]
     [<span class="optional"> forward (<code class="constant">only</code>|<code class="constant">first</code>) ; </span>]
     [<span class="optional"> forwarders { [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
@@ -2784,6 +2854,40 @@ Statement Grammar</h3></div></div></div>
     [<span class="optional"> notify-source (<em class="replaceable"><code>ip4_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
     [<span class="optional"> notify-source-v6 (<em class="replaceable"><code>ip6_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
     [<span class="optional"> zone-statistics <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+    [<span class="optional"> database <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> min-refresh-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-refresh-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> min-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> multi-master <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+};
+
+zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type hint;
+    [<span class="optional"> file <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> delegation-only <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+    [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; // Not Implemented. </span>]
+};
+
+zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type stub;
+    [<span class="optional"> allow-query { <em class="replaceable"><code>address_match_list</code></em> } ; </span>]
+    [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
+    [<span class="optional"> dialup <em class="replaceable"><code>dialup_option</code></em> ; </span>]
+    [<span class="optional"> delegation-only <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+    [<span class="optional"> file <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> forward (<code class="constant">only</code>|<code class="constant">first</code>) ; </span>]
+    [<span class="optional"> forwarders { [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> masters [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] { ( <em class="replaceable"><code>masters_list</code></em> | <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">key <em class="replaceable"><code>key</code></em></span>] ) ; [<span class="optional">...</span>] } ; </span>]
+    [<span class="optional"> max-transfer-idle-in <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> max-transfer-time-in <em class="replaceable"><code>number</code></em> ; </span>]
+    [<span class="optional"> pubkey <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>number</code></em> <em class="replaceable"><code>string</code></em> ; </span>]
+    [<span class="optional"> transfer-source (<em class="replaceable"><code>ip4_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> transfer-source-v6 (<em class="replaceable"><code>ip6_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> alt-transfer-source (<em class="replaceable"><code>ip4_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> alt-transfer-source-v6 (<em class="replaceable"><code>ip6_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; </span>]
+    [<span class="optional"> use-alt-transfer-source <em class="replaceable"><code>yes_or_no</code></em>; </span>]
+    [<span class="optional"> zone-statistics <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
     [<span class="optional"> sig-validity-interval <em class="replaceable"><code>number</code></em> ; </span>]
     [<span class="optional"> database <em class="replaceable"><code>string</code></em> ; </span>]
     [<span class="optional"> min-refresh-time <em class="replaceable"><code>number</code></em> ; </span>]
@@ -2791,17 +2895,26 @@ Statement Grammar</h3></div></div></div>
     [<span class="optional"> min-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
     [<span class="optional"> max-retry-time <em class="replaceable"><code>number</code></em> ; </span>]
     [<span class="optional"> multi-master <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
-    [<span class="optional"> key-directory <em class="replaceable"><code>path_name</code></em>; </span>]
+};
+
+zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type forward;
+    [<span class="optional"> forward (<code class="constant">only</code>|<code class="constant">first</code>) ; </span>]
+    [<span class="optional"> forwarders { [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> delegation-only <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
+};
 
-}</span>];
+zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em></span>] { 
+    type delegation-only;
+};
 </pre>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2563022"></a><span><strong class="command">zone</strong></span> Statement Definition and Usage</h3></div></div></div>
+<a name="id2562891"></a><span><strong class="command">zone</strong></span> Statement Definition and Usage</h3></div></div></div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2563029"></a>Zone Types</h4></div></div></div>
+<a name="id2562898"></a>Zone Types</h4></div></div></div>
 <div class="informaltable"><table border="1">
 <colgroup>
 <col>
@@ -2827,7 +2940,7 @@ Authentication to the master can also be done with per-server TSIG keys.
 If a file is specified, then the
 replica will be written to this file whenever the zone is changed,
 and reloaded from this file on a server restart. Use of a file is
-recommended, since it often speeds server start-up and eliminates
+recommended, since it often speeds server startup and eliminates
 a needless waste of bandwidth. Note that for large numbers (in the
 tens or hundreds of thousands) of zones per server, it is best to
 use a two level naming scheme for zone file names. For example,
@@ -2865,7 +2978,7 @@ configured.</p>
 <p>Stub zones can also be used as a way of forcing the resolution
 of a given domain to use a particular set of authoritative servers.
 For example, the caching name servers on a private network using
-RFC1981 addressing may be configured with stub zones for
+RFC1918 addressing may be configured with stub zones for
 <code class="literal">10.in-addr.arpa</code>
 to use a set of internal name servers as the authoritative
 servers for that domain.</p>
@@ -2914,7 +3027,7 @@ from forwarders.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2563267"></a>Class</h4></div></div></div>
+<a name="id2563340"></a>Class</h4></div></div></div>
 <p>The zone's name may optionally be followed by a class. If
 a class is not specified, class <code class="literal">IN</code> (for <code class="varname">Internet</code>),
 is assumed. This is correct for the vast majority of cases.</p>
@@ -2929,14 +3042,14 @@ in the mid-1970s. Zone data for it can be specified with the <code class="litera
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2563434"></a>Zone Options</h4></div></div></div>
+<a name="id2563371"></a>Zone Options</h4></div></div></div>
 <div class="variablelist"><dl>
 <dt><span class="term"><span><strong class="command">allow-notify</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">allow-notify</strong></span> in <a href="Bv9ARM.ch06.html#access_control" title="Access Control">the section called &#8220;Access Control&#8221;</a></p></dd>
+<span><strong class="command">allow-notify</strong></span> in <a href="Bv9ARM.ch06.html#access_control" title="Access Control">the section called &#8220;Access Control&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">allow-query</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">allow-query</strong></span> in <a href="Bv9ARM.ch06.html#access_control" title="Access Control">the section called &#8220;Access Control&#8221;</a></p></dd>
+<span><strong class="command">allow-query</strong></span> in <a href="Bv9ARM.ch06.html#access_control" title="Access Control">the section called &#8220;Access Control&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">allow-transfer</strong></span></span></dt>
 <dd><p>See the description of <span><strong class="command">allow-transfer</strong></span>
 in <a href="Bv9ARM.ch06.html#access_control" title="Access Control">the section called &#8220;Access Control&#8221;</a>.</p></dd>
@@ -3040,23 +3153,23 @@ information for this zone, which can be dumped to the
 <span><strong class="command">sig-validity-interval</strong></span> in <a href="Bv9ARM.ch06.html#tuning" title="Tuning">the section called &#8220;Tuning&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">transfer-source</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>
+<span><strong class="command">transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">transfer-source-v6</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">transfer-source-v6</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>
+<span><strong class="command">transfer-source-v6</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">alt-transfer-source</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">alt-transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>
+<span><strong class="command">alt-transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">alt-transfer-source-v6</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">alt-transfer-source-v6</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>
+<span><strong class="command">alt-transfer-source-v6</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">use-alt-transfer-source</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">use-alt-transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>
+<span><strong class="command">use-alt-transfer-source</strong></span> in <a href="Bv9ARM.ch06.html#zone_transfers" title="Zone Transfers">the section called &#8220;Zone Transfers&#8221;</a>.
 </p></dd>
 <dt><span class="term"><span><strong class="command">notify-source</strong></span></span></dt>
 <dd><p>See the description of
@@ -3077,7 +3190,7 @@ See the description in <a href="Bv9ARM.ch06.html#tuning" title="Tuning">the sect
 <span><strong class="command">ixfr-from-differences</strong></span> in <a href="Bv9ARM.ch06.html#boolean_options" title="Boolean Options">the section called &#8220;Boolean Options&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">key-directory</strong></span></span></dt>
 <dd><p>See the description of
-<span><strong class="command">key-directory</strong></span> in <a href="Bv9ARM.ch06.html#options" title="options Statement Definition and Usage">the section called &#8220;<span><strong class="command">options</strong></span> Statement Definition and Usage&#8221;</a></p></dd>
+<span><strong class="command">key-directory</strong></span> in <a href="Bv9ARM.ch06.html#options" title="options Statement Definition and Usage">the section called &#8220;<span><strong class="command">options</strong></span> Statement Definition and Usage&#8221;</a>.</p></dd>
 <dt><span class="term"><span><strong class="command">multi-master</strong></span></span></dt>
 <dd><p>See the description of
 <span><strong class="command">multi-master</strong></span> in <a href="Bv9ARM.ch06.html#boolean_options" title="Boolean Options">the section called &#8220;Boolean Options&#8221;</a>.</p></dd>
@@ -3177,7 +3290,7 @@ name, the rules are checked for each existing record type.
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2564557"></a>Zone File</h2></div></div></div>
+<a name="id2564293"></a>Zone File</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="types_of_resource_records_and_when_to_use_them"></a>Types of Resource Records and When to Use Them</h3></div></div></div>
@@ -3187,7 +3300,7 @@ Since the publication of RFC 1034, several new RRs have been identified
 and implemented in the DNS. These are also included.</p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2564576"></a>Resource Records</h4></div></div></div>
+<a name="id2564311"></a>Resource Records</h4></div></div></div>
 <p>A domain name identifies a node.  Each node has a set of
         resource information, which may be empty.  The set of resource
         information associated with a particular name is composed of
@@ -3313,7 +3426,7 @@ Experimental.</p></td>
 <tr>
 <td><p>MX</p></td>
 <td><p>identifies a mail exchange for the domain.
-a 16 bit preference value (lower is better)
+A 16 bit preference value (lower is better)
 followed by the host name of the mail exchange.
 Described in RFC 974, RFC 1035.</p></td>
 </tr>
@@ -3446,7 +3559,7 @@ used as "pointers" to other data in the DNS.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2565564"></a>Textual expression of RRs</h4></div></div></div>
+<a name="id2565436"></a>Textual expression of RRs</h4></div></div></div>
 <p>RRs are represented in binary form in the packets of the DNS
 protocol, and are usually represented in highly encoded form when
 stored in a name server or resolver.  In the examples provided in
@@ -3536,7 +3649,7 @@ each of a different class.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2565990"></a>Discussion of MX Records</h3></div></div></div>
+<a name="id2565862"></a>Discussion of MX Records</h3></div></div></div>
 <p>As described above, domain servers store information as a
 series of resource records, each of which contains a particular
 piece of information about a given domain name (which is usually,
@@ -3653,7 +3766,7 @@ can be explicitly specified, for example, <code class="literal">1h30m</code>. </
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2566487"></a>Inverse Mapping in IPv4</h3></div></div></div>
+<a name="id2566291"></a>Inverse Mapping in IPv4</h3></div></div></div>
 <p>Reverse name resolution (that is, translation from IP address
 to name) is achieved by means of the <span class="emphasis"><em>in-addr.arpa</em></span> domain
 and PTR records. Entries in the in-addr.arpa domain are made in
@@ -3691,7 +3804,7 @@ that the example is relative to the listed origin.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2566593"></a>Other Zone File Directives</h3></div></div></div>
+<a name="id2566396"></a>Other Zone File Directives</h3></div></div></div>
 <p>The Master File Format was initially defined in RFC 1035 and
 has subsequently been extended. While the Master File Format itself
 is class independent all records in a Master File must be of the same
@@ -3700,7 +3813,7 @@ class.</p>
 and <span><strong class="command">$TTL.</strong></span></p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2566612"></a>The <span><strong class="command">$ORIGIN</strong></span> Directive</h4></div></div></div>
+<a name="id2566416"></a>The <span><strong class="command">$ORIGIN</strong></span> Directive</h4></div></div></div>
 <p>Syntax: <span><strong class="command">$ORIGIN
 </strong></span><em class="replaceable"><code>domain-name</code></em> [<span class="optional"> <em class="replaceable"><code>comment</code></em></span>]</p>
 <p><span><strong class="command">$ORIGIN</strong></span> sets the domain name that will
@@ -3715,7 +3828,7 @@ WWW     CNAME   MAIN-SERVER</pre>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2566667"></a>The <span><strong class="command">$INCLUDE</strong></span> Directive</h4></div></div></div>
+<a name="id2566471"></a>The <span><strong class="command">$INCLUDE</strong></span> Directive</h4></div></div></div>
 <p>Syntax: <span><strong class="command">$INCLUDE</strong></span>
 <em class="replaceable"><code>filename</code></em> [<span class="optional">
 <em class="replaceable"><code>origin</code></em> </span>] [<span class="optional"> <em class="replaceable"><code>comment</code></em> </span>]</p>
@@ -3739,7 +3852,7 @@ This could be construed as a deviation from RFC 1035, a feature, or both.
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2566730"></a>The <span><strong class="command">$TTL</strong></span> Directive</h4></div></div></div>
+<a name="id2566534"></a>The <span><strong class="command">$TTL</strong></span> Directive</h4></div></div></div>
 <p>Syntax: <span><strong class="command">$TTL</strong></span>
 <em class="replaceable"><code>default-ttl</code></em> [<span class="optional">
 <em class="replaceable"><code>comment</code></em> </span>]</p>
@@ -3750,7 +3863,7 @@ with undefined TTLs. Valid TTLs are of the range 0-2147483647 seconds.</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2566761"></a><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</h3></div></div></div>
+<a name="id2566565"></a><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</h3></div></div></div>
 <p>Syntax: <span><strong class="command">$GENERATE</strong></span> <em class="replaceable"><code>range</code></em> <em class="replaceable"><code>lhs</code></em> [<span class="optional"><em class="replaceable"><code>ttl</code></em></span>] [<span class="optional"><em class="replaceable"><code>class</code></em></span>] <em class="replaceable"><code>type</code></em> <em class="replaceable"><code>rhs</code></em> [<span class="optional"> <em class="replaceable"><code>comment</code></em> </span>]</p>
 <p><span><strong class="command">$GENERATE</strong></span> is used to create a series of
 resource records that only differ from each other by an iterator. <span><strong class="command">$GENERATE</strong></span> can
@@ -3793,8 +3906,8 @@ e.g. <span><strong class="command">\$</strong></span>. The <span><strong class="
 by modifiers which change the offset from the iterator, field width and base. 
 Modifiers are introduced by a <span><strong class="command">{</strong></span> immediately following the
 <span><strong class="command">$</strong></span> as <span><strong class="command">${offset[,width[,base]]}</strong></span>.
-e.g. <span><strong class="command">${-20,3,d}</strong></span> which subtracts 20 from the current value,
-prints the result as a decimal in a zero padded field of with 3.  Available
+For example, <span><strong class="command">${-20,3,d}</strong></span> which subtracts 20 from the current value,
+prints the result as a decimal in a zero padded field of width 3.  Available
 output forms are decimal (<span><strong class="command">d</strong></span>), octal (<span><strong class="command">o</strong></span>)
 and hexadecimal (<span><strong class="command">x</strong></span> or <span><strong class="command">X</strong></span> for uppercase).
 The default modifier is <span><strong class="command">${0,0,d}</strong></span>.
@@ -3802,13 +3915,13 @@ If the <span><strong class="command">lhs</strong></span> is not
 absolute, the current <span><strong class="command">$ORIGIN</strong></span> is appended to
 the name.</p>
 <p>For compatibility with earlier versions <span><strong class="command">$$</strong></span> is still
-recognized a indicating a literal $ in the output.</p>
+recognized as indicating a literal $ in the output.</p>
 </td>
 </tr>
 <tr>
 <td><p><span><strong class="command">ttl</strong></span></p></td>
 <td>
-<p><span><strong class="command">ttl</strong></span> specifies the
+<p>Specifies the
 	  ttl of the generated records. If not specified this will be
 	  inherited using the normal ttl inheritance rules.</p>
 	  <p><span><strong class="command">class</strong></span> and <span><strong class="command">ttl</strong></span> can be
@@ -3818,7 +3931,7 @@ recognized a indicating a literal $ in the output.</p>
 <tr>
 <td><p><span><strong class="command">class</strong></span></p></td>
 <td>
-<p><span><strong class="command">class</strong></span> specifies the
+<p>Specifies the
 	  class of the generated records.  This must match the zone class if
 	  it is specified.</p>
 	  <p><span><strong class="command">class</strong></span> and <span><strong class="command">ttl</strong></span> can be
@@ -3832,7 +3945,7 @@ PTR, CNAME, DNAME, A, AAAA and NS.</p></td>
 </tr>
 <tr>
 <td><p><span><strong class="command">rhs</strong></span></p></td>
-<td><p>rhs is a domain name. It is processed
+<td><p>A domain name. It is processed
 similarly to lhs.</p></td>
 </tr>
 </tbody>
diff --git a/doc/arm/Bv9ARM.ch07.html b/doc/arm/Bv9ARM.ch07.html
index 86c2b6af..d8c19dad 100644
--- a/doc/arm/Bv9ARM.ch07.html
+++ b/doc/arm/Bv9ARM.ch07.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch07.html,v 1.50.2.9.2.24 2005/10/13 02:34:02 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch07.html,v 1.50.2.9.2.29 2006/05/17 02:38:10 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -46,11 +46,11 @@
 <p><b>Table of Contents</b></p>
 <dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch07.html#Access_Control_Lists">Access Control Lists</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch07.html#id2567222"><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
+<dt><span class="sect1"><a href="Bv9ARM.ch07.html#id2567021"><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
 UNIX servers)</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567366">The <span><strong class="command">chroot</strong></span> Environment</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567424">Using the <span><strong class="command">setuid</strong></span> Function</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567234">The <span><strong class="command">chroot</strong></span> Environment</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567291">Using the <span><strong class="command">setuid</strong></span> Function</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch07.html#dynamic_update_security">Dynamic Update Security</a></span></dt>
 </dl>
@@ -75,6 +75,7 @@ your server.</p>
 // Set up an ACL named "bogusnets" that will block RFC1918 space,
 // which is commonly used in spoofing attacks.
 acl bogusnets { 0.0.0.0/8; 1.0.0.0/8; 2.0.0.0/8; 192.0.2.0/24; 224.0.0.0/3; 10.0.0.0/8; 172.16.0.0/12; 192.168.0.0/16; };
+
 // Set up an ACL called our-nets. Replace this with the real IP numbers.
 acl our-nets { x.x.x.x/24; x.x.x.x/21; }; 
 options {
@@ -86,6 +87,7 @@ options {
   blackhole { bogusnets; };
   ...
 };
+
 zone "example.com" {
   type master;
   file "m/example.com";
@@ -100,7 +102,7 @@ see the <span class="emphasis"><em>AUSCERT</em></span> advisory at
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2567222"></a><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
+<a name="id2567021"></a><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
 UNIX servers)</h2></div></div></div>
 <p>On UNIX servers, it is possible to run <span class="acronym">BIND</span> in a <span class="emphasis"><em>chrooted</em></span> environment
 (<span><strong class="command">chroot()</strong></span>) by specifying the "<code class="option">-t</code>"
@@ -115,8 +117,8 @@ user 202:</p>
 <p><strong class="userinput"><code>/usr/local/bin/named -u 202 -t /var/named</code></strong></p>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2567366"></a>The <span><strong class="command">chroot</strong></span> Environment</h3></div></div></div>
-<p>In order for a <span><strong class="command">chroot()</strong></span> environment to
+<a name="id2567234"></a>The <span><strong class="command">chroot</strong></span> Environment</h3></div></div></div>
+<p>In order for a <span><strong class="command">chroot</strong></span> environment to
 work properly in a particular directory
 (for example, <code class="filename">/var/named</code>),
 you will need to set up an environment that includes everything
@@ -134,13 +136,13 @@ However, depending on your operating system, you may need
 to set up things like
 <code class="filename">/dev/zero</code>,
 <code class="filename">/dev/random</code>,
-<code class="filename">/dev/log</code>, and/or
+<code class="filename">/dev/log</code>, and
 <code class="filename">/etc/localtime</code>.
 </p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2567424"></a>Using the <span><strong class="command">setuid</strong></span> Function</h3></div></div></div>
+<a name="id2567291"></a>Using the <span><strong class="command">setuid</strong></span> Function</h3></div></div></div>
 <p>Prior to running the <span><strong class="command">named</strong></span> daemon, use
 the <span><strong class="command">touch</strong></span> utility (to change file access and
 modification times) or the <span><strong class="command">chown</strong></span> utility (to
diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
index 9d486e1b..035a713e 100644
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch08.html,v 1.50.2.9.2.24 2005/10/13 02:34:02 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch08.html,v 1.50.2.9.2.29 2006/05/17 02:38:10 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,18 +45,18 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567630">Common Problems</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch08.html#id2567636">It's not working; how can I figure out what's wrong?</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567648">Incrementing and Changing the Serial Number</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567665">Where Can I Get Help?</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567362">Common Problems</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch08.html#id2567367">It's not working; how can I figure out what's wrong?</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567447">Incrementing and Changing the Serial Number</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567464">Where Can I Get Help?</a></span></dt>
 </dl>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2567630"></a>Common Problems</h2></div></div></div>
+<a name="id2567362"></a>Common Problems</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2567636"></a>It's not working; how can I figure out what's wrong?</h3></div></div></div>
+<a name="id2567367"></a>It's not working; how can I figure out what's wrong?</h3></div></div></div>
 <p>The best solution to solving installation and
       configuration issues is to take preventative measures by setting
       up logging files beforehand. The log files provide a
@@ -66,7 +66,7 @@
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2567648"></a>Incrementing and Changing the Serial Number</h2></div></div></div>
+<a name="id2567447"></a>Incrementing and Changing the Serial Number</h2></div></div></div>
 <p>Zone serial numbers are just numbers-they aren't date
     related.  A lot of people set them to a number that represents a
     date, usually of the form YYYYMMDDRR. A number of people have been
@@ -87,7 +87,7 @@
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2567665"></a>Where Can I Get Help?</h2></div></div></div>
+<a name="id2567464"></a>Where Can I Get Help?</h2></div></div></div>
 <p>The Internet Software Consortium (<span class="acronym">ISC</span>) offers a wide range
     of support and service agreements for <span class="acronym">BIND</span> and <span class="acronym">DHCP</span> servers. Four
     levels of premium support are available and each level includes
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 8c7b2bf4..41844c32 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch09.html,v 1.50.2.9.2.25 2005/10/13 02:34:03 marka Exp $ -->
+<!-- $Id: Bv9ARM.ch09.html,v 1.50.2.9.2.31 2006/05/17 02:38:11 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -43,24 +43,24 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2567795">Acknowledgments</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2567800">A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2544793">Acknowledgments</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2544798">A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch09.html#historical_dns_information">General <span class="acronym">DNS</span> Reference Information</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#ipv6addresses">IPv6 addresses (AAAA)</a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch09.html#bibliography">Bibliography (and Suggested Reading)</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#rfcs">Request for Comments (RFCs)</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#internet_drafts">Internet Drafts</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2570087">Other Documents About <span class="acronym">BIND</span></a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2569958">Other Documents About <span class="acronym">BIND</span></a></span></dt>
 </dl></dd>
 </dl>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id2567795"></a>Acknowledgments</h2></div></div></div>
+<a name="id2544793"></a>Acknowledgments</h2></div></div></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2567800"></a>A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></h3></div></div></div>
+<a name="id2544798"></a>A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></h3></div></div></div>
 <p>Although the "official" beginning of the Domain Name
       System occurred in 1984 with the publication of RFC 920, the
       core of the new system was described in 1983 in RFCs 882 and
@@ -83,7 +83,10 @@ Center (SRI-NIC). A <span class="acronym">DNS</span> server for Unix machines, t
 Name Domain (<span class="acronym">BIND</span>) package, was written soon after by a group of
 graduate students at the University of California at Berkeley under
 a grant from the US Defense Advanced Research Projects Administration
-(DARPA). Versions of <span class="acronym">BIND</span> through 4.8.3 were maintained by the Computer
+(DARPA).
+</p>
+<p>
+Versions of <span class="acronym">BIND</span> through 4.8.3 were maintained by the Computer
 Systems Research Group (CSRG) at UC Berkeley. Douglas Terry, Mark
 Painter, David Riggle and Songnian Zhou made up the initial <span class="acronym">BIND</span>
 project team. After that, additional work on the software package
@@ -258,7 +261,7 @@ the number of the RFC). RFCs are also available via the Web at
 </p>
 <div class="bibliography">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2568712"></a>Bibliography</h4></div></div></div>
+<a name="id2568515"></a>Bibliography</h4></div></div></div>
 <div class="bibliodiv">
 <h3 class="title">Standards</h3>
 <div class="biblioentry"><p>[<span class="abbrev">RFC974</span>] <span class="author"><span class="firstname">C.</span> <span class="surname">Partridge</span>. </span><span class="title"><i>Mail Routing and the Domain System</i>. </span><span class="pubdate">January 1986. </span></p></div>
@@ -358,11 +361,11 @@ after which they are deleted unless updated by their authors.
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2570087"></a>Other Documents About <span class="acronym">BIND</span></h3></div></div></div>
+<a name="id2569958"></a>Other Documents About <span class="acronym">BIND</span></h3></div></div></div>
 <p></p>
 <div class="bibliography">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2570097"></a>Bibliography</h4></div></div></div>
+<a name="id2569968"></a>Bibliography</h4></div></div></div>
 <div class="biblioentry"><p><span class="authorgroup"><span class="firstname">Paul</span> <span class="surname">Albitz</span> and <span class="firstname">Cricket</span> <span class="surname">Liu</span>. </span><span class="title"><i><span class="acronym">DNS</span> and <span class="acronym">BIND</span></i>. </span><span class="copyright">Copyright © 1998 Sebastopol, CA: O'Reilly and Associates. </span></p></div>
 </div>
 </div>
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 71ec3299..5a608a5e 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and distribute this software for any
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.html,v 1.60.2.9.2.26 2005/10/13 02:33:59 marka Exp $ -->
+<!-- $Id: Bv9ARM.html,v 1.60.2.9.2.33 2006/05/17 02:38:11 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -40,8 +40,8 @@
 <div class="titlepage">
 <div>
 <div><h1 class="title">
-<a name="id2463864"></a>BIND 9 Administrator Reference Manual</h1></div>
-<div><p class="copyright">Copyright © 2004, 2005 Internet Systems Consortium, Inc. ("ISC")</p></div>
+<a name="id2463106"></a>BIND 9 Administrator Reference Manual</h1></div>
+<div><p class="copyright">Copyright © 2004-2006 Internet Systems Consortium, Inc. ("ISC")</p></div>
 <div><p class="copyright">Copyright © 2000-2003 Internet Software Consortium.</p></div>
 </div>
 <hr>
@@ -51,39 +51,39 @@
 <dl>
 <dt><span class="chapter"><a href="Bv9ARM.ch01.html">1. Introduction </a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545879">Scope of Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545905">Organization of This Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545976">Conventions Used in This Document</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2546234">The Domain Name System (<span class="acronym">DNS</span>)</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545129">Scope of Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545155">Organization of This Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545226">Conventions Used in This Document</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch01.html#id2545484">The Domain Name System (<span class="acronym">DNS</span>)</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546254">DNS Fundamentals</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2544105">Domains and Domain Names</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546579">Zones</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546653">Authoritative Name Servers</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546950">Caching Name Servers</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2547076">Name Servers in Multiple Roles</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545505">DNS Fundamentals</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2544038">Domains and Domain Names</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545829">Zones</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2545972">Authoritative Name Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546200">Caching Name Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch01.html#id2546326">Name Servers in Multiple Roles</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch02.html">2. <span class="acronym">BIND</span> Resource Requirements</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547108">Hardware requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547132">CPU Requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547143">Memory Requirements</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547158">Name Server Intensive Environment Issues</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2547303">Supported Operating Systems</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546358">Hardware requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546382">CPU Requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546393">Memory Requirements</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546408">Name Server Intensive Environment Issues</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch02.html#id2546485">Supported Operating Systems</a></span></dt>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch03.html">3. Name Server Configuration</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch03.html#sample_configuration">Sample Configurations</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547334">A Caching-only Name Server</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547350">An Authoritative-only Name Server</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546516">A Caching-only Name Server</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546532">An Authoritative-only Name Server</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2547372">Load Balancing</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2547656">Name Server Operations</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2546622">Load Balancing</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch03.html#id2546906">Name Server Operations</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2547661">Tools for Use With the Name Server Daemon</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2548915">Signals</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2546912">Tools for Use With the Name Server Daemon</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch03.html#id2548076">Signals</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch04.html">4. Advanced DNS Features</a></span></dt>
@@ -92,33 +92,33 @@
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#dynamic_update">Dynamic Update</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch04.html#journal">The journal file</a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#incremental_zone_transfers">Incremental Zone Transfers (IXFR)</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549203">Split DNS</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2548569">Split DNS</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#tsig">TSIG</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549627">Generate Shared Keys for Each Pair of Hosts</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549830">Copying the Shared Secret to Both Machines</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549838">Informing the Servers of the Key's Existence</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549878">Instructing the Server to Use the Key</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549998">TSIG Key Based Access Control</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550042">Errors</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2548926">Generate Shared Keys for Each Pair of Hosts</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549061">Copying the Shared Secret to Both Machines</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549069">Informing the Servers of the Key's Existence</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549109">Instructing the Server to Use the Key</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549229">TSIG Key Based Access Control</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549273">Errors</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550056">TKEY</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550173">SIG(0)</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549287">TKEY</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549336">SIG(0)</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch04.html#DNSSEC">DNSSEC</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550308">Generating Keys</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550375">Signing the Zone</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550450">Configuring Servers</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549470">Generating Keys</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549606">Signing the Zone</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549681">Configuring Servers</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2550473">IPv6 Support in <span class="acronym">BIND</span> 9</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch04.html#id2549750">IPv6 Support in <span class="acronym">BIND</span> 9</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550600">Address Lookups Using AAAA Records</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2550620">Address to Name Lookups Using Nibble Format</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549877">Address Lookups Using AAAA Records</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch04.html#id2549965">Address to Name Lookups Using Nibble Format</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch05.html">5. The <span class="acronym">BIND</span> 9 Lightweight Resolver</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch05.html#id2550652">The Lightweight Resolver Library</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch05.html#id2549997">The Lightweight Resolver Library</a></span></dt>
 <dt><span class="sect1"><a href="Bv9ARM.ch05.html#lwresd">Running a Resolver Daemon</a></span></dt>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch06.html">6. <span class="acronym">BIND</span> 9 Configuration Reference</a></span></dt>
@@ -126,77 +126,77 @@
 <dt><span class="sect1"><a href="Bv9ARM.ch06.html#configuration_file_elements">Configuration File Elements</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#address_match_lists">Address Match Lists</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551817">Comment Syntax</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551026">Comment Syntax</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch06.html#Configuration_File_Grammar">Configuration File Grammar</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552302"><span><strong class="command">acl</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551511"><span><strong class="command">acl</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#acl"><span><strong class="command">acl</strong></span> Statement Definition and
 Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552471"><span><strong class="command">controls</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2551680"><span><strong class="command">controls</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#controls_statement_definition_and_usage"><span><strong class="command">controls</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552808"><span><strong class="command">include</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552823"><span><strong class="command">include</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552845"><span><strong class="command">key</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552867"><span><strong class="command">key</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553006"><span><strong class="command">logging</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553269"><span><strong class="command">logging</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554474"><span><strong class="command">lwres</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554547"><span><strong class="command">lwres</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554610"><span><strong class="command">masters</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554653"><span><strong class="command">masters</strong></span> Statement Definition and Usage </a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2554668"><span><strong class="command">options</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552093"><span><strong class="command">include</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552108"><span><strong class="command">include</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552131"><span><strong class="command">key</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552220"><span><strong class="command">key</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552360"><span><strong class="command">logging</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2552486"><span><strong class="command">logging</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553623"><span><strong class="command">lwres</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553696"><span><strong class="command">lwres</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553758"><span><strong class="command">masters</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553870"><span><strong class="command">masters</strong></span> Statement Definition and Usage </a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2553885"><span><strong class="command">options</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#options"><span><strong class="command">options</strong></span> Statement Definition and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#server_statement_grammar"><span><strong class="command">server</strong></span> Statement Grammar</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#server_statement_definition_and_usage"><span><strong class="command">server</strong></span> Statement Definition and Usage</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562233"><span><strong class="command">trusted-keys</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562281"><span><strong class="command">trusted-keys</strong></span> Statement Definition
-and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561410"><span><strong class="command">trusted-keys</strong></span> Statement Grammar</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561526"><span><strong class="command">trusted-keys</strong></span> Statement Definition
+	    and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#view_statement_grammar"><span><strong class="command">view</strong></span> Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562349"><span><strong class="command">view</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2561608"><span><strong class="command">view</strong></span> Statement Definition and Usage</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#zone_statement_grammar"><span><strong class="command">zone</strong></span>
 Statement Grammar</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2563022"><span><strong class="command">zone</strong></span> Statement Definition and Usage</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2562891"><span><strong class="command">zone</strong></span> Statement Definition and Usage</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch06.html#id2564557">Zone File</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch06.html#id2564293">Zone File</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them">Types of Resource Records and When to Use Them</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2565990">Discussion of MX Records</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2565862">Discussion of MX Records</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch06.html#Setting_TTLs">Setting TTLs</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566487">Inverse Mapping in IPv4</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566593">Other Zone File Directives</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566761"><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566291">Inverse Mapping in IPv4</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566396">Other Zone File Directives</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch06.html#id2566565"><span class="acronym">BIND</span> Master File Extension: the  <span><strong class="command">$GENERATE</strong></span> Directive</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch07.html">7. <span class="acronym">BIND</span> 9 Security Considerations</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch07.html#Access_Control_Lists">Access Control Lists</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch07.html#id2567222"><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
+<dt><span class="sect1"><a href="Bv9ARM.ch07.html#id2567021"><span><strong class="command">chroot</strong></span> and <span><strong class="command">setuid</strong></span> (for
 UNIX servers)</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567366">The <span><strong class="command">chroot</strong></span> Environment</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567424">Using the <span><strong class="command">setuid</strong></span> Function</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567234">The <span><strong class="command">chroot</strong></span> Environment</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch07.html#id2567291">Using the <span><strong class="command">setuid</strong></span> Function</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch07.html#dynamic_update_security">Dynamic Update Security</a></span></dt>
 </dl></dd>
 <dt><span class="chapter"><a href="Bv9ARM.ch08.html">8. Troubleshooting</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567630">Common Problems</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch08.html#id2567636">It's not working; how can I figure out what's wrong?</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567648">Incrementing and Changing the Serial Number</a></span></dt>
-<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567665">Where Can I Get Help?</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567362">Common Problems</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch08.html#id2567367">It's not working; how can I figure out what's wrong?</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567447">Incrementing and Changing the Serial Number</a></span></dt>
+<dt><span class="sect1"><a href="Bv9ARM.ch08.html#id2567464">Where Can I Get Help?</a></span></dt>
 </dl></dd>
 <dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Appendices</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2567795">Acknowledgments</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2567800">A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="Bv9ARM.ch09.html#id2544793">Acknowledgments</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2544798">A Brief History of the <span class="acronym">DNS</span> and <span class="acronym">BIND</span></a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch09.html#historical_dns_information">General <span class="acronym">DNS</span> Reference Information</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="Bv9ARM.ch09.html#ipv6addresses">IPv6 addresses (AAAA)</a></span></dt></dl></dd>
 <dt><span class="sect1"><a href="Bv9ARM.ch09.html#bibliography">Bibliography (and Suggested Reading)</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#rfcs">Request for Comments (RFCs)</a></span></dt>
 <dt><span class="sect2"><a href="Bv9ARM.ch09.html#internet_drafts">Internet Drafts</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2570087">Other Documents About <span class="acronym">BIND</span></a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch09.html#id2569958">Other Documents About <span class="acronym">BIND</span></a></span></dt>
 </dl></dd>
 </dl></dd>
 </dl>
diff --git a/doc/arm/Bv9ARM.pdf b/doc/arm/Bv9ARM.pdf
index 6119ca4c..90f1af60 100755
--- a/doc/arm/Bv9ARM.pdf
+++ b/doc/arm/Bv9ARM.pdf
@@ -879,13 +879,11 @@ endobj
 << /S /GoTo /D [590 0 R  /FitH ] >>
 endobj
 592 0 obj <<
-/Length 221       
+/Length 220       
 /Filter /FlateDecode
 >>
 stream
-xÚ��OKAÅïû)rlÁ‰“Ý™£¥*
-ö s“Öv*…îÖêçw¶[‹ É!$ùñy¾A0ôê¨hžÖmåá­Üî+:3j‚¦"eøãê$
-•
+xÚ��=O1†÷û[‰3þ¼$#©(êpj¯¨=¤£ü{r½R!Á€2$¶ûu^*‡!:’&ƒ��Øa½¯^Jí®âc®è¦Z‚?ªµ&Åh¡–ѽ‘ŸØ/œÍ0hLP;9¦2|Ĺº¼5
(ìyl	ƒ�™˛çÙâþñz^‹Ó,M×Õf¿ëw=¼
Sê©ÛvCׯ»)\¶ýGû:_å‡"¡ÀŒÉ]Ž0P(«GÃ&Š%–íçÔ(~qz5cu“ÏùvNGoþíÛiÔP·endstream
 endobj
 590 0 obj <<
 /Type /Page
@@ -905,12 +903,11 @@ endobj
 /ProcSet [ /PDF /Text ]
 >> endobj
 604 0 obj <<
-/Length 302       
+/Length 308       
 /Filter /FlateDecode
 >>
 stream
-xÚµ’ÁNÃ0@ïýŠWiõ;N–+CãºÞ4º±ÃZÔ¡ý=	ekCì‚zˆ-?ÙÉ«µÂði%¬'¯œ7 ¨E­v	ªM¨Ý%ú‹1 †9$ª»)’„ÈÀ4tR?hÍÈìTæăeâˆßÉdfXyð–¬*ÖJ³ƒxŸU<?ŒòúõÐl7/múXÜ+Apèõ€;`“™6ƒN�³>pËкC¿%���!šqš‘`¥‹æU[6UÙvÙâ°oËݾKòºÚ×M»}Û��ì
-ÒŒ5†y‚K"3_äñ©Žã“Ûâd&Šk­rF‡âåO�Ÿt6Ä/kã|ßõ7�ôŸ±÷¨û�ú�/Ú­×íûS“êé¨<WçþŽ›ÌqW¯ÞãÊ´­Jendstream
+xÚµ’ÁnÂ0†ï}Š©DŒ�ÄIs»ÒÛØab…q€N¥ÓÄÛÏQ­›vA9ä·üɱÿ˜Ê!Å|4Q…耑X­vª�ä2úf[`g­W²ÚFÏ\ˆrPHµ!õƒ&ŠÀ:¥GðÖØ„ß•Ùd權½ñª\+2Ò�§ ÎXùú4šÖïÇf»ykóçòQ1BÀ(}�Eì€UJLf䥴�àcPzÀ-eÖ½xdÚ4i‚¢çÚ0&ɽô�šïÛªÙWm-Ž‡¶Úº`ZïuÓn?v㻂\[ByšqiŒ›/¦é’�R'Ù}yv‰¬‘á½WÁ‘üOä¿-=Ñzˆ_±ÔùÇûª¿Yjni)ö>R/M/íUwëuûùÒäTŒªK‹áÒ¿ÓV[†´·ÿÞé/6
¯žendstream
 endobj
 603 0 obj <<
 /Type /Page
@@ -1424,24 +1421,25 @@ endobj
 /ProcSet [ /PDF /Text ]
 >> endobj
 707 0 obj <<
-/Length 3116      
+/Length 3179      
 /Filter /FlateDecode
 >>
 stream
-xÚåZK“Û6¾Ï¯Ð-œªŒA‚{ó&vÖ©Z;±'û(ÇŽHiS¤"R3–+?~h
-Ð�Cm=3cÍ
-³`Á‚z‹ÿ)þY­@«É��ùQ{@ð—‚Šà•¥<×'loUpª¦”�ÓŽ˜¸¢8KÝ�,Ú€r;—êl'wÐm°SاOEYb++šC™ž85éά€û¼qxÜX¥$”(!Åð@mk³�p€
- Ž QÓ¶ù…·Ça|TœÃuDzJ?š¹ÏÍŽ`™ú=걘
<•ßÈOAÄknÛÁ0·ÅnÊ3GBqé
š«Àšä$GÎC~Éñp•ã¡>NÅC?àù�¯òû˜Oùu¦„RÑ;ƒM½ß§U6ÞŠp–87wÕ
,02þÒ’B>LãµP!
-MYM™²£2¦œ—uš]Še°ÎL~Y®§¨ƒ
Â…a%¿EÉF
pD~¢”ïN‘aP�”VCZϦ¡ãƒ†Ì©IÆ!x#ççÕÔ§šW“§ª	Ì,™�·zÑ‹š‹ôÞOp1Æ:•¨Ù6ËÆÙüc‘?MÍex¤Gqà,Y/ëÒS�•9ôm Ÿ$�´u ÍþÖûC°+óªÛäù=�Ssy�{T{ì¨p�·Ç¼y˜ÚäA¨¸´É>Ò½º=ÿå]9ìlÕ¢6=ÕX�»°Ëh¨Ïw�#g'w‚?{øÛ§EÕBT^m<ü«-°�0Éå[èQ-Ø‚£B[€³j¶ÎË6 ‚¨ZúLþa…è&fË
-õTc�Í
”PUú¶Séâf[›ÀP~A»O!°ÁøŒM„à¬á°FË6ѧš·	Oebãcžvõž?$JLÀ„6,YVª§kuh'Rð¡Zß�šC®Ý»ap:di›7ØÑ™�þOñ/;CRVl°ƒ°°–7ù˜ªêî¶
-ËlŠµÍ{$䢢K¹ÍI)ϵGJml¶R“`AÃDvógì48÷<ƒ©„2†$»hü«˜ÉB¢ÄSj9åYÑÚa“¸Âÿ}îȲ|ø$í¤c«ª�{àlbkÐý ŸEÕi=‚}ÞŸõ?Ó:»…œÕ}$Ò³�XðªEâ´ljlmÒSc´¯ÛiµÃ䜚ƒ¨?קc¥¥;.RÓ”­euo	›3à¼�à~m©lnN‡Û`�÷šsòqWà=™ºã£Ch}
å½í»Ç£Ù-ùyi_óF¤;¨
|7mÛ|0{OlnÍéÏ-èÇNëé¡('áÁªC3—XTûœWóðE!+9»_=ªørT8­ôi¼†€ò»âØÿìr!ê¢F»@v¤Òé@v ÓUzoŒ0”t鎱HøOñ¯ÛwÝ�zV-”	ª°´CUÝ=–± xs
-‚]
9½"ÙS�EKA"$¡þØ=�íë
ÂÁ4Æ5!ô^Ú @£{¹[0
ƒjLÄWXNÔ­-UmýüSÑ´Eµëxô¥Ú¹ `å!"SþèbÆbë!çŒ#飅©ÐtÁ"þ«`넘j€BÛÀǸ8É'¡nÓQ¡j yÁ i�Ù“�qaž]DÛ!\ŠÝ}ÂÎÅŸ§ý½Çz‹úàQ¨k±
-qnÅ ›ñ6jmAï±.²æÂð«<wU!‹�ù'€VEuY`�zO6½ja[ì�ÀQ}µ7»•³ÐÊeD”`W*
-}ªùóå©L;MÛf\geàÁc¹,ÖS�åƒÐ$þ‡Î–�Ekuá]µnÃœ´Åoš¡Ö½â.	P{óÊã WEWRï>Õ‚ò•^Ã/§üx.ëypZ”Ü�ÓHô48
dßÝ&<¨w;“à°碛p:`àBç¡Œ?Œà}�õ¨Í³`È$GúÐa�eíËù§CYlŠ¶<ãxVà
Ý´–¥réÓè;Åš˜×]áÌNL¾ó—.«�õç2ê*ÎÒ©ÏšŠDaâ(5¨Uy99žJé §¨:㚀±˜„Iä¼¾ÓßϘˆ(é>„m:@@ºü¾r÷uÕÜÝ!ÚÑM°–	�èÄÅ/³FÎTH’«FÞ§š7rOenÄœö‡ìÞ}cƒ€ý×õ&Ý<ä¿®5~}˜ÏÝ @!"ö‹4‘!&„L„FW.>ª¿GÓ+õTã•÷‹ÆàwØÅR¿�¥‚%DZ-(ÄÊã€ÕW
>3«·m}ý Ë·é©lñþ€~ÇD
-áòcìQ-££BwUüçã‘�0ÒE«eùžj<�!îBÐ,â„
gðÎÌ@gŶè¤zW1têÅE°O?·,0°Hu9ΩNS›Ûºaá3¯Zì÷*[ÊVÝP¦£§ÝtGª|­H·��	p á!Þ¾úçK}}€»ÛH†1ä±iñI!a†ãÆ™=zÀ×ÀXìOóÀ„5}J_ñÓ£öè	ÓŒ!Áú€ÏŒùi±Îü@gî=‰_Y{!g“cfv™ÙÐœq}íéX-˜¨Jà,²+Ÿd{DóêˆôTÒ²ýû\Þ™ç¥ôiëì‹Gãä`‚¶:É»À
-‹=(µ€Í
ÑÞb�ç jo„ú][ú5ìzF¨zKÞ+XŠ ¶²Œ½M™#î™7Bˆ1óÑ
k€ºiJ²,´§œ
ê¶5@}ÜÃLJc)C·îíKöæUé¸t>¡èÙwµ#Ô	ëêÈ�4+ä(Žx¢¸Ò�d‡	aë:}X^®€qw Ó?
-øÚbüîΘ˜¾Í<a~ÔßuùÝ—¦»»äúâ‰R3×0x¬Ë…ÀÄNJë�ññ½G
-fñ‰©ÿ_M¯endstream
+xÚÝZK“Û6¾Ï¯Ð-œªŒÁÇÞ¼‰�uªÖN<“Ý­r|àˆ”D›"‘š±\ùñi 
�IÉvË¥A°Ùh4º¿~PlAáÇ2"QÊÓEœ†DR&«Ý
]làÙ�7ÌÐ,-ÑrHõ�û›g/#¾HIñhq¿ðJM¶¸Ïß‚rhðúù¿^Ü.¹¤ÁÝ‹··Rÿ†‹¾óó‹·Ïoã0¸õæõÝí2¦i|ÿÏç?ß[Šë<¾óúå«íùܾ¿ÿéæŽÛÅp§Œ
+µ…ßoÞ½§‹6üÓ
%"Mäâ	n(aiÊ»›P
+"C!ìLuswó‹c8xª_�Ò\()‘2”‹¥IëOQ±ˆ¤"’0žbƒÜ,á0�)‰Nù2(?aD¦©\8*¥ü:Ûùrµ-V?7uq»Œ(
Þ-ó¿?þðÞÞ­”¦ž½Œ‡ÜXç¦$R\VUÖ¶Hä-ÉS’$qj¨¿f‚Ÿ�°{i6Çnì&8údŽcw•c^ŠU×NLeH".Ù9Ó§	¦pJêLY¼X2FR)ù_åþñªÈ¿QIËMÝ
+$eá€4d$	…åúa‚'q‡†à);Ô\¸ ©2õ/ä²ÎÊ
+¤bsG�œo²þ79°ç	·0F�Ú¥ÆlÀˆ(‰"ùFôn‚Ÿ$iGV²²*”ÃN°c’p%ó �‘˜±hSIDÆÓ nˆ–C*�#á$ˆ[*µâ¡ÎWç‹Æ1a‘L//j‰&Cðâ„…±ð½ß`ñ„‡[–Å®é̽VŒX�g0]ã쪩;MÙT8¡luém�ÁièÑníL"N‰ÈY1Cž{\asÈv8‘UUóÔ¢4�¸=µ]a	ò]Y—mwÈ
+«f·Ëê|
+ÅÂYjãÝÕxp�‘œ†Œò~ÂG—"	
ðc°Ø�H¹ÃÔ	¯O
¥]àóÖõxBœÛ�–-fÞ:±Ôƒ5^a€¾YÖ›‘wZCŽ(ÀO®{O„¶žLÙº!Ò¦^TM–Ÿ¯	ž@Bp‰‹‹:¢Ñªž&@`F¡·ì[\Voüç7Jùæè&ÕLet£4¬*‹hÉœ‚dÌ	ôŠ††Tó*rT¾ŽÀÓÙ¬l�ã$sùà»	.Ú’§
+ˆdÖýfÙX‡x,‹§)Y|eG\@0û¾¬KG5V¦û@?i
+Å­§ÍáÑ;óß”�EÝòüË(�|ñò¨.œ±¥Â3^Šv;uÈ^Byé�,\=žÿñ)‡ÎŽê¢6ÕX�g§ƒL2òõy•t~´üÙ
ß.+ër÷zå€ïðWm
‚‰QxÅTlÁR¡-@
+Z·k‚½ˆ$Ä8WïæQ’ò˜]V¨£kÔ7PPJ“ÐWéÛ^¥Ûئú»3Ú]µ‚IÖgl"L@ÊdºwÔÛÄ�jÞ&•Î�EñÙv…¾I”˜€‰Ø°ô²RÕX«¾]@ÒœJÁ}µÞÛ}¡Â»apÜçYW´x£*?uÍð’Ÿ h+Wxƒ°°”×õššª›þŽJÃX•KSI¨UE_,rS³R^¨ˆ”¦ÊØjeº
+ÅÊžæÁË”¯Êcÿ_°Ë¦¨5Ú'²#•N'²žN_ÔÙƒ6ÂPöÐ¥n´EÂ5ÃKîê>X!<4PÉ1¶ž`ªnúG8ÒozP&PÏ@•Ê`„PF#_*´)mpSè­)ÿá©´Àï[ˆ0ìq`º8Ùà™™D^tÄfSTƒ<Üåeûño0d20õ9Ä!Ë%ŠfP´WešÎ@¡ç±æqm˜3âÀÔ63dPÀï«¢3Ïû×Îð7	,º+_*rV0æ$˜€‚^é0FúxáZ5€°&z0P1À™YŒ€œŠD4¹R
©æ1ÂQaÚÛw²¼f
+4y©Îd5huåÎ.8j¯
„1G9ë_<áD@ñrÙ¿†Tóþå¨tW·ËºvÜic
+¦¡IÉ[Zó�)6îû¼·ûX}P¡¶<µ¦�MuÁ…©ë‚PÕE59�£Hi!§¬{㚀±˜„id3C«¿	ž1QÚ*Yõ€€tþ $2äöœþ›Q�n‚µLIK›ãÎ9º¹?
+9‘ÆÉåõÕX
+ö›2_‚;-�*�Lç!|¯Wù7Á.ûXÞ²@Ã"U=«:E­?±«��Ï¢îð~ÐÞHLë—Ášä¸ÙâDßu¢‰k¨±µ3Èaа�·¯þûRýÓ€»?H†9ä¡íðI)aŽóÚ™q5á!,v‰§~ Óš!¥kû¨YóuL§iÚ�`¹ÇgÚüÔ²Öü@gö=
‰ßó¯�U�ÕûyMS*w‹0ITWÜ_w<Ô:©�"[-ª‡¶
¦Ç5^‹O°5ìE©·š~¬[DpÍ¡&;`Þ§n1YU#-,·YŽ\\7U6*3Þë=ç@”–DWÐ|HuÁ�,•Zy›UÝ—8Ð¥õt.ÀŒ
%@âà&¦�Æûä&Ë貂<2LüƒZE‘8GQf7p51è¬ñAgM�YKûļË8GLbu¦ÆIÔP
À„u56N¢ A0¬öÔ4ÖÜjô`^2!ª,W€÷'\:Gö}SB/jëžýjf
´LC<á1NáidJ+Û�Ôú`:aŒÏ´Çhý€
zw…Ï�y™O-åT­d«N¨Ÿ+€
ÛªŽ,7£ÞG'ÜÉ_pH«û[ûYÇx¬nûOþÖcM‘1ã£övàêßÃBÝ_J¾úOÊý·ÕŸ7’dîCF¬oÀÄ¥´Âøø†�ˆOˆþ'+;=íendstream
 endobj
 706 0 obj <<
 /Type /Page
@@ -1668,7 +1666,7 @@ endobj
 /ProcSet [ /PDF /Text ]
 >> endobj
 749 0 obj <<
-/Length 2227      
+/Length 2232      
 /Filter /FlateDecode
 >>
 stream
@@ -1677,9 +1675,10 @@ xÚå]oã6ò=¿ÂØ—ÊEÅ�¢>¨æ)ífoS´A»›kè8EfbÝ*’kÉñ¦Eÿû
9¤LÉ´�öpOE€h4Î÷‡4›Qøc3‘Êóx–
 ó6Jgoåý°‘ëJmD‘à†ƒµ1�í\Éìð£1>hÄjµÝÖi4êË3>Ñ‚=ŽFoÕlrª7X�þu§Ld•mF™Ð«¡·:Ëúý®(?šÆ²9ä÷Á“#G·Í©.êïr*›#Ø
 œlV¯h(ƒ:ÖZ³Ô¤µ†Z|bZ+h5×S@´
 +®–e_=Jå›Ô5ƒ'Lwõ‡ßì_,°
['LÑY…ìÛI“‘N³qÞ÷?K2ÂãÌNµW¸%™�üº)}S’?ì0j÷ÝqŸÙ¥Ï¸Ááx´s`qg·è¾ýòÐé"I``fâøQÉ!ÒG
;*ç
-¾ã¤ÿ@Y6•¨í<�³£"¢=™“¡à8ÉüfF4FjGM:ê”Ú�»ôðFxBàtÆOF"Â3‘=Œ@mñ$‹ÿäiŒKÝÓ9;Ð�Bó=<‡êHô,Õéð“êÄo*Ö@Wìÿ3‚ÄmhÓÃlJX–Š„’�By’¥-ýEÓUs$�,@¤'éP	¤¥:ÈcR�@NÅúéŠ}y ÷:õµö©ìú*ÎSBcq¢c¹T‡}5P�ôÕQ©;_í‰õúj$öêS¹,šÏÁ±_úºÿåÍk{sÑ+Ùª®bî@š¦ãÓÍÛÝT|Ðë‡æ´m%qªî^
-ÂjÕ…m¸”ky€níJ‘<Ü‹ÊÑ™âKâh¼Y WU¾+C¥ÜÆp
-wÝaÙkYnÖ�®Ò#ò•¼L”·câqñ‰'Y9�–["Øé”ÄWxfr6¥W»TãÑ�H=BÊØi^J†;¾œ~^�ÖøÓ¼²Œ_=žï+tq¤€ÜÒ2L¸]´6
a“°�4)ôµ’®ŠLMBŒ82÷·»ŒÜñìGu8¤ghxæ¾*ùKiz0ñ¼5çÉ»“ Œ¬ê—bÏŽA‡ˆþÏ?H;#eF¸‘ïá4%"‚ÁÆ(¥ŒÜ'‡_®÷Uÿ/“Õendstream
+¾ã¤ÿ@Y6•¨í<�³£"¢=™“¡à8ÉüfF4FjGM:ê”Ú�»ôðFxBàtÆOF"Â3‘=Œ@mñ$‹ÿäiŒKÝÓ9;Ð�Bó=<‡êHô,Õéð“êÄo*Ö@Wìÿ3‚ÄmhÓÃlJX–Š„’�By’¥-ýEÓUs$�,@¤'éP	¤¥:ÈcR�@NÅúéŠ}y ÷:õµö©ìú*ÎSBcq¢c¹T‡}5P�ôÕQ©;_í‰õúj$öêS¹,šÏÁ±_úºÿåÍk{sÑ+Ùª®bî@š¦ãÓÍÛÝT|Ðë‡æ´m%qªî^
+pÄÞnªcöæ"!¬V]øІK¹–ØáÎÑ®ùÀýÅ 	!¾?€ÆË’rUÕrá»o1Tú4nL
+ñÔÑg-»~]•=¾9Õ•q×–½–åfÝé>"_ÉËÄAy;&ŸH°p’•Óh¹%‚mPI|…*gÇzµK5ˆÔ#¤Œ��æ¥dX±ã›ëçÕh�?Í+ËøÕãù¾BG
+È-�!ÄÑEkÓvÛx@“Bß9éªÈÔX"ÄX€!s¹»ËÈÏ~T‡Cz††gî«’¿”¦Ï[sž¼;0&Â<«~Föl'tˆèÿükµ3of„ù7&NS""ØsŒRÊÈýYsøY{_õÿ³–8endstream
 endobj
 748 0 obj <<
 /Type /Page
@@ -1846,21 +1845,20 @@ endobj
 /ProcSet [ /PDF /Text ]
 >> endobj
 777 0 obj <<
-/Length 3193      
+/Length 3192      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥ZÝ“Û¶¿¿BoÕÍXüw:s¶Ï‰Ó‰“ÚJ;�$”„;±¡H… î|ýë»_à×Ñvf:z
-‹8z'wÙcŒ½»Tä>�JîÌ‚³ßÄ`8ïjî(ê'žKnœ×ø:ë(ú„Ãòrðq#iDYÀ¥tKÇÆ*yÙ÷?nÑ—Þü¼ý.ü
-Ôò„Âñ5Ek4éúÕ»÷ox@.ÓOçÊž
-5	¸!T%Û¥ƒd)Þ$5x…’e�±Ç–HjšûƒdRÅIüÕí%aæÏŸ¥DÔ]9‰;Áã"ï(fle;é�(‚à¹W„ˆ+š€Z)å±�±bÈesqäT€Ö{)F÷›PGA’À½”?ä±çªm Óýš;M•‰—L:2ì-©¬Ë®do‰Mü	ÃZhî«’3R#ŽÊ¬ùáD«œ_s‡2?…ë¢ÔŸ’ßÇŒ?.¶•µðN@rW]dE !¤à›h²À$É,LgÙþ¹Å­¢cNÑå9¼YÜ"ø
-eÁÉ”ëõfTÃt’”mLÊCÃÐCõ/�[ÈôBrü;îEó T¶qœ0`%ƒÉÒЮ ×o‰L²èÏ^ƒê¢Îg^Ze+
¨1@CÊ\oØÑ
-ÁƒÎ“õÍ]G^LaòGŽCe}C·ôä ÏE˜¦<bq((ì³µ„ –5 ¡åò=ô Ñ'¡É¹ÜÐöTúÝÂÉ}Åv__b
#í§b/Pcêø‰û,Ûy€eæ3…¹Ugy�eæO`ã!N8ò¯£4pᇪÑf²iàK�k®f1ÇõçâÅ:ñb|M¼ÌdÑH¼ˆÝ“Ï!¸hX32A²·‚ƒ0 ãÂÆC0||@ÔEX
-ÛäVf“¿
"Yé!�¥�žªalj_Fû± ýTÐþ8æ.?32êg÷, 24"ÁÚia�í@u—ó¹iÉÜ¡óÍû�o_sÏdêí u`‰%™Yh¦Ï¢pÒç‹È¼¡£”IÞ¾f‚6‘aßk AŸÎ£pñím*Oé„CǵóeW•ûoÀ	<°÷š{.,PBÖ6Ü‘KcŠç`â)
-Míc¿íâJ
rÎÞíØdä¢Gü,ž~f	“ç„Ñ+1v0ŽŽÇO$ôT‹»›æü±Ï_€Æx:eäÂînòŒ‹ô£…ä±�¤­E"8·líß
�ûÓÀe1Ǹør¦§þ%–p‰ŒJk9]gOçY_5lZ4 >|ãÏÆ?�-¿ö-œÂLé((�/žë—'À×%¤…›ÉÃíöõO2‡mØ'1¦ÒÍ6"Àßp·^V9+ÚlSyÀYžÏÞÐ,,.jùwzH)B,ïÑsœbíÒ-¥NQè,ô8­†Í�žŸ»E.ÊôyƢǷ�°œ¿³dâyÅ;~Õç¾nŸÎ]·ô|,÷ŒCF®‡½'Ðès#ßÊòd+˜à¸<7Ε»Êr«Ìvd×Ĉ$÷/yy20ûh÷—¶ìž¸…jfÁ
”�ô—'°ã>õà
nvåÒ÷+
xH½}ô
]ÀúÚdSoGïˆvâ(¼„³x±ù�7MÙm¦äñy­0­j$ZûÔà¯â¤A÷‚o_Ý,q�jì‘Ìß¾Æb@’åò‰E„pÏG�r¬Û·åÎJŸ`„d-ˆ ð#S�#NÄ‘B/¼é]‰ù(9“0PIœMݾ¸E×ð®æçÁÆ„é?Å"™?,
-_‰ñÞ<ñQ9,‹ˆ|X�½¡ñ
-ý$D<V8¡k¨,?“o AÎâÈ<O¦†¯sr”zôIï±içl¨Yrß5”“CÓÎ&<“M1+Žñ—Dg&0qn¾x"&Ða¦''B_#½£Ð©·Û±pÞªQ(‰²œS)¤Iš.}ŽœÅÞ@Ÿz(Â[´UÙcÐþTÆp`ßœÎàÌ8ØLÂz[ÀsðÔºóØ@ÕÒß8"à/þt¡úÿUüßñþÓ§A”ezø÷Æ4yL‚Lç©
-u§Ã¹äýAž‹þ?ïp;2endstream
+xÚ¥ZÝsÛ6÷_¡·“g"–$~LŸœÄiÒ›¦½D½››¦´Y¸R¤JPv|ýíøe&éÌ�,€Åb±ØýíÊÑ*„¿h•ë TE²ÊŠ$Ða¤W»ÓU¸º‡±®"™³ñ“6ãY/·Wß½IãUiœ®¶‡¯<ó<Zm÷¿­_½½ùe{ûázëp�×�†ë›×ÿ¼Ž¢h}óþÕíkzýþ#7ÞÜÞ\gÉzûë‡[¤„ÌK‚TVnÿ~ûïëß·?^Ýn{ùÆgˆB…ÂýyõÛïájGùñ*T‘ëÕ#t *ŠxuºJ´
+t¢”§TW¯þÑ3�ÒÒ%�h•:�³¥$ñ*Š‚Bëx¢]©ŠiVéõ&
+Ãp}Û¶MëðP°T�ô®6qÄ…NiÍöh@Q¶>·×Q¾nvÆ9[ß3­9à7]o?¾û�)ÎÞ×fÏíL-ï�ãÞ®¬y2ñ1îRu<`kYjL[VÜ1-o×:¸‚¸È×ï<P~qáæxgjáß5“•uSoðØxÐ^axP>Cœ¬ËÇ’eä®3-†Öñ	1ú›Ÿ?ütûáw>…:<4í©ì¸ßË“mUqëN8ó.Ý¥…£oÐíNF»ãT€“º‘­.õÞ´®+ëý°ná|¼Ù®¡ï´ªÂn—ôëµÿ–cÑä’€L7
ß“u»¦þ†ñý¥-;ÛÔ(¸
+Áµ\�‡…'¬îdÔ|>Wvg»ê‰û_Ú{/ÌÏ«Þ�$Ô|_“sòÓï-^õ`Ð!Nð-ùãÎfgqÃ�ôûkz¶y�ë$#¶h*Îq5~ØZTœ�­ü™±-*7ö
A¿zd±´BÆöÝ“Ì«ù{©ÿ¨›ÇšWýažÈ�ÆU’³š‘.wunj',ÙJˆ¡ñŒd›Ëx´Ýf©HXBCŽ÷j>w y’è½Ysw×ì
Os¦
_Þ¼F§‰òL!
·ä~‹h¢Aèö„öLƒ*äÕÑHƒÐP~É"ÊîÒï¦pP|¨*ÌÖû†8�’ÊÊîËΠžãP”>Ó3,=ÃØ�Pz=U£
…‰H#͆ÙD³0(š
3ÒìÂ¥‘ž�zŽ
wHÅIJJJ´ßZc'ÃÃÄöLÅÃêAÅБ“$šGá@ö$CÍ¥svï;þòyqzU5�tHXÔ–õ=©5-¾î¦¼’c¥½ËS){ ôO\yÁp”ÝŽòÇFÒ b¤�TŒ]V1N#ãE¹EJݾûéö³gUÞ±)x$�­\(ÂÍ]°Ãrÿp‚$M¯î•+1E¤0{hÌt
+
÷(ž?š58q(�0'qÜK8ª(8ûîXÖÖ�˜z c
:Ü@p�Yá0vojƒ!�ÀN‘h},G
L�fvç}ðï�©y°{l˜zl\ç((G¹ÆøcFT’ð
+6þ$“›økNp[x³^üseé$ÃH‰¾ +Pgæ‰LSŽ<OÜ96�(¸xJ¤`¤¢i¾¢+Ò	
+Ôò‚ÒñSF‹ÕÙúå»÷¯yB!ËOçÊœÀPÏoêJ7µŸ
²DáE6s’bé0�T‚®'Š½3øo¨[z6›·¦ªNôÎü	pŠùŒqoHÄ|ý²!wC§v^¬á†€Îí?/¶·RM#«ÊÙ»d²8AndîE¦8ýMNo«¬ºcs¹'gˆÞÕ^C(åÎÒºøò“TKrã0{Ä\\o.Y€t
˽+B6øù/\¿g
+c[vò3ÓSQ$…ʾn{`Ý�àä2i”~ðN(A„‹áFÃMP€Ò¦áSòìj$€¼
«Á°¸GyHid¨ì°?£’).f˜ùÏ.Nt�…qôͳƒ×%‰G1ó0ùÌÃþ™B‹ÃHDUÉqW³ÎÄ›dŸPº¬1öÛm5÷`á|�–†Iš|óxi”ûûg)1*TN¢Ç�`v‘wWö¦2�ŒNAÞ+BÄM@ËÊ÷XÊ\1äÛ\9 õ^Š3€M« MáÝI&0dÄ÷±†œù[î4u²dÒJ³·¤om;ËÞ»”¤}¡»«,½>l“#…oèüt¢Õ{
+N£µÃ™‹ŸÁs	ÿ$¿�^L+{ᛀ°ºÈŽ@BØÁ/Qç�NÓY˜*Ïrüs‹GEÇœ¡Ësœ0+IÜ'îø!™Šx½ƒYª‰ÛFG?Èѵ{Ln`F•¬í�GÑ<è*CLâ„
£,™,hkMÝ•èùX¼E$2©-|ñDÐu>óÒa.ÐÀƒ8¤Ìõ†£­¸N’®oy±DrÐòAì×Fî8ˆÁÂsÙ¦±ç’B,Nå
+Ü0e[Ù"ö·2ŽÖ»æt'Ʊ`u{T
žƒ—Ö�Ý⨖þ_*þ“ÅÂW„ý?PüßÿË1üóJ’*Ïãáß4¦¹]äq‘y¡Pwq4—¼ÿ§�ç¢ÿñ¾8æendstream
 endobj
 776 0 obj <<
 /Type /Page
@@ -1879,7 +1877,7 @@ endobj
 /D [776 0 R /XYZ 85.0394 751.9762 null]
 >> endobj
 190 0 obj <<
-/D [776 0 R /XYZ 85.0394 588.2109 null]
+/D [776 0 R /XYZ 85.0394 586.2284 null]
 >> endobj
 780 0 obj <<
 /D [776 0 R /XYZ 85.0394 552.101 null]
@@ -1897,135 +1895,188 @@ endobj
 /D [776 0 R /XYZ 85.0394 174.5031 null]
 >> endobj
 775 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F11 785 0 R /F57 624 0 R >>
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-788 0 obj <<
-/Length 2920      
+785 0 obj <<
+/Length 2941      
 /Filter /FlateDecode
 >>
 stream
-xÚ­ZYsãÆ~ׯÐCª*‹ã9p:OòJk¯�ȉ$§*>@”PK4
J¡}º§{†
-SäÉùü�B…>_ŸÅ‰IlŒã¬ÎîÏþé'µÚ¡A­()´

œª%6!µ$…H�6V-OõöBåQ�›K£õ®�J¢rÕwÄ›sÛ¢[¯wm³(‡¦k©ÓK3<QãðTó¸jÝ´M?lË¡ÛöÔØ-�:mJZ´¨¡l«/»-/óÔ¬*êö{×òÚËÓ¶ýºPñ°û™RNQÛ­|ª÷=œ_ÃùAï"¶ãß¡…‰úz±Û6ÞZú¡vÜÂ{®Ý)pš¶ÂmÖ³÷Ä&ñ�˜ˆÏëPËÒîX%ýv¶†¬E¹)ç+îHôÝê¹æ°ÅÀ¦†íEñ¡È¨z"ªr(a¯FI8Á†™î[±Ú$Hl×év�OŽÁ- n{æ�þeTÎ�¹pÌ%3Q¶/?$ÙÈžtV�)ˆŒ’^ßSŸ‰Í©XÄq’sZsÑÙoÅ3G’Uõª~ô6’vM;«ÔœÈTƒŽ
-!u\Øi? è&ÖQ7 5©à¸· Ùžøh=ö땉]P‡ÄoZâV•ÈÁ½2MP°=5¯y¨ŽêÆ­¤£ù…BïA­
-gµÚÓïE×þ"¥~ÜÑÆ+š†œÆÊ3Y,5`
-^¹ž®[×:n2`¼Îçïî¯î¿½RÂ÷9ôƒ}Ënµê^|àB�Ò�%ÞÙN‚EIŸ,͉˜7ÃdÅ£X½ôÓ<k$ÂXeØj,>õJTZÀÆr$]o<è¯xÒ|Ô"5o.Ó鶧Ñt–B¸™•ôõ²[朾v‹–Á½­á[j"§û‰Æ/
-Ð(fjS
-}¿Ò«Ý¢®¾
-¨O¥R¸)äû©\_H™|¡´‰�ç@0Y*2#5dz@!@àqúÚäN&É Bè©)Vßl›g4 €2ÆÐâRØ/2‘/ÔnŒŒìDZ@a0ïã�	Û‰ebøµ�ô±ˆÄP>¬
-‹ŸD‘éOÚéˆÆ€ÈkøLfç�²örOâ*Tçv#!sWB�ó†¬=dE¹ižêƒrâ¶l–LœÙÕ-L +ÄzuIEjÈÑÔÿ~�ð<ÉIº
7ÖÃBŒ×l+êMÚ€î¤Cä”�¬ÀĹŠã©! x|Œ‡Lì"re_ó!�@€ŠœÝØîR€‹ÓÑꕨ¢òLd±ŒYqŸ±¿D‚“&
£- $,iOK3€Âõ:úŽb"ü¢¤ÀɾÇÔ§3N}ÚoÜÎn¾‚ÄBh߀ˆi’ž”y-ý_�œ1 Å$q;û7àÍXªÐæ‚èÐÇêÉ~ˆGƒ3¸Äl7‘%"IÒ“PÉ	eùXKY1‚ëÛr¹Ìé	Xn€ÅñoSo‡=[Q5ó¤Îáx‚’U³ÄQËzTÈŽWäˆ`JÂ`bS—<K‘û2x�g¡d‹ÙòõkréŽÜÒ„FÀ†þ©Ûá=
-?$ø5Ãâ
-ÜD –”ÁÒ§ª»@UH¬?¤Ó£5~ÀyŒ®PDÚ(Òxæø}³:„óM2ï৲‚«`”)Dlüý·½¦r×ñÇ⸀ôœy¤QÁµkå0g"Î<,Á*ŠaÕ,ÖJÄyjŽ.jºvùÜ-û#‡oZ«LB×$}82øD|f<ÿg
"ˆ’¤p—g|­’gî
-¨Ñ9r}8›‹.Ò0ßxžO㣠eDètQ?š¬Z=
ÄÀ­mfîݺÞwòœ|‡`>ï`úxƒÂo„Ï�°›ª&©Ç�Iºp.�e:?¥ÙLO�iF:,o^+z4¨>3‰³èëÛûïoþºl�!µ.#±d°Ç̃¨üëü8p;5O¨õ�4æ�¬¬c•…
×\vñ’5áTM×'¹±:„MÊu¯¦*Pçv?z@šF¸Wì8§§
Ãé÷þUǃê{~mzNÿØ®šO¶b2Ñ×oñm9‹£ü’j(Ç1QA
UG�á¤,,2—{bNC3ñì³ô[ueÅÓZÊü¥/4r2ÉÜ­rF·Êx_µë3÷r9Z«ŽX(Fà²üup‚ANÞ–�d£G?ç}¯ÞÌbá‹.•Ž£Ú5w[Êø•
8£·_`“3v\òò¥;ðç“‚Úsj°"Šï, r–³Èïú@T41š’ÐÖ¬«Ù§ðXR-µ+C|ÕwÉÁ°E‘ÆEà9ƾ�ö‹m3wº^ÁØí±Ú¯Ä‹Ýºæ§ÕÐ?1˜Dàþå@zOùŸÿÁáð?�àLžëðÿ.€‚!ÇÁ$,nZëÉÝBœŠþ_�2ç;endstream
+xÚ­]sÛÆñ]¿B�141áûÂWú¤X²ã¤uZIéLç
$@	c`P*óë»{»wÈ“•L;|Àboïno¿÷@y.à'Ï“4NUœg…‰!“óÅúLœßÃØû3É43G4S}wwöæ]ªÎ‹¸HUz~·­•Ç"Ïåù]õKdâ<¾€DtõñööúíÅLI¢£·ß_þãîúæb¦
DDryõ¯)etùñíõ
Á,Þ]_^d&ºûùæúöâ×»ήï<‡ãSH¡‘½ßÎ~ùUœWp˜ÎD¬‹<9‚Ë¢Pçë3“è81Z;ÌêìöìŸ~ÁѨ�”Š±Ò �S±KRÄ©VÚŠåî¡Þ^È<ªñpi´ÞõBIT®úŽps[tëõ®måÐt-=5Ã
5Ï«ÖMÛôöºmOƒÝòˆhSÒ¦í@e[½é¶¼ÍC³ªˆì÷®å½æ–mûu3 àáô3)cТ²GùRï{П1 ? .Œ�ÿ
+y(tÔ׋ݶö4Òå°ã>3`íI
Ó´³®½'4±À„}Þ‡F–ö€*éÝÙ¢妜¯˜�è»ÕcÍ3àˆ�C
Û‹<b¥ˆ¨zªr(á¬Z
+Ð`ÃH÷¬Xl8¶ût»û‡à‘
3P·Æ�üETÎÇÈ%#‘·7ï’ldO*+b“æ9°Œœ^ÝÍÄ椉�I	í¹èì³â•‡#ΪzUß{N»¦b+”\\H“‚ŒŠX(SØeß!ëÚ¨¨К
” î-H¶'<Z�}za"	Ê�ðMK˜ÁŠ1¨Ñ×
+Fj
+ÉÔdöÝý¶\O}f××l�jDtO,Û³æyœÊlj‚p”  ã©òˆƒ@`Ci%¬œÈëéºð|nZ+•À(AOÍjż4÷¼IéPÎ
+¬ÇRè¡|¬�èË5C­‡‚\��êà¹vS
ö†à§V™æq!òŒíìÓO¯ƨŠX«Â…Ã×´$?ø4
+]Õ=
�ÈBÁ'‡ôj·¨«oâ“©ˆÜ„ò㔯o„H¾‘J›$F}*˜,�3-OGÝJ!¨ÀMúÜäN:É B¨©)vßl›G4 
+:*7®AÜ6ÓW Ø=�¸)ôqÇÏýmW÷¶$
+”JîSí3ÿ»ÐIŒ–üKBxçþŸÿ“qø
+äd�ç*üw•å�–af
+Wê„s÷ç�SÖÿu“
/endstream
 endobj
-787 0 obj <<
+784 0 obj <<
 /Type /Page
-/Contents 788 0 R
-/Resources 786 0 R
+/Contents 785 0 R
+/Resources 783 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 764 0 R
 >> endobj
-789 0 obj <<
-/D [787 0 R /XYZ 56.6929 794.5015 null]
+786 0 obj <<
+/D [784 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 202 0 obj <<
-/D [787 0 R /XYZ 56.6929 684.186 null]
+/D [784 0 R /XYZ 56.6929 684.186 null]
 >> endobj
-790 0 obj <<
-/D [787 0 R /XYZ 56.6929 655.2772 null]
+787 0 obj <<
+/D [784 0 R /XYZ 56.6929 655.2772 null]
 >> endobj
 206 0 obj <<
-/D [787 0 R /XYZ 56.6929 387.8252 null]
+/D [784 0 R /XYZ 56.6929 387.8252 null]
 >> endobj
-791 0 obj <<
-/D [787 0 R /XYZ 56.6929 356.2664 null]
+788 0 obj <<
+/D [784 0 R /XYZ 56.6929 356.2664 null]
 >> endobj
 210 0 obj <<
-/D [787 0 R /XYZ 56.6929 153.01 null]
+/D [784 0 R /XYZ 56.6929 153.01 null]
 >> endobj
-792 0 obj <<
-/D [787 0 R /XYZ 56.6929 124.1011 null]
+789 0 obj <<
+/D [784 0 R /XYZ 56.6929 124.1011 null]
 >> endobj
-786 0 obj <<
+783 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F57 624 0 R /F42 597 0 R /F58 627 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-795 0 obj <<
-/Length 2016      
+793 0 obj <<
+/Length 2678      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥X_w£¶÷§ðÃ}ÀçĪ„@@ÞÜÝl›ž{²iÖÛûÐö�ØrLƒ8îöÓwF3`Àlúp“¤Ñh4YÍ%ü«y
-©“`%�¥
-ç›ÃLÎ_`퇙bžeË´ìs}¿ž}÷ÁøóD$Æ7óõ®'+2ŽÕ|½ýÕ{÷ãêq}÷´Xú¡ô±X†Fz«÷¿,”RÞêáÝÝ{Zzÿð‰îV‹(ðÖŸŸî€¢”‘ö%¼óþñC|Ÿ>?>~|ZèÈ[áþ�¾ßß?°Ìdñûú§Ùݺ³¤o­’Íøsöëïr¾£šI¡“8œŸa"…J~˜¡a uKÉgŸf?w{«në”÷B‹0ö£	÷þ\Bàƾÿ„†¡ó˜^�MmM?�eÕÐ$+&Íáº9_ú±0Q¢�Tf–0»Ïî”ç_qh¼š¤×´�æ9
6§ªZ¨Ø³ECœ‘·µ¿IévË2ÊêP“ŒrG$ÖFEz°4jJ–¼Ý’Àš7¥Åvrå²å"$/Ë/§c-ÐT4N)‘„¡ïŒ»gÏœ3§;ŒÒ¼.itª-gKçÍÞi¶&RÃ܇ô³ÿy²UÖ.Ÿ÷–�^-bïTYñBó’éi1>e“Ó眥Õ_ëÆ.ÊG"Ñ~ì”ÿPVÀê€7Ï©S½¢:“o`æma9¡O/lÀ\.H@_ÁÑÈÊMIBÁwK
iµÞ[Z&×À’V†æ£}DÌø ­=òzÚ¸D€ñ3ýôáÝ0>	Z}ƒ‡Gò$ô§ê.·ƒ> êÐ@`g›+
 ²O`”Ð'cÒðP¾ZÞžnZs tà)#ðGïÇòl_m…Ô*yjöe•5i“½Ú©„ãs}Š|8OaTÛ
-„Õ<i(#a˜—é–F—ób1å–y7eѤgÌ]0ü.åõâáø¹<7
Ûƒ‰¢5¸¸>ÛŠ˜.YìÇìÜkÑ­Ü›)S)`˜á›�=r¡±	X8·sÇÁŒN@æ1ßÀ:˜¯L[O£THÔ«£Úâ2í6t´¥¥^­ÝÆÇHXîÕ
-)÷€Úo³&+‹4§•ß ÒŠìêGÄ„(—6´%³%ªKA±·„¾¡é¡¯Ž•ý8
-Éð%©MÝT�p8
9Š–(šØ\È€ ©áá¿�^0vzazi­¼ý1€’ñÁ 
-
6åá˜ÛÆæ¼
-Ê
€œøÌÕH³QƳ%6+èÀ8öîw´”Ò
-YèF)ïvÃÇ2ïå„h$ðÁ0Ù"r&OµtŒ$¤Ü¥3D'Þ´¯¶f?A¥a,Ûêöv·*
0±	FWÊi‚˜7¥õ {&M×´† ,Ž¯kÚŸªéöÙø@wÈUþàšJþÁƒ`ú_ËüîÕ	häº[ê`r:Ò7åÅAu!!ã…‚ÏÄ1]
Ø­¨¶ûšÚŠmÜ`EÃó´-cœÔ”ÍW÷ð­“j¼?N˜TÚªô¢ÈÔk2ŒÁKê:ò
´Ä*Ñ£ÞYL8,„LˆUËØêUB…º¸þIê‹Ílð)oØ£�k
ð1Iºr‘­Ã–¡Çvež—ç.çò”óAÔc—¯ÙÖr·*
£‡}Âðå‚•Ñå½a¦_R\±m¹Œ³yª~’Xø*ˆØ;oC•	Eê¶ØÄ„8|Wai¨7€UŠá,žÅ¾ÊÍ|1å8-”�oýCùÅp„‚wŠ¤Ó:@~\?¹_6ÈKbïS¿Buã�x­‚ìðàÿþ­ðò3j	@aÿ��„W�ŸD­R.Zz¬y÷£âµêÿ
+xÚµXY“£8~¯_áè'×ÖFˆ3:öÁWù¾Á×Ì<`�
›Ã|à‰ýï+!pájÏNOLl8Â$©T*3õe¢(±øJ²À°PáK’Â3„’á½°%�µ^@&óž½¥jêKåCäJ
+£ˆœXR·]2ÃÊ2(©æ¯åz»:V›Ó×wN`Ë<óú.ˆl¹Ú˜¿
+üô‚G¡Xw2ÿ]ìaø(ÛN&30NòcæÁtÝÌV>]^ó]gOK°\ëI)Â¥Gþ…<•;–:`$�ÃbÊ:£ÐÙ&”9–¯Ç§6”øTÎ
t3Stˆ@‰f{‹yiÎB?Åv:±;çL*Kc2j”EÌ Þ±�
+ŒÀ;d[áD(ôsmˆ*Ëa›ÏÀÈñãL˜¤ ŒK2N8«“ûð“m:džúYINó>+¼‚ôXx!‹«>xüPxßE–-ÿ‘ª£@NÆ_È(ätD„+é�À(’$à則TË¿èœÌžÂÀ4 5�¨í!úùÂg$|ÔƒO¦§zÅâlºÞ»"0"øG‡¿1ߨbN�(
ßjÃ	à×·Ý·úÒdÃù2YyÁ&–¢fsÛƒ†;Ý´tõ2ë^ÃÖþÚ]ë“ؑƷÌKŒÌ±ÒãÂMźòZÜZÕ¶»ì™Mþ¶ê¦¶^ëùg£ÎiŠ·¶÷¦v0Á<
+*íª¹"¹ï
\ÿ¶‚Ï�xK¸eÂïÝŨÚPÇ·ÙYAº·“ç@·[»Z_ŸÇ«ó¾âúºzØ­,{û&n›nèõ÷¦~{††Á„Õýj}*©ñÁ×jº¤M+Ôh'ÁY¨ËÅÌ—^ÐíoZÊÌ8’+±½ÆÑ=/§pðLcÅÕ´ùt³G茻3Çôzp�Ô]×æ—³Þf‡*¼0ë�Œ¶å_4a‡¶ƒø(ŠV/0'»·Á3¯�*ª[mŽ¤“¢,njGçè^öu5™pìÇD‘foýž¦&Æ‘“¦RU…•¹`O'×™Ñyfãðx1nünu\7¸íÄ´®£¡Ö]�­Ok¦ã ¤?Þ–-øí;ÅÕ}{ÿãâÏaœ ;…\ZÝ�«oF„Ÿå*º]ôФ/éל¨å d
+½�­îÂXëÕ©7¶›ë55@€{Q~\®gk5OGé¼®ÜZkÍl¶†‹ä­»¾�"ÖÕñÅÚµ.¶6‚ ·7|·§m6™3
+>€KÊ#DFª1�—¥»c›Î��¹·k�xž·úûÚˆú¡õ´mÅ«Kíóö²jWjˆãZ~ý©Vj¦:~¯{
+¶ùå jLß®ŽÎQOýŽ6>{• YLåÚ¢b/ÌÛèì?3lVWm·½…Wgå¢Æ&®`¤NX¥Êþ;¿„
Áÿû’#
+Ïã5ŠÖ�Îôl7Ï<¸Yï¼±R»š'6íý-‰‡Cn6TÄÉt/ï*NGv6_3¡èȾçzi~ÐÎ/8
+ù—sRq6Ã<mL?ÂG¹wäãÖ&Ë‹EßsŒ?(â
+f<»´Pb $ÿÜ­àEøç·VØHIÄ,–ûs]t‹ued>ãQÕç�ŸÈâ˜ÊàónÞ«>ƒ*xàQÀñàeúñ.´ý>î¥×2,#@ŽÏÚ~RïAYÅÿ\¹ù5.X%�‹AIfñº¥#®$,¯(�ŠèÔÏOÿSF¥ã�R#ÀÞ”
+åjß?õ¦þÈ|ñöˆÃb‰\oà’8Š�aÖ¨+´Á‘䬑ÁŒý+ÇâþÿÑ^þ¼³Á£is�Š§=æ WÈ–ég�éa¦éüÊ	eÒ ‘·ÊŸòI7ðÎãÞÉ1N.¦qCðË#€ÞFÈEs22«~¸( žý²	¼"1"Ä=~aûÿ tEÄõáóNõãNaEñÙý,{‡é?¾
þL|΄²Ì“á<�ñ)T‘J!ýsðkdï×Æ™TÁôÿ!? endstream
+endobj
+792 0 obj <<
+/Type /Page
+/Contents 793 0 R
+/Resources 791 0 R
+/MediaBox [0 0 595.2756 841.8898]
+/Parent 764 0 R
+>> endobj
+790 0 obj <<
+/Type /XObject
+/Subtype /Form
+/FormType 1
+/PTEX.FileName (/usr/local/share/db2latex/xsl/figures/note.pdf)
+/PTEX.PageNumber 1
+/PTEX.InfoDict 798 0 R 
+/Matrix [1.00000000 0.00000000 0.00000000 1.00000000 0.00000000 0.00000000]
+/BBox [0.00000000 0.00000000 27.00000000 27.00000000]
+/Resources <<
+/ProcSet [ /PDF ]
+/ExtGState <<
+/R4 799 0 R
+>>>>
+/Length 800 0 R
+/Filter /FlateDecode
+>>
+stream
+xœeU9²,GôûeË@@Q‡�!é¡%bd(dèúʤ—÷ÿ(žÑ¯
+’$¡T¬)ÿ®ïë¯ãïãÇ_¢ýþÏaíÏc‹®½Ú¿G—=ûÌöÓ1ÄF¬lÖ]töö×ãqu‰Ý¦‹÷5š�”�<8Ç—ý:\;âúãñ‰ü<q¸Í;.\ži2c¶û~ð¶e¸í×qc¸=7Ä+Àg
¯ã�ã×ctéa³ÙL1ca·cu™šmQOƒ½¥ì-¡
{wñ¨¼&kñÄÞ
+¨9xcH
+¤Ï’ÃigÙ¥—ÇáC6uéíÛ&”\ÊGTœ„Méêö–KòlÜ’Fyu|?é%åiÈ¥K”êNÊq{vˆ�*êèJE¢]8hÍò¤p0R±ˆ$Á(+ÁnÖN¬
+q�ª„Ñ«ò�^ÿï>‹«>÷—
.13×…Óƒ!¶3¢SËAÕ”ih¥Å¨Š^…(€<Îm䦽ªšÛÆlLÊâ³ò7Ù
+г2"ïE9~ 
+n*Œ1½÷¨¾x¥Æˆpîâ‹
&Xî
Ãœ§³±è\íD¤ß�ä0}#XŒûž˜‹¸À>#^V°¡|2Îi‰9ÊÎ�r)`˜¢Xh¡Ò& „hb—H°Œe"Ãê
+þrÓGçX5¾ûû8‡´ÕªOª«t–Ô³$Ây°‰—BÒ›ÀÄ5
©/¨�vp�÷o`kA“ôr±ñœÓ4N.4Žæ
+endobj
+798 0 obj
+<<
+/Producer (AFPL Ghostscript 6.50)
+>>
+endobj
+799 0 obj
+<<
+/Type /ExtGState
+/Name /R4
+/TR /Identity
+/OPM 1
+/SM 0.02
+/SA true
+>>
+endobj
+800 0 obj
+1049
 endobj
 794 0 obj <<
+/D [792 0 R /XYZ 85.0394 794.5015 null]
+>> endobj
+791 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F84 797 0 R >>
+/XObject << /Im1 790 0 R >>
+/ProcSet [ /PDF /Text ]
+>> endobj
+803 0 obj <<
+/Length 2020      
+/Filter /FlateDecode
+>>
+stream
+xÚ¥XOwã6¿ûSø°ù½˜%E‰’rsg2múö¥iâéÚ›ŽÕ‘%W’ãÎ~úH–dMzØä �Aüý´šKøWóГøÉ<JJÎ7‡™œ¿ÂÚ3Å<Ë–iÙçú~=ûî“ñç‰HŒoæë]OV,d«ùzû›ˆD,@‚ôî5‹¥JïùóããÏOykš¸ ï÷÷‰JK¥ŒÔÞ‡W�ë»'š
XÔê㯥”·zøpÇ>><ñénµˆoýùéîyñÇú§Ùݺ³¤o­’ÍøköÛr¾£šI¡“8œŸa …J~˜¡a u;“Ïžg¿t{«në¤÷”¾O]»/ðç*:€Å¾ÿ„†aë?p…”迷֧㱬dŵïÀl®{±‘ó¥%ÚIef¡£ñ³;åùW$�W“ôšÒ<'bsªª…Š=[4Äy[û»”~a·,£¬5É(w4Å:U¤KTS²äí–Ö¼)-¶“+—-!yY~9k�¦¢qJ‰$}gÜ={æœ9Ý�Jóº$êT[N¹Î›½ÓlMS
sÒ/Ìþ×ÉVY»|Þ[vzµˆ½SQdÅ+�KžO‹ñ)›ô˜¾ä,­þZ7öpQ>‰öc§ü§²P¼yN�bèÕ™|#?h#Ë	}zaæ²pA‚ùüÑY¹)I(øn©!­Ö{KËäXrÁƒ‰•¡ñhMf|ÐÖy=m\"
+‰zbT[\¦Ý†Ž¶´Ô«£Ûøw­àr¯V`’r¦AûmÖde‘æ´ò;TZ‘½@Ý"ELˆriCëP2[šu)ˆ"ö–Ð74=ôÕ±¡÷ƒtdG#Òê˜Nà´�Ñg¾my
+= Ýíä¾ä1ímöiñjk`&êÐwàë&n1"*ñVÅWšK�Ç<ƒØC®¶¹Z
hùHƒ„>[>°("N¤SÝ80hÒ‡;›0ç@æXO’
ÅÛÛÚoÓœª‚Æ)-!Á€ûŽ¾¯€Ê…»Ì|ïžY�iÕd›Sž¶¡£XÞ
+:|›ÓÈ¥³f,F! }“"]Õ…ÔpO}´›3ÜÖ#9ðhȺDÓã&Üý	"X-ôDn¿y¤qE0
.öïAö†o´hä®DÄq”8Îýütÿ¾;
Ä„·	€èÉž¬ÁÄÈV
ü W éÕŠÃÖã8,êvûßÞªo„¬§ƒó[d(&‘é,=,
+Y訔w;xác™÷rB
ôøf˜ì9�§º:FRîÒ¢oÚ‡[³Ÿˆ Ò@Ë@q¯q{»ƒ¿[•@ý›X#—+e„4AÄ›Òz„Ž=›¦ÚCÇ×íOUtût| ä�p�%ÿhAý�Eþ÷òÔR»—:œŽôMyqP^8‘ñBÁg"M÷v+ªí¾¦¶bÛ×WÑð8mëuuó•è^¾uR�÷ç	³JC[•^™z±CŠ±"xC]‡>€¶X%zÔ?‹	‡…�	q›"Y«3”	Uêâú'©/6³Á§¼a�îþÇa$é¾E¶\†Û•y^ž»XœËSÎQ�]¾e[ËݪdŒ6	Ã×–F—;ôŽ™~Mqɶõ2Îæ©Jbá«®ÞÇ*Š(Ô
óŠ	qø¶ÂÒPï «ÃÿX¼ˆ-|•ùbÊqZ(!ßû‡ò‹áïI§uˆü¸~r¿n�—Äߧ~„êÆò&úÙáÁÿý{áå§Ô ›É†Ã�0‹A+å¢\iÞþ°x­úÿ
+endobj
+802 0 obj <<
 /Type /Page
-/Contents 795 0 R
-/Resources 793 0 R
+/Contents 803 0 R
+/Resources 801 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 764 0 R
-/Annots [ 798 0 R ]
+/Annots [ 806 0 R ]
 >> endobj
-798 0 obj <<
+806 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [377.8384 566.941 436.8266 577.7254]
+/Rect [349.4919 566.941 408.4801 577.7254]
 /Subtype /Link
 /A << /S /GoTo /D (ipv6addresses) >>
 >> endobj
-796 0 obj <<
-/D [794 0 R /XYZ 85.0394 794.5015 null]
+804 0 obj <<
+/D [802 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 214 0 obj <<
-/D [794 0 R /XYZ 85.0394 769.5949 null]
+/D [802 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-797 0 obj <<
-/D [794 0 R /XYZ 85.0394 745.0977 null]
+805 0 obj <<
+/D [802 0 R /XYZ 56.6929 745.0977 null]
 >> endobj
 218 0 obj <<
-/D [794 0 R /XYZ 85.0394 552.7519 null]
+/D [802 0 R /XYZ 56.6929 552.7519 null]
 >> endobj
-799 0 obj <<
-/D [794 0 R /XYZ 85.0394 524.1722 null]
+807 0 obj <<
+/D [802 0 R /XYZ 56.6929 524.1722 null]
 >> endobj
 222 0 obj <<
-/D [794 0 R /XYZ 85.0394 397.0585 null]
+/D [802 0 R /XYZ 56.6929 397.0585 null]
 >> endobj
-800 0 obj <<
-/D [794 0 R /XYZ 85.0394 368.4788 null]
+808 0 obj <<
+/D [802 0 R /XYZ 56.6929 368.4788 null]
 >> endobj
-793 0 obj <<
+801 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-804 0 obj <<
-/Length 69        
-/Filter /FlateDecode
->>
-stream
-xÚ3T0
-endobj
-803 0 obj <<
-/Type /Page
-/Contents 804 0 R
-/Resources 802 0 R
-/MediaBox [0 0 595.2756 841.8898]
-/Parent 764 0 R
->> endobj
-805 0 obj <<
-/D [803 0 R /XYZ 56.6929 794.5015 null]
->> endobj
-802 0 obj <<
-/ProcSet [ /PDF ]
->> endobj
-808 0 obj <<
+812 0 obj <<
 /Length 1920      
 /Filter /FlateDecode
 >>
@@ -2037,59 +2088,59 @@ A®¤Ç�ÓIÈ !íÙ9ˆêu2¼	)Špšæ;É
*
 ÕV�µ2,Û
è_ç³î:ù¯ke—U)¯Å5�¡.Þf2g)¯ò2*j£Â‡u(碚Û)/ò<hPCûáìÓR/j(OÆÅ2VPˆûµ"iòh,XˆÌEíÐ$[Öü#
ó…Ê8‰"ËšHá$âˆÔAˆF
 jSlïíùn°+¼²±œ Ç9hÉÞY¢Zy’þ–
hJ“60;Kƒ(�±šßŽúÔ|žVü¶¨å8Xc�pQó
 endobj
-807 0 obj <<
+811 0 obj <<
 /Type /Page
-/Contents 808 0 R
-/Resources 806 0 R
+/Contents 812 0 R
+/Resources 810 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
+/Parent 817 0 R
 >> endobj
-809 0 obj <<
-/D [807 0 R /XYZ 85.0394 794.5015 null]
+813 0 obj <<
+/D [811 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 226 0 obj <<
-/D [807 0 R /XYZ 85.0394 769.5949 null]
+/D [811 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-810 0 obj <<
-/D [807 0 R /XYZ 85.0394 576.7004 null]
+814 0 obj <<
+/D [811 0 R /XYZ 85.0394 576.7004 null]
 >> endobj
 230 0 obj <<
-/D [807 0 R /XYZ 85.0394 576.7004 null]
+/D [811 0 R /XYZ 85.0394 576.7004 null]
 >> endobj
-811 0 obj <<
-/D [807 0 R /XYZ 85.0394 544.8207 null]
+815 0 obj <<
+/D [811 0 R /XYZ 85.0394 544.8207 null]
 >> endobj
 234 0 obj <<
-/D [807 0 R /XYZ 85.0394 403.9445 null]
+/D [811 0 R /XYZ 85.0394 403.9445 null]
 >> endobj
-812 0 obj <<
-/D [807 0 R /XYZ 85.0394 368.2811 null]
+816 0 obj <<
+/D [811 0 R /XYZ 85.0394 368.2811 null]
 >> endobj
-806 0 obj <<
+810 0 obj <<
 /Font << /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-816 0 obj <<
+820 0 obj <<
 /Length 69        
 /Filter /FlateDecode
 >>
 stream
 xÚ3T0
 endobj
-815 0 obj <<
+819 0 obj <<
 /Type /Page
-/Contents 816 0 R
-/Resources 814 0 R
+/Contents 820 0 R
+/Resources 818 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
+/Parent 817 0 R
 >> endobj
-817 0 obj <<
-/D [815 0 R /XYZ 56.6929 794.5015 null]
+821 0 obj <<
+/D [819 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-814 0 obj <<
+818 0 obj <<
 /ProcSet [ /PDF ]
 >> endobj
-820 0 obj <<
+824 0 obj <<
 /Length 3052      
 /Filter /FlateDecode
 >>
@@ -2108,47 +2159,47 @@ Yh Ò™¿8C@jͦÍk5íµ.Œ>=‡‘øZù£Äçüez
 ø»~�‚YŸOLbÊV�Ãó;,E�9:~>ca‚Î[y/D+Û¶ëCiâí´£‡ñQáóè¨JªT’¸ÕDKòú)—¯&­Ç@!€®PÒäñî¾)‡ÛÚ–ÆU¼uG�Ë©Ð8ÅxeÚ2Ê…‚ðÿœá‹‹™�„È™kM 
$ÈT¸�k!%ÓG¸W§Bc2F9C¡pÌaGnBáÅdæ©Çdhæ2Â⟡ҡG¯Ï³w¨…3·ãuÀx…WPLã=ûçð:iàÎö¬§ñL~«´b’ky;NŒW8UÚÂ÷ŸÉh( ®ÕêcM�ñíQ§ÌÉ—î¡ÏPÆ/.Ùc
 ï­6×ÌQ¤PïY{Õ#Ü
Íq„ò%sSˆ)Àg™#D ¬Mh<~5ÙÂH–ò¡­¹äªÜ_½¢b3ˆ2¼t4WñdlØ̧s@å×kz �­|¿
'ý6X
 endobj
-819 0 obj <<
+823 0 obj <<
 /Type /Page
-/Contents 820 0 R
-/Resources 818 0 R
+/Contents 824 0 R
+/Resources 822 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
-/Annots [ 826 0 R ]
+/Parent 817 0 R
+/Annots [ 830 0 R ]
 >> endobj
-826 0 obj <<
+830 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [356.2946 363.7923 412.5133 376.6291]
 /Subtype /Link
 /A << /S /GoTo /D (address_match_lists) >>
 >> endobj
-821 0 obj <<
-/D [819 0 R /XYZ 85.0394 794.5015 null]
+825 0 obj <<
+/D [823 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 238 0 obj <<
-/D [819 0 R /XYZ 85.0394 769.5949 null]
+/D [823 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-822 0 obj <<
-/D [819 0 R /XYZ 85.0394 576.7004 null]
+826 0 obj <<
+/D [823 0 R /XYZ 85.0394 576.7004 null]
 >> endobj
 242 0 obj <<
-/D [819 0 R /XYZ 85.0394 479.565 null]
+/D [823 0 R /XYZ 85.0394 479.565 null]
 >> endobj
-823 0 obj <<
-/D [819 0 R /XYZ 85.0394 441.8891 null]
+827 0 obj <<
+/D [823 0 R /XYZ 85.0394 441.8891 null]
 >> endobj
-824 0 obj <<
-/D [819 0 R /XYZ 85.0394 424.9629 null]
+828 0 obj <<
+/D [823 0 R /XYZ 85.0394 424.9629 null]
 >> endobj
-825 0 obj <<
-/D [819 0 R /XYZ 85.0394 413.0077 null]
+829 0 obj <<
+/D [823 0 R /XYZ 85.0394 413.0077 null]
 >> endobj
-818 0 obj <<
+822 0 obj <<
 /Font << /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-830 0 obj <<
+834 0 obj <<
 /Length 3528      
 /Filter /FlateDecode
 >>
@@ -2176,110 +2227,105 @@ D%8ÄïŠ.^|[Ù¢Îá3l«Sº•€ýx™ÉÇ|‘¸¿ªð›¾ÙØýÞø›F[¢ù«o?¿)×åÒÿýsçé£]Hþñ¥Ÿûµ¡øö
 Xða{S6…=!˜«=6ä½Ëåð=$i4mowJæ
Eêkh*Õ4G4×(�̽=Y/²A·ázŠè�>Ù*¹­vÛtGîóG”é¬íŠÎI°?¯ð!¾E:Hv Q¼"TÄRµíªn×ÅÇSCîÒÀ]¯NZ bS¡ÑUeLÏ]%ÏgìQ´BîíÞªôp_Ó«êëÏŽ½e&h¡%Ÿ~¼ÝŸåL#áýÈ’(&{°|!„¨ñ¦
 àM§7�“7zt>|å`ÓHû°×Qf@fá­ÌË>ðáuŒÈ¨ìY"Ašˆ)&÷©7k‚HqÖ½DšÚtO¤ñ¦y"õ7)Ô¬Áú¸§R¬iÿvöIHæ¶�SöIBÙ[/ÁÔ=„êÍš Tœu/¡¦6Ýj¼ižPýMC…ËyG°¯FYïÊ[ùÜ‚ŒÑqE	>äg¬WªÊ&ƒsŒÞÖj­Ø4¹{“ŽS;Nº�ØS;&Z�wÌ’º¿ã¾bàßÝõlY”ÖUÞì#¬½mqdÿ(ÏJ9xÜT�X!Ç[ æ¡<‘1z�©ØÏ9Α0ç>†Ll—ø1Ú.ËŽÞvE| ܦ·1£~Y/×Ûô¸1Z�˦XBS8-�ý0üqŠ¾ýmö”‡��iMó´H¹@@Ê=Ö˜Q�¤Ôÿ½¬Vâendstream
 endobj
-829 0 obj <<
+833 0 obj <<
 /Type /Page
-/Contents 830 0 R
-/Resources 828 0 R
+/Contents 834 0 R
+/Resources 832 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
+/Parent 817 0 R
 >> endobj
-831 0 obj <<
-/D [829 0 R /XYZ 56.6929 794.5015 null]
+835 0 obj <<
+/D [833 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 246 0 obj <<
-/D [829 0 R /XYZ 56.6929 363.2968 null]
+/D [833 0 R /XYZ 56.6929 363.2968 null]
 >> endobj
-827 0 obj <<
-/D [829 0 R /XYZ 56.6929 335.217 null]
+831 0 obj <<
+/D [833 0 R /XYZ 56.6929 335.217 null]
 >> endobj
 250 0 obj <<
-/D [829 0 R /XYZ 56.6929 335.217 null]
+/D [833 0 R /XYZ 56.6929 335.217 null]
 >> endobj
-832 0 obj <<
-/D [829 0 R /XYZ 56.6929 306.9099 null]
+836 0 obj <<
+/D [833 0 R /XYZ 56.6929 306.9099 null]
 >> endobj
 254 0 obj <<
-/D [829 0 R /XYZ 56.6929 226.5017 null]
+/D [833 0 R /XYZ 56.6929 226.5017 null]
 >> endobj
-833 0 obj <<
-/D [829 0 R /XYZ 56.6929 197.9796 null]
+837 0 obj <<
+/D [833 0 R /XYZ 56.6929 197.9796 null]
 >> endobj
-828 0 obj <<
+832 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F42 597 0 R /F58 627 0 R /F14 608 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-836 0 obj <<
+840 0 obj <<
 /Length 2750      
 /Filter /FlateDecode
 >>
 stream
-xÚ­]sÛ6òÝ¿Â�{(G4Hð³}j\»u§u{‰2w3Mg&!‰cŠTI*Žþýíb %ÓIgÚÑ�]`±‹ý†‚s
¿à<‹}!óè<Í#?A|^lÏÄùp?œ¼fa-¦«Þ,Ï®n“ð<÷ó$LΗ«	­ÌYœ/Ëß½ë¿ûmyóöbÆÂKü‹EœïÍÝý÷ÉésýëýíÝïß~w‘FÞòî×{¿½¹½y{s}S 
û¦ð†ۻŸohtóóÍ/7÷Ëw,:»Y:a¦B¢$žýþ‡8/AîŸÎ„/ó,>‚‰ðƒ<Ï·gQ,ý8’ÒBê³wgÿv'X³uîc™ùq¦37ɹŒs?‘¡47xSë­n†ä’Ò+TCƒ�ßÐkôZ
º$àS5lh¤èSkUVÍš&úSQ«­ª¶¡½[Õ=ꃈÅÿ¾ú>Ák„$žj˜æ°Ñ4€�S¯«~ Q£¶º'jÂ0RÍ
?†Fj MÛh�&à:AàçqÙQ·…ª7m?ðÆ(äÃeŒ=ô8!°ê.‚ÌÓ4ÙѤÔ„]‚‰¤ÀÙ/í¸HxU³j;+;î²ß
ŽfB,Í5ãà�q«voyªÜN='S©û¢«v|Ë`ŠíŠ¾t‘0PEMƒ~
-Ý÷„A›o÷MHåk²�Š>hj„
-#!Zÿ�!úY3ΪޚCU³eð«1TÚýš¥œZRÙ{T”±ëY#úÏF£¹J�âË0÷ÖÕG¹û�@Gœ"/ìYèWŸƒ¬"¦h·;vÂ’0xˆ˜=îˆ( X|Ä¡ø`+2ÊI£…s1tê£îÌEpã˜CÝ‚ÅÍXؾ�;„»ÉÃH˜Om9Oˆ	�š�¢„=ÀUºci a¯±õœlÝî&L©wº){‚ÛåO4”Ž€¤$€r°ÄcxýÃEàir(˜±®a!jÎÀœµƒÆ‹¶È ê×l÷Ø?é"u³°Ñg×vCÏK�Á£Á1N±ÝÁV‰�6lz£8S››ÄX¢˜/NCŸ³AÐ6‰Š#Üg¾Œ±2Êc	iíÝ“ �U.ó!ÀZ’ªëö©?!kŽ²g3
·tN„—º© ÌXQÃ$N½»Ú£É�.Ñ@$ë…¼ÜÚFæc9rãÖI:­dšË
S¡Pn˜€aZe…‰ôEœk†#”uÑ´Cµ:ðâiA'~¥)/~=C.ñ…pˆÚŸ{ÝÍ‹}	{¿@+9¢>Üô+òÕr	`Y–|†Þ"Š�&ÇZ0”÷;“fèB!Èø3tc?
-epÄ'Q[€>©ÎTLÏ	A%c9Ê೑±ª-ÁR)­–jU<nÚzŽÝ(õ“$ÎFn€l{”ȳä8Ž"Æ!À¡_0S9Fµ õÞUÛªV]}¸‚À²i‹pVé'‘L�CÌ4h$PÙòJí'JJ	EÄUp4€A¯»�&D$”æH´÷�Ѫ*S*ÂJ{”‹|àêˆ.úc
%‡þºç…ã-h=m*s0,Û9o%6Ž¯‹b(ðl°z£­˜ANl…v
-{øTc`§•WÍæ*‰aØ>&˜èj›¤ß“"'°ãлmíêOj»«õlñEÒžx.Õ?ôåU}‹A8÷¾‚Pf'ývÆ'¡“inC•(¡t[pŽ—Ž(ª‹Ì=§ƒç3‹À’j®€°ºeÓBŒ£êL„¦än¸Â¦$\ÓÈ{óÔóàXµuÛ>îwh	ÒT0ˆ&¼"Øxf`•Hw'Ö5Þ=5" ÌÌ{ß�!ð(¬�PÂȆÀ¯hõx•ÆÆí盦~$6曺ÒØ:²ÈNqÕÙ>Àýêá@ˆ�úHUN0Ñ5h«ÃHäÇó
-n÷£#™ôYTâÊã·"A~´Šõ¾³ºI2c'µÆnbýò"½–怚vRòI­õ¬;’u=
)½d¬\
-0/u
u;õ£0e.„yGèí'âk." o;òôf)(zá—»mAÁ‘åš&mcÏVôÁ§z2	7Ñj(Í�Ÿ(u̬ìí¾ª]íêíŸ]>§ùðHóС¡DTÄf|ïî©D”Br‰PW"ÂÌ>yxÕbÒãp깑®#j^-}[÷Ë`$
-×âüí¿QÇ?™£Ô—YÎÿC
-	ÑÏÂ<µL¡ a~ʹû¿õ9ëÿ×kendstream
+xÚ­]sÛ6òÝ¿B�{(G4Hð³}j\¹u§u{‰2w3Mg"!‰cŠTI*Šþýíb$%ÓIgÚÑ�]`±‹ý†¼™€Ÿ7KBWÈ4˜Åià†ÂgÙîJÌ6€ûáÊã5s»h>^õfyu{ù³ÔM#?š-×#Z‰+’Ä›-óß�»¿ûm¹x{=÷CáDîõ<Œ„óæáñ{‚¤ô¹ûõñþá‡÷o¿»Žgùðë#�ß.îo�w˜iØï1…6Ü?ü¼ ÑâçÅ/‹Çå»ë?–?]-–½0c�=!Q’?¯~ÿCÌr�û§+áÊ4	gG˜×KS¶»
+Bé†�”R^½»úwOp„5[§.0”‰&~<qƒ�œºÁ0u#éKsƒ‹RïtÕµ —”N¦*¬4~}§ÒÕ需ǢÛÒHѧÔ*/ª
Mô§¬T;ÕuE{wªy"ÔŠÿ}õ5|¼×‰U1Ín«i
+«[6-ÄôT{¡)¹®°)	×T'òÞ4výÔ;WmY×O‡=Z‚4‚¯6žéYez²¿ëïžPfâ¼o‡xÖ<H(~`CàW´z¸Jcã=íçÇnâE6曺ÒØ:²ÈNpÕY¯à~	µ:b«>R•ã�tAA
Új?éùŬ s|²u´!2Ž
+$kZRzIX¹
+
+œ„›ˆk%èç”@ŒÁ°²w‡²+öe_uWøøò9Íûgš‡>
%¢R0ëwK…¢’E€ö…"ÌìÃ'€×5¦>~§ÎéöDÍÛ¢¥o«é
€—¢w’�¿©;áG!ôz‹—Ü=ÐäÕí7ÓÁü,þÁÜob¹Q¯£�ǹS='Èï”&²=£ØŸvFsîÅn*ý‹®sBºð%é—RUeÃrV7�éÄòönßOè‹VcÌà%Ñ¥Ü$Œ’	fÆ9l¬›¹ô„›È øÒ­áƒ~˺Ú`a9Î%¦~Æ�/¤ëC#ò×3êEB€r<v½ ñ�KáÆø’b|íæ¦÷¶ {ÌØHpÈl_iÍ
 endobj
-835 0 obj <<
+839 0 obj <<
 /Type /Page
-/Contents 836 0 R
-/Resources 834 0 R
+/Contents 840 0 R
+/Resources 838 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
+/Parent 817 0 R
 >> endobj
-837 0 obj <<
-/D [835 0 R /XYZ 85.0394 794.5015 null]
+841 0 obj <<
+/D [839 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 258 0 obj <<
-/D [835 0 R /XYZ 85.0394 497.0473 null]
+/D [839 0 R /XYZ 85.0394 497.0473 null]
 >> endobj
-838 0 obj <<
-/D [835 0 R /XYZ 85.0394 468.4726 null]
+842 0 obj <<
+/D [839 0 R /XYZ 85.0394 468.4726 null]
 >> endobj
 262 0 obj <<
-/D [835 0 R /XYZ 85.0394 408.9221 null]
+/D [839 0 R /XYZ 85.0394 408.9221 null]
 >> endobj
-839 0 obj <<
-/D [835 0 R /XYZ 85.0394 382.8699 null]
+843 0 obj <<
+/D [839 0 R /XYZ 85.0394 382.8699 null]
 >> endobj
 266 0 obj <<
-/D [835 0 R /XYZ 85.0394 310.3501 null]
+/D [839 0 R /XYZ 85.0394 310.3501 null]
 >> endobj
-840 0 obj <<
-/D [835 0 R /XYZ 85.0394 283.0525 null]
+844 0 obj <<
+/D [839 0 R /XYZ 85.0394 283.0525 null]
 >> endobj
-834 0 obj <<
+838 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-844 0 obj <<
-/Length 2301      
+848 0 obj <<
+/Length 2299      
 /Filter /FlateDecode
 >>
 stream
-xÚÍZmoã6þž_! j£k._DRì}J³I.E7í%.‡¶À)2•%W’“fý
ßd9Vì¤ñÁ+¾‡ägž‡tH„ቸ@BQI#Ž	�²ÅŽî ïüˆx™Išô¥¾›}<4RH	*¢émOW‚p’�h:ûe$EcЀG'?^ž]œÿ|u<–ñhzñãåxB9�]üpêJçWÇŸ?_�'$ádtòÏ㟦§W®Kxß]\~r-Ê}žQzuzvzuzyr:þmúýÑé´ÛK¿3³‘?Ž~ù
G3Øö÷G1•ðè
*¥h´8Š9C<f,´G×GÿêözíÐAûŒ([m�Ë!r…£ÌðãÇñD`<šÎóƕ·�kWhÚ´n]±ºußÔ}²j±ÐeÖ#Ôêð#Jý§Pä¥6F‚•NAŠsº1m˜,
64p5}¯Ë°¨ju7÷cÛMEu—giQ<îšp¹µ—nŸËZßçÕªy²7Pöñ,f=C‚jªP’HeU_ÏuQLšö±
-ì²"†TrÒÍÌr³¼ðp^§‹EZ?ƒµ	L¬Xˆ>
-a扔”ûd[ú3�MÞX;ðµn
-è
-u‡jVG
-M Øk»†9°]øî@îotg^oó›Ç5¹wÓö—I€1Â}$p©ºœe‹ƒK‹,,nÕæEÞ>Ž	!£.\[çmæ~êAz@2Ž8gÉ2®ÁŽ�æ�´W3½×ƒ^®ÙH—Ží°Yo=‡2Zˆ‹Ãå*˜RÄŒï1•ˆ$>
ü®÷¬Yê,7²6Ø«Á½„¤³èhv9ÈôXrlZrß“®à˜ÃU8ëH�
-tÂuVƒt°Î¿ôXЪé�jz}q¾Ã]=K*KÜ]
-’1ºÇ]˜!*c-pg½3&x�˘FaÙ”Qb	0„úÞæ|h½–{ÄáåÂÑú¯ÇYY§`
(“ÞÁ½aÔ¸†À€¦¤õÁ]}KÖ]d@“QBéž”DaOLÄUŠ‡Zþ-ÉÂÊ6@ÆV<	Xàh¶ZfÀ€/e€‡¨Ä“F[ÊZ_hü×|À£ùÝÜ÷<èuÙ/§*ì11-³T/ íSVb^²˜Üt³¹ò,lCdx8³F\>hL:À3×æ'¦çŒ÷à
-6îBn«®¿iW7^eé55Ez?ø&÷Å> ˜dÜMféO‘î¦�}³¼ßh'
-t琉˜ß\r®–©^ï�0“A\ÝÕ�}Óߥehß¾ªƒ@˜ÆJ¸l­L6·w6èŸéÛtU<½”ºãuÞ{{|}çÛᲞ5Þ-ë§8F¸ÿ†9è1ó6Øð¨dm½Mu¸gº^_곡‡šµwLeóú¿t€:é\l.
i“ï2üzOï–«P�ÙŒDq$dâ¸z[¯ cÌ&À$_•ëìu©'#;ÜÕ?]^_Ÿž¸²Ñ÷¼1û}¿Ö`%Lˆ=ÖL’”¹¨¾ÏõÃk­è�¤ªèŽÛb=‡5Ú
CŸØjBö -‘I‘ôÐë¯ÍÝa°ÞZe°—¿Qÿ?ÞÕˆ"(–‚E	ýÂ�…ðÛúÖoìT&(NH+HµDÄý•¶b1JºWÉ¡‡˜SªÀŸ½
1	Ä[–i€qPã’y™ç
›	”`Òåÿ'¯¢‹ô1ä÷"”²l µÌô:ß!ų¿2`‚Œ
ýåŽö&š—þ�Äúw
-¸U°$¡ÃþéÜèeÁðÖÊÃTl/ýòÿ-Îendstream
+xÚÍZmoã6þž_! j£k.ß%ö>¥Ù$—¢›ö‡C[àY±…Ê’+ÉI³¿þ†o2+qÒøŠ`�_†CòÎÌC:$Âð�DB"©¨ŠbÅ‘ÀDDÙòGsè;?"Nfâ…&¡ÔwÓ£�g’F
+)Ie4½
t%'	‰¦³_FQ4
xtòãåÙÅùÏWÇã˜�¦?^Ž'TàÑÙŧ¶t~uüùóñÕxBAF'ÿ<þizze»¤ÓñÝÅå'Û¢ìç	¥W§g§W§—'§ãߦß�Nû½„û%˜é�üqôËo8šÁ¶¿?ˆ©DD÷PÁˆ(E£å	Θo)�®�þÕ+zÍÐAüF”
V»
+fÁ1LÁ‚Óf°Šþ
+Ëf÷TLÃÇ‹%�>Õ°Ç(ئW<	5›m&<8è�,A
+æ1ÌlÄúϘp°> Žå(K«ªîlyÝæ¶`Ž„.´ù²Èê²®lUGˆÿþãkxŒMø8½&Ù±µ
+>£K#§<uóÙcådÖÙÂõ¶öû0¦fmø^OT¯K$Lp˜`Z¯®~1ªÁÕLíWŒ)dhÒÉ=&Ö1uO°#=º¨fà2]ÞÚÞ΋™x¥´—è7
?­{¾¶Ûî
+¯¶Ûå“!Gô".¢‰J¢ðœ¾íèk'JÂÙßÐ…·9fèM1’1°ŒÞ›hD8b\Ò�\è]a¡”gg1„’“4˜áfEé2Ày“.—ióD®M`bż÷Qp3GÔ ¤ì'ÛÑ/™nl‹ÖdQ1i¾ÆL>»BÝf5£Ã'•	ãñèú‘\îå\ÖC�F Â‘“¡Ü'uá“©ØÊõÐlÙ€­¸¯O5DtSÊË<�îiç´¤•S°ZåicËz¥õÚHèóœ•u[TsÛw¤!7{Åjô9­œþ
+y³,*æˆÂ†ì¸© ·ò¾MâSÏ'n벬ïíNÞ6øãÙÛõjU70å·�ý3‰Æqį1‘/1¾DÀÖ[¾ô×F©‘2èUj´#Øcgv[‚h¥ åqúr�2`Ã	#‹ˆëÊiVx'�ÐE rÙÔ8˵V&’Jeâ%$ˆ*]jƒê–‹ŸlS:›Y´Nt™vÙÂLw—à´ph˜R`ÊÆ)Ë2+­SœB3¾.‡œ,í‰&ø�£‚�×ÚÝC’§làñ6„µ-‘ñÆm^®Òïá)£ñ.wj�Í Íc%dï­M]¶/0\V:¯h=ÁÞ@lÀòÒu{r“÷ð:Ìo6äÞN.“
+�¸àÊ´rß¾ŠAÆÂÚ’÷Z¼"SÑ<ÑJXšM&¶öJnª¶¿íÖ7Neå4µez7ø*÷Å<!h»÷“T¦Ï“È–÷ëïDB�îaþ”ý«ƒ
ÏõJçªy¼§Œ2•Œæe}c^u�È÷�Úw/ë à§16^+ÏÍ­
úgùmº._Kíñºõ/¾
ãßÜúž1Y€Æ»åýs„ÃWÌA‹é×ƤËKë½ù4÷7â,o6×úlè©fc]Ù~
 endobj
-843 0 obj <<
+847 0 obj <<
 /Type /Page
-/Contents 844 0 R
-/Resources 842 0 R
+/Contents 848 0 R
+/Resources 846 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 813 0 R
+/Parent 817 0 R
 >> endobj
-841 0 obj <<
+845 0 obj <<
 /Type /XObject
 /Subtype /Form
 /FormType 1
@@ -2299,190 +2345,191 @@ xÚm”In1EOPw¨u€$ÅIg0²Êľÿ6¤¤êV5oʯÅésÀó�ή¯�ƒÖ×O²Î Ž¢‘ÿ¨#h8Çùø:„5?ù
 6\>RgÈbÏWÖ¹j[†�›
 WŒÏ¢®{6;»²þFÃÇñ÷ø]š¨)Õ/Ô¬Mu;pk;Ì©Ëdh<åE–ñ¬AÏw³ð¬±±Nê¦ó¡Ä½�t•‹ùD„™Â²]°Ä(�‡;�„ ·åŽ°Š­r²ÂÙÄLûˆ
T¥Í¡誋ŠŽt’¹w_=Î]ˆ‹=¦uSä÷—ä"ï±yl±‡µÃ-ËkHsŠöreOÚ³êvg›<7ºt,‡Ýe—;ãÒèЭ/I…B÷&ê(ýê³ö󻉨YÙ¹Ç,çkRÔšÚ'^
m"	^�˜h±�ÎW9AVªy­Â©/f�ýÆ"•œãûFy-Sng	\Çdª¼˜©Æ¥†Í}B©•µŒÎ$âw1.¶&�Øíþ²C¶O–ÃVç X×9g¹E{îÇ<•ãóP)!ÍZÜÅŸLÞª~ÑÔ'¯UâXLµüc“ÅXsЖõÚ¯½˜Ó’~òBL–§èªÆ¹O¦ºNZ�_[Èü.øšŠû*]3QôçÇñ!Ö-žendstream
 endobj
-845 0 obj <<
-/D [843 0 R /XYZ 56.6929 794.5015 null]
+849 0 obj <<
+/D [847 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 270 0 obj <<
-/D [843 0 R /XYZ 56.6929 486.3415 null]
->> endobj
-849 0 obj <<
-/D [843 0 R /XYZ 56.6929 454.4975 null]
+/D [847 0 R /XYZ 56.6929 486.3415 null]
 >> endobj
 850 0 obj <<
-/D [843 0 R /XYZ 56.6929 395.7282 null]
+/D [847 0 R /XYZ 56.6929 454.4975 null]
 >> endobj
 851 0 obj <<
-/D [843 0 R /XYZ 56.6929 383.773 null]
+/D [847 0 R /XYZ 56.6929 395.7282 null]
 >> endobj
-842 0 obj <<
-/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F84 848 0 R /F42 597 0 R >>
-/XObject << /Im1 841 0 R >>
+852 0 obj <<
+/D [847 0 R /XYZ 56.6929 383.773 null]
+>> endobj
+846 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F84 797 0 R /F42 597 0 R >>
+/XObject << /Im2 845 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-854 0 obj <<
-/Length 3138      
+855 0 obj <<
+/Length 3170      
 /Filter /FlateDecode
 >>
 stream
-xÚÅZKsãƾëWð*µÏƒÝ“,k¹ÖëÍ®|²].ˆ„$dI@! ••Äÿ=ÝÓ3x� %[J¥xÀ¼ÐÓÓϯ3?1s†q•éYšif¸0³ÅúˆÏ®aîÛ#Ö$qQ2\õõÅÑWo­œe,³ÒÎ.®´ãΉÙÅò§ùéßN>\œ}<N¤ásËŽcùüëó÷ßÐHF�ÓÞ¿=ÿöÇ�'Ç©ž_œÿðž†?ž½=ûxöþôì8Îx_
-{^x{þîŒZß~<ùþû“�Ç¿\|wtvÑ�ex^ÁäŸG?ýÂgK8öwGœ©Ì™Ù=t8Y&gë#m3Z©8²:útô÷Žà`Ö¿:%?£3N¦Ôr&ËŒ‘#	šŒY%•— Z€
-%éXÂ7–ËMÑ4¿®óvqóëªlZ¿6ÙZLÚþý
±0>ð SÆ­qÝ�ä#ú¦ø™sY•mYW4’WKjüØä×EØFí?éÅMÑñÒ/Âe°8Jc—�0LX×4Æ´™çMS^WMèУyX_Ö«rA=’*¶Ú:,«ÂDy,ÜĉvîeJs(X°mÅÝü<lu]´aŸ26zÚWžR½1r»)Á
-¨sפ)¥™tÒ�ÕZ_±Žx‚�È4‘§æ50%øüd±è–œÖUKÛå½Ã…Ôü™~rú®�§`~ЋHY¦Àþqã÷uGP
-Äs“·Ø²^@82b'38‡Ìü%“pt}×—adI–S,iø¾lo&ì@¦Že<‡
Á‚Ñê4¬¹,®jâŽ6*ÃÆ‹È=q`QðK)VMqSÐ[o`,ÍæUüBA–Š-µÀ÷¹_¬�Þ½
-4*PBÐ[dÅwV«ú¾XNÊýÀ/ºªqUY]S•4Aêò®\µIY½ÞŽœBh–¦©œ«˜SZ?%vB0¦é8vþ¹·"#¼—Ø^è=´B3¾1&•t‡J ‚1—fr™– ¢¼1†éÈòêaÂj2Å”0&XÍ÷hÁ�ÒVÁanjp¶-bÃÓÚêY`F=ÿ€
-¸±æÿ'2Spj©Åc2Ó�"'s¬êªøcB«ê§ÉlÀÌKÉ,渧“Œoì—¡Üc2S‚�­/ŽU½ÈWxü? ¸TA|EŸNåüüÃMC”DiȆ¡>æÆ}n€Ed®0Pí}½ùL�²j‹ÍU¾(ŽÅ<¾Pu‘gËÚyš‡Rè
Õ
dò<9÷ªÀá$ØÜÓIÆ7öªN[+Õ£æÎSfu��W]…‰üɪ™ö‘Ê=
!¢)š!¥ú™
=I§8×釯âüýM‰ÉxÕà©fJ{79*W(B/Böz˜"37ÿT{,+ˆHCË–5
VuK�[‚
-_À\Êex#§Ç}þ@�&Ã{˶Y—%z¦ÄÀ¤¤D}ªÿ�FVED®Û›†úÞˆq5@Í`ôн‡]b~^Ñ\sçñ�$.a`‘7Å«)
c
MRuÒ­ƒ°jõ0@]1âuŽy‡fà}ŒØŠæ�ýÃà ÂlŸ§p/6X·SC^÷DÍ
DÛˆŒö{íОçb½×öEÔÿYˆL2n¤ApƲ,Ãjn§ªSÜÂi2¨ê´JY
-J}¤ªSYÆ´tº+‚T(‚ˆ§ëUó'J;ËT
-žžJ_ÑE 8²:ð­–!X§Vyû«·+ßù½Ë˜,ÔJ‰`©V”ŠþJS�Ú`ñ>GÂë·õ¦í¨RÇ�{”¹C»Å%MüJÃœÁŽøÿ\<4c202zù
½�JŒ#HxÆØ›ÉRV.e
–”²Ó¢~Šÿd=ëÕkÔ³˜1©
ÎÚ±0éÕ’«ÝšVÙBîbŠ
-Àgªi
¨ˆ[)0¯÷
ó ä­dèoo¤¤Û)é.
-û¡h‚ÄÏaĆ5=óàQîó¼íÍÒ½R•:ƒ*OXpEwÏkG1’Ü•«4 ~
ñª[vH°ŠI¬€x¼9ÜÅ" RΕÜÅ
-[¤`í†À�¼ÛPy`}ëc.
-:L+¶�VÌü¾\-ýUÙX+oHûWªb�ù¢	™^pàÓȱ

-Œ	ë¶àÙë×SôbÂ…‚‹²‚„;€}Še¼­ÞÄÊø·r}·Žxdq·AÌ$„�$ékœ
29¿_R2Üu�_m¯ÉŒ/FÈèCÈÏRê)«ƒ„nœ!ê½а,À>Xå)úm ѵ	^ÄýÖ½H&lO0áºÐ¼*u.�	å°¨}>t‰“
Å	è’J¼73ݾ hΉL¯¨¾6&UcÅúÏ*»¿èY
:õå–Msæ{øŒ½a,-½éŒJÓƒNO‰n7±Ü@õ¢¥:ÇP�“š}Å
-:>ÿ¼êr.¬Øý“Àè+rgxÉÄå
-°]÷å³é›x	ò0…›5`}+²Þèw�3`nS̼ÂIý¸9L§`3‡XfL·¯�¹Ëiˆá2QH±ò×-A8ñÛû´W@x…"_<âì#}A
t@¥`ovK
+xÚÅZKsãƾëWð*µÏƒÝ“,k¹ÖëÍ®|²].ˆ„$dI@! ••Äÿ=ÝÓ3x� %[J¥xÀ`==ýüz@1ãð3gW™ž¥™f†3[¬�øìƾ=aN'%ÃY__}õÖÊYÆ2+íìâj@Ë1],šŸþíäÃÅÙÇãD>·ì81–Ï¿>ÿ
õdô8ýáýÛóoüxrœêùÅùï©ûãÙÛ³�gïOÏŽጀõ2Pسàíù»3j}ûñäûïO>ÿrñÝÑÙEw–áyWx�ýôŸ-áØßq¦2gf÷ð™È29[i£˜ÑJÅžÕѧ£¿w£~é”üŒrÌ8™NPË™,3FŽ$h2f•T^‚xh
àœÏóÅŠŽ÷©ÍÛb]Tm8í&_¯ó
žö«·&(…Ï©Y¦…öÄ<
K”’*_ôöo\9“Še(”¤c	W,—›¢i~]çíâæ×UÙ´~n²5™´ýûba|,àA§Œ[ãºÉGôMñ3ç²*Û²®¨'¯–Ôø±É¯‹°�ÚÒ‹›¢ã¥Ÿ$2&„Ë`r”Æ.!a˜°*ÎiŒi3Ï›¦¼®šðB�æa}Y¯Ê½‘T±ÕÖaZž Êcáæ Nì°s/SCÁ‚m+îæça«ë¢
û”±ÑÓ¾ò”êõˆ‘ÛM	Vð@/wMAšRšI'ÝX­õUëˆ'èˆ<Ayj^S‚ÏO‹nÊi]µ´}PÞ;œHÍŸ¹á'§ïx
+æ÷½ˆ”e
+ì7~_·p¥@<7y‹-ë„=#fp 0ƒcÈÌ_B7‰
{×wM qz–d9Å’ºïËöfÂdêXÆSqØ,­NÃœËâª&îh£2l¼ˆÜ¿¤žbÕ÷7­z}i6¯êà?
+²Tl©¶¸Ïýü`í´ö*Ш@	Ao‘ÿ²ZÕ÷ÅrRÞè~ÒU�³Êêš^QI¤.ïÊU›”ÕëíÈ)„fišÊ™±Š9¥õSb'3ašŽcçŸ[á½Äör@ë8Ð
+͸bL*é•@c.Íä02,A
+&DycÓ1�åÕÄÕdŠ)aL°šïÑ‚;¥­‚ÃÜÔà0l[Ć;¦µÕ³ÀŒzþ
pc-ŒÿOd¦àÔR‹Çd¦!E
+NæXÕUñÇ„VÕO“Ù€™—’YÌqO'Wì—¡Üc2S‚�­/ŽU½ÈWxü? ¸TA|EŸNåüüÃM]”D©Ë†®>æÆ…>7À$2W訊ö¾Þ|¦—²j‹ÍU¾(ŽÅ<.¨ºÈ3ˆemŒ<ÍC)ô€ê2yžœ{Õ
àplîé$㊽ªÓÖÁLõ¨¹ó”YdàUWa"²êD¦}d�†òFO]ˆƒhˆFH©~dCOÒ)ŽuúÂî«8~Sb2Å	^5ØGª™ÒÞMŽÊŠÐ‹�½Þ
¦ÈÌÍ?Õ‹À"ÒдeM�UÝRã– Â0—rVäô¸Ï¨ÑÂ`X·,`›uIQ¢gJLJê@Ô§úߨgUT@亽ièÝ1ö£¨ŒZ#£÷°KÌÏ+kî<þ‘Ä%t,ò¦x5…!Àb, É ÀCªNº¹cV­¨+F¼Îq"ïÐ¼�[Ѽ¢¾xD˜íóîÃëvjÈ랈¢9€h‘Ñ~¯ºÃó\¬÷Ú¾ˆú ‘IÆ�4ÎX–ebXÍíTuŠ[8MU�V)KA©�Tu*˘–NwE�
+EÐñt½jþDig™JCÁÓSé+ºGV¾ÕÒ$ëÔ*oõvå_þCk¹
+§,nòª*Va[ìõ<CÅ#—ÔòŠïË—ÎA;›¼­7
�G
+ã�RŠ}^)–3c¹Ý
+˜·P!Ú”b¼u!`BG¨�¡«)6_ hJõû•(¿&Œ�6Åeýép¸¯‡`ˆŽ†-<ZÜlW
$×AÀ›j¹˜PšPi,(ïÚrU¶DÝßx¾«°ß¢¿¯–�©6”�
+B“Ò}"¡•‹í¦,¾>WÉ7ï?
‡›»U,××h“a	I‘Û@Š1cáléjꤚºb
ŸŽÃ!½¿M”ÖÐtB
í¶SˆìÌ
_ܼl¨3§×‹ÓôÞÔ‹ÏèÌØFï/**naNº^
+Šîž-ÖŽb2$¹+Wi
+/q¥¿ÜŠàc:€»¥{­UXˆ’25ÐÈ
+œëû"FÓü2`pŒµmˆ¿eÓÜ…ñ„û�`˜¦ÞtFŒé¡«§Dw¤ØÐ|Ñ¥�ˇ>¸O”ZC»ÿXéË牠‘¡ê¢¿`%0Y&BÉÕëèÉÀ™Z=JÂ;Ÿž<
`7Rl}î=æLiU1FÆ,µ…ì±£Cö0mðåIÍoñÚ¯¥$¯—y0YIXÖ¨=b‚üÁ²�„…
+öf·0é°?Ëd¦^ŽÃHð0‡šƒ]
+'Fîs ÆÆ;¸Ñ×ôòº
+ÿXÆ|>ÕFMä#H‡ƒpÀK~×ÞÔ›ò_Ý�W6_@ËfM·Bt
«|ŸæóUxéb-¼x¿S'r
úaÖÿ	gÑà÷R�@Ó”Ið«ç§H0PœÐàA)AqÖ“Câ´´ûì/þò²
+’ÈéAÇØŠµÂhÿDáå�Õvœú&$$¸dRk7³|ïùêè%=Á‰Úˆ�RP͆I{c‰Ç½±ºó÷ÚÍÏòÅÔßc”�œÅ„N
Ž.,¼ÔY#½Ãg…¸
iD?zV!ñvÍvw�XÙ}øÁ1-¾DŠŸÎ^訽ƒG•J0) `uŸÕCi	9¶¡ÃÆàá(¾¦gñEmA/ƒ;fx#x%�t¿á
+Š)Á|>žX¢	)5õH>{ô¿(Oý÷eÿ×T
Bpnð÷µu9ï?Õ¦PNJì|ÙŒÓÜeý¿@{Lþendstream
 endobj
-853 0 obj <<
+854 0 obj <<
 /Type /Page
-/Contents 854 0 R
-/Resources 852 0 R
+/Contents 855 0 R
+/Resources 853 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
+/Parent 862 0 R
 >> endobj
-855 0 obj <<
-/D [853 0 R /XYZ 85.0394 794.5015 null]
+856 0 obj <<
+/D [854 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 274 0 obj <<
-/D [853 0 R /XYZ 85.0394 769.5949 null]
+/D [854 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-856 0 obj <<
-/D [853 0 R /XYZ 85.0394 752.4085 null]
+857 0 obj <<
+/D [854 0 R /XYZ 85.0394 752.4085 null]
 >> endobj
 278 0 obj <<
-/D [853 0 R /XYZ 85.0394 683.64 null]
->> endobj
-857 0 obj <<
-/D [853 0 R /XYZ 85.0394 653.5261 null]
+/D [854 0 R /XYZ 85.0394 683.64 null]
 >> endobj
 858 0 obj <<
-/D [853 0 R /XYZ 85.0394 576.1881 null]
+/D [854 0 R /XYZ 85.0394 653.5261 null]
 >> endobj
 859 0 obj <<
-/D [853 0 R /XYZ 85.0394 564.2329 null]
+/D [854 0 R /XYZ 85.0394 576.1881 null]
+>> endobj
+860 0 obj <<
+/D [854 0 R /XYZ 85.0394 564.2329 null]
 >> endobj
 282 0 obj <<
-/D [853 0 R /XYZ 85.0394 420.3273 null]
+/D [854 0 R /XYZ 85.0394 420.3273 null]
 >> endobj
-860 0 obj <<
-/D [853 0 R /XYZ 85.0394 391.7481 null]
+861 0 obj <<
+/D [854 0 R /XYZ 85.0394 391.7481 null]
 >> endobj
 286 0 obj <<
-/D [853 0 R /XYZ 85.0394 295.8129 null]
+/D [854 0 R /XYZ 85.0394 295.8129 null]
 >> endobj
 718 0 obj <<
-/D [853 0 R /XYZ 85.0394 264.2689 null]
+/D [854 0 R /XYZ 85.0394 264.2689 null]
 >> endobj
-852 0 obj <<
+853 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F57 624 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-864 0 obj <<
-/Length 3271      
+865 0 obj <<
+/Length 3248      
 /Filter /FlateDecode
 >>
 stream
-xÚµZÝ“Û¶¿¿B�º‹Á7ÀøÉqÎ“ž/3í8™O¤$Ž%R)Ÿ¯�þïÝÅ)ò>ÚLG�åb±Ø�ßâ3?>Ó&1©Hg6U‰f\Ï–»6[ÃØûh‘hѧúîöâ›wFÌÒ$5ÂÌnW=^.aÎñÙmþin‘\6ûó‡w×ï½ysiÕüöúç—¡ÙüÝõ�WÔzó槟ÞÜ\.¸Ó|þöOo~¹½º¡!x|wýá{êIéñÓ›«wW7WÞ^]þ~ûÃÅÕm·–þz9“¸�\|ú�ÍrXö,‘©Ó³{xa	OS1Û](-­¤Œ=Û‹�éöFý§SúëhR%æG*=¬gÔ¸™Ô·N#…ìô­ä”¾#êûÓM±«ÛÔ`ÅüC¶ó-9ÿ>ƒîŠzßÖU{¸än^oi0Ûï·å2k˺úý\aBëD:-g}YF+쨞Yhjg|(sY�f5i¢¹àƒYŸÐXGÿÜü#¾8ÿÇb‰k'íÈD&<çIÉ%Õ3z訞‘cÌ
åø�iNB¬êmMYAs—�ÄËîêcKc˺ú�1±>ÊjM£Ÿ‹‡%�X•XÅÕlÁy’j-zšaú~ÜÙV€$‡*_¢�æX¢¬4	Í
‹0†��r—8Ë�»^�(\Ï«zb*!À‡¬l–hˆõ¶™˜N:`­y lÚ¬-vEÕ벡çÞ[qÑÀÀ«‰ÉRžXm¢ÌøB>5l·„8FT÷åvKÌ›"ÌvÜÓ3£G^¬²ã6Œ-®„›¬ªŠð²-›¶¨hsàÕo!<ÛMÆëz—-?“6!ê�¼úlDz<«„EK§æ\Ø„Á�ã+øn•SÙ‚ë_¾[ÖǪ-ûìÐÒзßr¤–óùuE$í¦Ÿ-³¦xu¹PÜžxfÛ¦&ºûMQQJ?Öµ;æF¿`gJ¥Ìxgý"‚õÊý”uº \ÒÛoP Pó»chäu�6!ÐìB×&ûRP+›²yÁ—ÊhôÑoÎ�^&Â(µÍŽ¨£‰ÕHx/04!:
-††âµ �}�º­iÛ:ËCÏ&,cYïv~güKggðÒÓW+²ÅÝéKŠœ×¸thY;¶a/µíëÆ@,w¼œa¼"Íp“t Œ±eÈ‹¯¨ÀoŠv2´@ÃœÀbdýXXÇ—â0ÁX£�töÖ<4`r«¼<Lð7V¯£ÅÝg
1oöŲD%9uÄ
²ul¸�}qðîXn[ÔàHÞo/S1¯ilIö™QúeÑðrÃÎÀ
-À1
-ÖÐÑ95övN�/;ˆøÙ:~ØÑ´›cèòÒa——ò<ùT�R61JñgBžJXzŠã>ä�©+È
×-1ßeŸI,\Gˆ×r-í³x]7My·Å
’†öNÚù±	YEÏâ+äIÊ’06ú=N0'Â  
-ÁË”�OüÒúâ
-L&©•bh
-ž€÷iÊcAAñ�„F5 ¾g
ùØ^fUè\.©¼Ã0ÒâÆéëhÉ¢=ÂH^4å)ñùºG‡¸*&!——A)Ì€a¨¢†µ‚®À€ž?|Uðn°m�q¬c ™šg%ÙFª®:ô¹%ÎÐÁm¿TlTEÄäícÐz²Ø
-W ËË&Xtß
-OšÅÚäUg aòŠžx‚1e.vµ÷S~d¹çÇBßNÁc<4é$O®å¹
-¾8y¾Û…§×S
,Q)3ýÒسè6
-{©EbSÊšñþC_.8cˆ]—Ûc4÷±gExùqÈ@ÛS'�·±IƒÑ&µWå¶À„ôzJ"6–ļ@’ï4Ë*–Ò~“ƒüêÁéX;g"ÞNbÅrª¨¢–`°LUG¿R#ü/EÈx�
-�áQ`§òPϳöŒz_—‘Ý=&ÂÍ#g›àŒ
-Ãí®¬ "ï•ÙÀÙ‰(梲¢ðu%<=ÂkCaÙgSh7R(‚×Y.=C"÷‡²
¸Å„‚¶»öˆŸ™
-Q–,|››šˆÚg
-çáx—¸_ÐR'Î4l"Á1žÓxªØHã
q'•C×ið„¸3@ã©uàâ©SqMž,ž˜"1ýå�ø×1¥]añ€Êªý“À鉄óyV¬õ01=âÐÜÊ
-9–�huÉcÿ½’:Á?CMÈͺÔþ‡ÿ—uú•²x�-ùC�u‰rÀ$…*�£?ÿh0�‹þo'àßendstream
+xÚµ]sã¶ñÝ¿B�òÌ	Á7Èäérñ]Ý6—ÔçÌ´“d:´HIœ“HU¤Îq;ýïÝÅ)R¶ÛLGËÅb±ß�˜qø‰™±Ì¦2�¹T3Ã…™-wW|¶†¹W"à,"Ò¢�õíýÕWï­œ¥,µÒÎîW=Z	ãI"f÷ùÏsË$»
+|þî‡�ïo?üt÷öÚéùýí¯ÒðùûÛ?ßÐèÃÝÛï¿{w½‰ówxûãýÍMÙ@ãÛÛ�ß$¥Ç¢w7ïoîn>¾»¹þõþ�W7÷Ý^úû\áFþqõó¯|–öÿxÅ™J3{„ÎDšÊÙîJÅŒV*B¶WŸ®þÒìÍúO§ä×á,”f	¬�X4{XÏhp7)o“2«¤êä­Õ”¼#Êûç»bW·ˆÁÉùÇlçGjþ]àŠ ïêª=\‹d^oi2Ûï·å2k˺úõ\`Ò¦£f}^F;ì°^`YšÄÎÅ�ç²­jSf„ƒUŸ‘X‡ÿÒú#º¸þ§b‰{'é(¦˜`òœ#¥ÓJ¿ ‡ë>ÆÔ��_¸ÄĪ>ÐÑ”wÙ‰½ì¡>¶4·¬«_8—ë㡬Ö4û¹xj�s�ˆÓÌi¡g!XjŒìI˜éÛ- ˆÄ¥°D9Tù2 
$Ç™v*à0Z6a-=	KœHüÜí
+Xf^ÕKI	6ä’@f‰ŠXo›‰åT¤�ˆM›µÅ®¨Z"]6ôÜ{-.˜x3±X*˜36ò\�-äS+Áq+ðc„õXn·D¼)ÂjÇ==3zäÅ*;nÃÜr`JØdUU„—mÙ´EE‡¯þáÙnŠ0_×û‡lù™¤	^ø5g'–åyØ%lZ%z.¤c~_Áv«œàenübinY«¶8ì³CKS_-À‘:!æ·¡´›2|¶ÌšâÍõBw¢™m›šð7EE0ä~,kz,¬yÅÉjp”ZÛñÉúMíU)Ú)ïdA±¤wÞ @©çÇ0ÈëuB¢ÚÐ&ûRÐ(›Òy)X’ª¨ôÑnΕ^1iµ‹›ÚfG”ÑÄî%¼W(š”�	ECöZ�À>pÝÖ´�m�å
²	ÛXÖ»�?ÿÒé¼
+pV
²‰ƒCV5e”€R¯ª
öö¦ÂñÂ(A�¦)}y-À¸;/òäT
+ÿX>‡­FÏ	:93ö†Òr
ú–=M,®-3VÄ3˜^l�;Û_ÚÛÐôâ€g‡Ú
î¢)wûíÁž«ø­Xƒôá•Ì	Q1ǾEBÂÿ;ç’Bæ§eÜS¶‚¼dÈf
+§b¿c©
+ª¸
+åBÚAvB+Rñ€£
ÅsAa!ûâ°+!8ÔU
+ò"dhTâ{ÖP‘�ãeVàrI庑Æ*_G+õfò¢)O.HÌ×]rtˆ»â
+bi0¹à”Â
+è†:&jØû!È
+ˆcÿa`[(’�ï¶!·
<Ž¥c-SûB „"Û*ÝU‡>¶ÄºtÛoUsòöRj=Yl@RiïëÌP']]By�‹fŽ£²¥'	¹ö=
+P²S	³íÓ>|áMÊÆȃˆ	
|à€'9m4Çý¾>P~nå½ålÃŽ5=b)g0Ä“4 Ã
+xNÁŸ�(�­8â<»ü9¥ÞK`ñݱ	!ó!d!1B…p;]¾B†e'j»ô‡*eþÃi‚oÞ…ößýg«Ó?£´Ã;jyá_>.a:
"�)�ý£Ç€šHüçǘõÿ
 endobj
-863 0 obj <<
+864 0 obj <<
 /Type /Page
-/Contents 864 0 R
-/Resources 862 0 R
+/Contents 865 0 R
+/Resources 863 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
-/Annots [ 866 0 R 867 0 R 872 0 R 873 0 R 874 0 R ]
+/Parent 862 0 R
+/Annots [ 867 0 R 868 0 R 873 0 R 874 0 R 875 0 R ]
 >> endobj
-866 0 obj <<
+867 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [55.6967 755.8266 256.3816 767.8862]
 /Subtype /Link
 /A << /S /GoTo /D (rndc) >>
 >> endobj
-867 0 obj <<
+868 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [268.5158 755.8266 332.4306 767.8862]
 /Subtype /Link
 /A << /S /GoTo /D (admin_tools) >>
 >> endobj
-872 0 obj <<
+873 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [378.2799 116.2526 428.5017 128.3123]
 /Subtype /Link
 /A << /S /GoTo /D (tsig) >>
 >> endobj
-873 0 obj <<
+874 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [112.234 104.965 168.4527 116.3571]
 /Subtype /Link
 /A << /S /GoTo /D (controls_statement_definition_and_usage) >>
 >> endobj
-874 0 obj <<
+875 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [75.273 61.5153 131.4917 73.5749]
 /Subtype /Link
 /A << /S /GoTo /D (controls_statement_definition_and_usage) >>
 >> endobj
-865 0 obj <<
-/D [863 0 R /XYZ 56.6929 794.5015 null]
+866 0 obj <<
+/D [864 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 290 0 obj <<
-/D [863 0 R /XYZ 56.6929 441.8384 null]
+/D [864 0 R /XYZ 56.6929 441.8384 null]
 >> endobj
-868 0 obj <<
-/D [863 0 R /XYZ 56.6929 416.1193 null]
+869 0 obj <<
+/D [864 0 R /XYZ 56.6929 416.1193 null]
 >> endobj
 294 0 obj <<
-/D [863 0 R /XYZ 56.6929 378.9792 null]
+/D [864 0 R /XYZ 56.6929 378.9792 null]
 >> endobj
-869 0 obj <<
-/D [863 0 R /XYZ 56.6929 348.5817 null]
+870 0 obj <<
+/D [864 0 R /XYZ 56.6929 348.5817 null]
 >> endobj
 298 0 obj <<
-/D [863 0 R /XYZ 56.6929 276.8275 null]
+/D [864 0 R /XYZ 56.6929 276.8275 null]
 >> endobj
-870 0 obj <<
-/D [863 0 R /XYZ 56.6929 248.1435 null]
+871 0 obj <<
+/D [864 0 R /XYZ 56.6929 248.1435 null]
 >> endobj
 302 0 obj <<
-/D [863 0 R /XYZ 56.6929 167.2435 null]
+/D [864 0 R /XYZ 56.6929 167.2435 null]
 >> endobj
-871 0 obj <<
-/D [863 0 R /XYZ 56.6929 135.7502 null]
+872 0 obj <<
+/D [864 0 R /XYZ 56.6929 135.7502 null]
 >> endobj
-862 0 obj <<
+863 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R /F58 627 0 R /F14 608 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-878 0 obj <<
+879 0 obj <<
 /Length 2414      
 /Filter /FlateDecode
 >>
@@ -2499,84 +2546,76 @@ F¨«8qq��¾šmiÑ&qÒ®i×À´>ô'q²F;Ã
¥FØK:DóÐcÝ�a×ÒMp§ ÚS±ð5†OçìQ®Ïrjøá~k¨ÛÀ¤Ø
 L2.­_èÁÀ:
 «ƒRa¼iùDœÔƒsM9	G9î‘lœz|L5·’žLnG×'Q壔z"TàÓLZä^_‹Í7ß[""êa’|›{|�YEfå�ŽÒãªÂGm•�J·Hpñvë©:MœüJéñ›ÅÙK]Ûå(õåŒ7­ÏŠ^˜mcC)×-;-É+
Þ§ð@,Â"¨›òƒ*
 endobj
-877 0 obj <<
+878 0 obj <<
 /Type /Page
-/Contents 878 0 R
-/Resources 876 0 R
+/Contents 879 0 R
+/Resources 877 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
+/Parent 862 0 R
 >> endobj
-879 0 obj <<
-/D [877 0 R /XYZ 85.0394 794.5015 null]
+880 0 obj <<
+/D [878 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 306 0 obj <<
-/D [877 0 R /XYZ 85.0394 662.5434 null]
+/D [878 0 R /XYZ 85.0394 662.5434 null]
 >> endobj
-880 0 obj <<
-/D [877 0 R /XYZ 85.0394 634.6304 null]
+881 0 obj <<
+/D [878 0 R /XYZ 85.0394 634.6304 null]
 >> endobj
 310 0 obj <<
-/D [877 0 R /XYZ 85.0394 376.1585 null]
+/D [878 0 R /XYZ 85.0394 376.1585 null]
 >> endobj
-881 0 obj <<
-/D [877 0 R /XYZ 85.0394 345.4362 null]
+882 0 obj <<
+/D [878 0 R /XYZ 85.0394 345.4362 null]
 >> endobj
 314 0 obj <<
-/D [877 0 R /XYZ 85.0394 136.7105 null]
+/D [878 0 R /XYZ 85.0394 136.7105 null]
 >> endobj
-882 0 obj <<
-/D [877 0 R /XYZ 85.0394 113.7908 null]
+883 0 obj <<
+/D [878 0 R /XYZ 85.0394 113.7908 null]
 >> endobj
-876 0 obj <<
+877 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F77 703 0 R /F42 597 0 R /F57 624 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-885 0 obj <<
-/Length 4116      
+886 0 obj <<
+/Length 4113      
 /Filter /FlateDecode
 >>
 stream
-xÚ­]sã¶ñݿ“—È3C|‘`ïéšÞ¥×6—öê>tÒN†–(™=‰TEÊŠÛéï.v
’dûÚŒ.@`±»ØOH\§ð×&K²B×y¡“
-s½Ø^¥×kèûîJð˜¹4�úõÝÕ7ï3y]$E&³ë»Õh.›¤ÖŠë»å�³,‘É
Ì�ξýáãûßýåÓÛ›\Ïî>üðñf.M:{ÿáï¨õݧ·ßÿöÓÍ\X#fßþöíïÞ}¢®Œçøõ‡�¿!HA�“~z÷þݧw¿}wó÷»ß]½»{ïW¤
-7òÏ«ÿž^/aÛ¿»JUXs}„—4E!¯·WÚ¨Äh¥<dsõç«?…	G½îÓ(ýDšH´:' V1š"É”TŽ€í®¯Û¦Ülž`k*Ÿ•›®Å–�mêmÝ°¨¶­º®\WíªÇj_÷O<Þ6~xÙðXovÏ•‹Eµë«%õß?�,°x(›ÆÏó·Ô¤¡gY­Êƪ;¤<ìo, ZÚ¤7V7«–�‰ lb�™Á
-âG]ϵΓ\ ¢Ia �Ê0U"Ÿ*@eO/}KϺYlËŠ^ÊJB˜Äjë5å6~Ž“J“¢Pñùºjª}éhä«·¼B×—ÛÝ-´•&Š!p
#×íþ‰Þp	F§Y~Ó2¾§ð�9…MOaG
¡³Ä*›M)0ÐèîžMË
-•ÚYëĆDLÀ!VÅ”¾t
-~ãÄK€ZY””¢.h[Ç£”žŸ«jG½Š§Þ,é}´¥”%0õŠ%“£oò1I i–{Êo€òû.A>ž“OˆàX:wfö�C×Së¾BåFêßk†ãqÃ'Ij
z?TÖ€O""å(Ê[?yà
-+ômd¥,Mr)#ÉØB`�”à±·‘ÙÀË�<Ÿ,ýŸ°&’9•MÏxt/0@ëWmº8–¤ÜΧ•:)´Ê_#™LŒ2z´'™çSN  Î	•¤Ff¯$Þ{8Rª³¿ÞrFŠ-'c‚�®|Š)6øÞæêT±¹/�³9QÝ3WYž€°'Â�'Skö‘´	Ž´ö
-`Ía{�Þ$Ýј_9!ÇÁégèŽú•9ðA^`ºú_1#¶~*Ò¹4¥c¬Xv]»¨ÉÕDø±FsŠ=Œ¨fý
Ò·¡»¡Ö‰¾“öš
kJQ˜$Íì‰ã³lçªf¬±Å^m.:©÷•›Á¬$\»úyQUËîäúYÖï<gŽ2Ü¥ÅìcK ¯ö±=0ß‚{…/Ÿ!LáØofOøMÌÎ’Q
¯¬ú¹F_iMoD=h2r¢»”=Vî`gË–ú¢ÏlÕË`³p½àfVXƬ〆Ÿà
-,©Û‡:,Įٮ©oíèÕû$±�Nd]ÈBÜ°6b­�svdpCps	œÔ,ϳ—|ˆ½MØ´ó	H{ª4R~âv}‹T™ÙB$⼸Sìã,B´xÝԦϒ
Ñó
-ÊÐj)_å<
Š/œYurV[:«€bÝ;�aHc@Wpl”«3œ$ð‚~;ÄßäÔ¤àåeö$
-ɈŸAÇ¿ÝlH\ “AÄ°Ø×÷
|ß>òQKÀ£©ŽÔ€�
-šV‘_Ø•.•óz‡•%‹*|ßÆ$ã—ÜšWÐ[$²�bBp”B™ãÌn…m;^wYö%G\Ô<=±Æ䃪”¼y|¢\õNñߦRŽ°A§	‡¦¯ùË®Ýro{èçíj~OTÀ¶Â¨ªî¶ôJ˜m�º°çù÷7¦DUØ]ZÑãBÂLcÊfªÞ‚CÇAgùs½=l½sÊU�¯zçLÒ÷ÕCùXû˜öbòÀÈqÜëšk9ó8îò
cDS¾#šÆ8Uu2ǹ´ø}™|Ù˜Ú
-ÞÑ©JVæÜ“ˆžrPdS©ë~q„æ"Ï€
ÚN÷"ë,ÅtËO8ü4�ÿÛQH*ˆÆR5åçªF"á ¯øSô®¾"Р22
-+ðAüÀ–L·ob2²Û×M?§(Ç=U]ÔTÒ¸!m5;�¢ûŸ7´ßÀ>k$�
np÷ÔÅ}U†¥rKr”[’Ót8o$Çy#Éy£Q/¬Ý»@ÚèÉÞ =š}ð³pbâ°å¼)8×¾'oÆU¹¨75¨K—|@IÁ?áüQqšÁt±.\¶
-Ÿñ³�›$Ó…~‘`2‘&óqÀ¶ä9wpâ0““f³ß7í‘¡„n_;MïÞ‚DØ¥MR¨p‚>Wû&žLOC¯©GŸH!<rÀ¹},Ãg5ËåkgÙ–õ&®t@÷â$^þ–%¨êØŽœg"Ï‘)`û/!óê-]d®´…a/γÙEé«’g74× ¬.È›hpb
-ÔB^¤Ï¡d!´—ÛÃa±‹Í"“lHa]œÅ»
‹}”Y 9…4¯Ey*ï1Æõ}ýÚ™Výî�SñÚI6í¢ÜÄ¢h	"˜¥ò‹æÿû<f<�ü…ðQ¿Ð<úÚ—ù…ðÉbóåäú%DgÊŽ§Ê_�Ò\f
-sÚ.bãÄS‘ä¹>1ËäÈÂ×XÄDÓ»ŽoÀKwØíÚ=0ðJÆ5|œbp¿/9ÃáÎ`vÎPªÙo)¯ZÍ
-þ9É<hCNØ£ïÞø$‰Güøc;®ˆ‘ÛÔM£Š$ΰXì>&”
-†Žî  8v�G¥"©•/EK:Åàóy×b!S¤CD¸Æš4\s¸?ô„™Ä86g£_hp¦R3µfë¸TA ‘ÛPž¡�$ÇrßÃÇhXØ�Ô!oTÇSȉ‘J¿N˜ô8>óIE÷b°)Gg;ðl"ôÄšLõ›€LçÏ_¯‚Ðܪ ò½R¼¾—zS/ªø¥(pÙ<M(U©8§*gKØÝ.˜Peó¤Pö¤ç’Ç©¿“�®†£Áex=9å4ãl*z6Õò–Ê.ÍÙƒ�¶xùz‚NRðP`À•Ç0Ì
-Ûé—Õ~!’Ò2�&ÿL1òœŠ“ä_°+Æ÷´Ø©0ÅÐÛU{Wý|Í_v=œ¾IFƒ;Üøž¿éi­r‹N‚²°Ir'‹Yx6½«r�N[*OT;Ùh+ùv¨v¾…b}nÒÊ€¶ÝÜ+X? U�pWÞ²”Ž„‡¿ÌÁ5Àƒ»
-Ÿíè}
¼¾¥°.`P…äü§›×Ã:ô
-£Cž Gɦ¯7í}‰âd3¶^Ðw7JŒÊ¸
-[•=q0÷¾*tý‹´[ë8ªö6ŸÒ<s˜RdzÊîÀZ¾óÝ%„<�n+ :ˆ¾ÐÅ00ÌÏ®¤±ÿ]õ¤Z«z¸QK5v‹§bÏ:’kÃ1e(!„S¯*‡ú8Ó;¨ôP§>¯¹ä)Ø°psg›ãt™šá¥*åUë¯
Ž·UÒcׂù©¹8Ž§¨½4³23_–÷_ŽŽa$–àÀ(=D8t6öÍr�×W€€û2j\µN¬åQwgF1gá«ÀÙ<œÍ‡ÞÐä5€&Õl±éøêmé9–>ëoKæv"|ðʇW�û¦âA`‘šî[C÷ÄÝí¡g¨¡
-	\	U5$B¨ûÚdg±Íâ(•
+xÚ­[Ýs㸑÷_áÚ—ÈUƒOÌ<Möf6“»�ä朇T’Ú¢%Zæ�D*"e­suÿ{ºÑ
�’ Û“lé� 
+Ú~¸’Üg:ͧ½~{wõë�¹º.³2WùõÝÃd,—	çäõÝò/³<SÙ
Œ fßÿáóÇO?üéËû›ÂÌî>ýáóÍ\Y1ûøé¿>Pé‡/ïüñý—›¹tVξÿÝû?Þ}øBM9�ñÛOŸÿƒjJz\ôˇ�¾|øüý‡›¿ÝýþêÃ]\Ët½Rh\È߯þò7q½„eÿþJdºtöú
+ˆQ.+eLÁ…5íCÇ�¦L�.sØL�`y‹½®çÆY¡-pQʬ´PÀU”jYÌ�5�²£—¡£gÓ.ÖûeM/U‚$)mæŒåÙÚj?§I‹¬,u |¾ªÛzWyùÉš
ÏÐÕf{emˆcX¹€ž«n÷Lo8“Ó.Ý1½ãNáï‡=¤É3§]~Ì�‘ï øÀwÿl;®@Nø†À	|©Úgdlæ‡0Xá
+?ÜÍvÊ'”HQ>íAjÎÙ¤dVäšû,ë~hÚ
+…&-óÙb]í{$ Dž@±§úÊK T²ìru_·Õû%@
I~ek;ªôòï˦_T»‰¹|\T¸ø0B5ú7J¸YçņDLÂ!Öå1é
+�:+F8gNÂl$’Cå�&ÌÈGZx‹ î¾Z|Ýo©v²]HßÃÈ_1oPgy
SªÈL!Oà’&ráhBá÷|ƒ%�:¤¥:Üè�!ZèÙG꡺þ
++†.1S.²B©ÄD*5h#-¹ïmb40Å
+«ÎÿÕ¤@„‘ÓùñO®:óf¦¯Ž%�Ûù°Êd¥ÑÅ[d#W™ÕÖLÖ¤Šâx'°"½:VåodÞ”z8Rº”³?ß”jFÀV�2ÁB_=§€
¾w…>6ÿžõ:'‰=s� €;~<™Æ°�dl4¤M
+,©9¸:,ľح¨måùÕ†Gd±T^d½ËB»áŽ¶}.�;çFG—0:7)“@ÃIÍ‹"Í&
+&öŽKÀù–ø=Yà0>T‹fÝ
+ºNî `uê�2“©׼%#Ðù|Ùô
_È–bôèï÷ÜX+â5‡ûý@Ô‘ÊAªaÇæ¬ôKÆ”°ÇÚl•–*p4
+Ó3´�ìPíÚ±û”R&Æ�št9³J›·	“™úg!"©é^ÕälbžM¬=Ñ&Çø&Á3ÅË׫À5w:ŠüE«¯ï‰
+Õ®ÈJíN’q>x,Â�(ô

NƒÀëaŒ)‹œ£©hÙÔË[JOø0{b
Êòõë	&:à1Á€3O7Àòؘ4;3MVXõ²$a8[Ÿƒm€\�l¿ªòR‚ì50ò�£eÉÌ'àO–æD]ºýšUƒò1n ?V!âËÑ´ºyŠj…öv“Ö-ß–!›*.gXÖ»ÝOʨ"ü³åÄr*O‚y¤®œÞÓb£Â–ck_ï|övàWüe?Àéà›dÔ	©Ã…ïø›�æª6h$h‹$s²œÅg;ø¬!;i`´	uí¤£�âÛ=
+>ÛÒûöú–ܺHAƒóGTxl^�óÐ�
UÍj¿«æ©(2îÏEQ`Ž4�eÉ>¨7ÃKLÕ÷úæ‰ûOé€W¸Ý&�ãílbÏ�"´áþßÉ ïݲöÞ+%Fɇ<!Ž"M_­»û
+ÅÉ嬽 ïnb-mTÎYغh‹`«BÓ?Ý:¿1kïŠcžçžRj8`TÙXÇw¡¹—çÉ/ ƒø­I
+ó‘ÂâìJÛßõ@ÐZ7ã�Zʱ;<;ÆHÎ
§ÀP�§ß”Žùqæw„ô˜§>ϹtX¼¹3O��~ºv¼E©+&ù¡×§Ëªè±í@ý4OœÇÓÜ^�Ȭí,¤åדc˜ð°0ÚŒ��]»\0
 endobj
-884 0 obj <<
+885 0 obj <<
 /Type /Page
-/Contents 885 0 R
-/Resources 883 0 R
+/Contents 886 0 R
+/Resources 884 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
+/Parent 862 0 R
 >> endobj
-886 0 obj <<
-/D [884 0 R /XYZ 56.6929 794.5015 null]
+887 0 obj <<
+/D [885 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-883 0 obj <<
+884 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-889 0 obj <<
-/Length 2466      
+890 0 obj <<
+/Length 2474      
 /Filter /FlateDecode
 >>
 stream
@@ -2586,34 +2625,32 @@ xÚÍMsÛ6öî_¡é%ôL„àƒ Áô”¦vâÎ6ÙuÝSÛÙ¡%Hæ,Eº$­v§ÿ½ïá
)#q:{ÙñAàðð¾¿,þÄÂhÆU‘.ò"e
 (Øw�]´m^âB¡dÂ6Ê÷ÖåàWe³ö{ΰDVLˆé·n·[»f1jˆ1©Ö�ú]yœ>“þÑ®ª_9—��
¸�SŠÊRf2�ÎM²Œ�“CÈ1ý±Â#„(ÁTšþØŠL…¥‹ä~ïTkœ'I�ƒ�í˺>ð±þÈWp¯¯š•��!2ÃR9²ú•„”uß^'Æžž$�
Ðë@¤3
 ¾B¸�¥ýBœNŽrÀŸF`uï!Á
—i‘%w1›“ª`JféŒÇo²€„[i‡ªmzODyœ?ÁuM+—ODÈC
 
ÿÕ+÷®°ºsw	-çt�ž:5�
Ϧ\UµÏ6ÀÀü¨<+lñBÕlÚ'Ô´M}<§âI;¿£FΨ)Ãå‡j‹ŽKD)L
êŒ
ê{œ»;¦Ÿ—º/­?+tB¸©0²â¡oœ“2ˆ1ß §P­œ8=
-¨\ǒ¨¶Í†¿ôtµ9£>´4Sú¡ì»þ×vÍ1½Xn^xš\~aQ{{ôÝÙE�„Q;Bõ‹þy5­ö]g›!XÓhET1E�SF�óK!a¢Ä/…w¹ÌŸ˜ccDïÿožüÕÂjöu=‘È!&ãÀdŠ!?Å”Ÿ¡íû@Ñqx}­õê[l)9Ïâž7=š@×”¡4ÆÐçF2i¨K¢“èhB’ÿyêUº
-í3A�¶àÓ¢£�º·n¦:6Cψ<—EðR¯ÄÙk+/ê‘$´VšåÐy>3Ú6Ú<à|ÀÈçzÅ´6b6~Ó¹s9šRà¸Æ�p¼e˜¤±‚ü|óýKZùù�¡nÚÍv‚˜Ñ©L­q§ÑǪ:Í@Ú,5Eþ—Èó-WGx;5ÉþÑ‹¯
-è3ÿ
ƒÂÿ…é§ùhKÿóÊNÿFLs¦Œ‘ñÆÒ3‚Š'
-E«ô9åã¿Ôž’þ'
µ[Bendstream
+¨\ǒ¨¶Í†¿ôtµ9£>´4Sú¡ì»þ×vÍ1½Xn^xš\~aQ{{ôÝÙE�„Q;Bõ‹þy5­ö]g›!XÓhET1E�SF�óK!a¢Ä/…w¹ÌŸ˜ccDïÿožüÕÂjöu=‘È!&ãÀdŠ!?Å”Ÿ¡íû@Ñqx}­õê[l)9Ïâž7=š@×”¡4ÆÐçF2i¨K¢“èhB’ÿyêUº
+ŽÐ¯üüÙ
7”‘8Çr{ÇvO‹ÆZÿŽ“&ü®ÊÇa?¶†¹òI·H^nLÃO(vû~˜ÒçÑÑ*ý×aR�»X÷(HjÒ!$,·_ëPšŸ<Gó`Ü{÷)RøÈ2À
/1‚`
‚¢í¾øBt�–4Õb\>â
 endobj
-888 0 obj <<
+889 0 obj <<
 /Type /Page
-/Contents 889 0 R
-/Resources 887 0 R
+/Contents 890 0 R
+/Resources 888 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
-/Annots [ 891 0 R ]
+/Parent 862 0 R
+/Annots [ 892 0 R ]
 >> endobj
-891 0 obj <<
+892 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [173.6261 554.783 242.2981 564.1926]
 /Subtype /Link
 /A << /S /GoTo /D (the_category_phrase) >>
 >> endobj
-890 0 obj <<
-/D [888 0 R /XYZ 85.0394 794.5015 null]
+891 0 obj <<
+/D [889 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
-887 0 obj <<
+888 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F42 597 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-895 0 obj <<
+896 0 obj <<
 /Length 2361      
 /Filter /FlateDecode
 >>
@@ -2632,94 +2669,89 @@ G2ëéØâ#Á
 ç«€¥cN÷�›Ç¾KAN˜Ði`‚ž½è¯�QÏ_‰R
�?ˆ¶o
 wT. Ò­‹Ì}™!ü	®Ñ!¾¹›W&ˆÐ·ˆC™º3&Ó¤¹¦<ä
 <&±ˆÕþ—¼5Å+v¨aFó܆/*±»2‡î"…nÏBH(^ð«R§% ¹Æ(™mªV$9}	ìæ§f劕׾ÅoüÀî».æ¶ÿ«^ã±Mk׸e©øÜ«Þîßö©/óÓ¯I™N¡¡£'")‹a±ö‘´4õcµútÒñoŸ�¡Pðº&åH´lïåN>ö«…LO@¦ᜅh¹œ‚cœî66óIs“„sŽÁÕÚÇ·—T/a¿Çá’)áZ‹\ïu¿´ñy¼}†/ÃERèG bF¨)áRÇ}?õ ƒ“ŠxîKv¿º‘1IÒª7»¡?
=€
ú^
B?ùÙKó”ÀÕÚúÿ
 endobj
-894 0 obj <<
+895 0 obj <<
 /Type /Page
-/Contents 895 0 R
-/Resources 893 0 R
+/Contents 896 0 R
+/Resources 894 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 861 0 R
+/Parent 862 0 R
 >> endobj
-896 0 obj <<
-/D [894 0 R /XYZ 56.6929 794.5015 null]
+897 0 obj <<
+/D [895 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 318 0 obj <<
-/D [894 0 R /XYZ 56.6929 769.5949 null]
->> endobj
-892 0 obj <<
-/D [894 0 R /XYZ 56.6929 749.9737 null]
+/D [895 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-897 0 obj <<
-/D [894 0 R /XYZ 56.6929 433.0023 null]
+893 0 obj <<
+/D [895 0 R /XYZ 56.6929 749.9737 null]
 >> endobj
 898 0 obj <<
-/D [894 0 R /XYZ 56.6929 421.0471 null]
+/D [895 0 R /XYZ 56.6929 433.0023 null]
 >> endobj
-893 0 obj <<
+899 0 obj <<
+/D [895 0 R /XYZ 56.6929 421.0471 null]
+>> endobj
+894 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-901 0 obj <<
-/Length 2759      
+902 0 obj <<
+/Length 2750      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥koã6ò{~…�ûp
-zæŠ/‰Ú~J7Ù½»Ù^’´E¡ØŒ#T–\KNš;Ü¿)K¶7M()r83œçáðIÿøÄhËLMÒL1s=™-OâÉö>�p3
@Ó>Ôw·'ï>&b’±,Éäö¾‡Ë°Ø>¹�ÿ}øçÙ·קS¡ã(a§S�ÄÑw—Wç´’ÑðáëÕÇËO?^Ÿ�¦*º½üzEË×/®/®>\œN¹ÑÎ�áÀ��—Ÿ/höéúìË—³ëÓ_n¿?¹¸íîÒ¿/�%^ä÷“Ÿ~‰'s¸ö÷'1“™Ñ“'øˆÏ21Yž(-™VR†•òäæä_ÂÞ®;:&?sÆ…–¸gOÍaºD#º~ʵfŠ§»t§\¦Lé´’pÁ´‘i§Õ×
-W’)õ$ÕK¤�N-¿o캰
Šàe“j•„»YÙYqÿL2}z°ëSn"KŸ
‡ûhêM9§ù�(ëÅÂúµ¶fHÐN9È@ká🵰mDÔ´ùºÝ¬þ�_YÔ ÕŸãXTÚn¥áÑ,oí¢^?{ÆÕ1Ó™0žóÃ7”	ÓÚ¸§¢,‰H^65Q±ÕÔ1úJ×<2�ß•ÀŽ’$‚gšâeä?6Ui›fŒI!XÊEÚcòNŽp©4š{¸zÕuE¸ò†&wÖVžÍ$…s`
žMr½NŠv>*û['ÔÔ„[àyq[µa�t¾ª×mCm88+€û»_¾ü�Ƽ5šÏ½©ð¨qûY”Wó16ñéTŠ8ª6Ë;°0ðhôrXpâŽçÐ
åKf"%’Ï7®"n7iŸWÖ�æÑ¥Gëô: LòÜKÂì»E‡�”.‰«×v¶Y7Nüøyn›‚NÎ	$,ó…Ç�{T�miòs¬ãoÆ®]܃T²!ñ:qMi�6LTÕm
X¸‡º8¿º¡uGÌ�¨èĦ±´€D/ð}Öë>f5<@baŽP£[‹*¸0b½A¬ŒÌU§=sÝ‘-YÆé4‰ãÌ�Åð�ÿ-�G0yæ!b¯Ó÷£ÔŸž˜ý#_®JËfõ’°\^ÑxÿÑì››‹±Ó}ÒïßÑô%¢|�heÛCD§D´S•4�P؈ßøºKe˜„ :™
-	#V¯ÀI'äá€
�KR)�Œ$VLp/žyѬòvöp4bœ{@÷
-)¢úžÆ¢]úU­òÙoÖ=(°ÕÖ~t†	“Æ®Ñq¾¬ç›’ò=C$8î#U>X®‡aiå6ë¼ÐþeÕf_Jo“üV™Áà^a þº‡•™&QŒ8¢Lm€H¬)³‚«ÏŽ«òêææ⃗hå_�Û›ËO9¶õ¬.÷$Š~A´=žß&‡­h¥f&Ñú(ÉâU13ZK¬t<¨,q2+!<MÉ|�gWŸ
^u�yƒo rAǸ×ø�Î’ñcY4³ºÂ�¾Ø¬sL	0Ü@:Œ
-à˜ÓлòQw#Èñ’è?uei†Yˆ0ì§Õà�*–!¥?.Ï’ëLxç=@!§
BWK¤ˆdÕÉæ®ÇåÜ Ê$3ÉÐàç’RrÍÖÜ3‘·YÝÖ�·Õç±rϤqºSÎþµS�ždL¦PZNÔV‚|4”Á{å°Œ¸MÕŠJÆylúÎÒ™Á¶¡ $ÔÏ2ÖNÂØà�Øò²±òi
-ЛJÃ¥Ëü\ý¿Î—Kx<÷u¦&ËW¾
-*<†0R“…Çá>\ãwGê:¨•öE|íÓ†LXšàÆÍ�c—Å÷	òëL&
豚Cj\Ý�ÐHI@1X”öýF¬t7Ø•€êQ
-ÓãÜ¥ºÿu†.2fLš
ͼ,šÖ¢wH7«_s¬ûÜ•u~yûñ­OÄÿ$,Œ1èߎ=�…}"HœýŠÂùv<üåkH`ûÏëe^TîÈ�½±�—y!ÁTóºõâ£j– ¦;R$†Å®ÕÇè ݳwqÔÞÏ­ë—Û�M¾°ÆÆ[Ä;WGÌŒ?bß®1'Ùf,h•Êk˜T;9Î
e˜þ¸žŒ›Í<¾ÜcÈi(‹ÅCûdñÿýò	�¬CAkhï¹µ»�³†‹|l„NXSG›ëÅ„&×½G¬ƒŸöÐ#ÖÍ>^×V³3ßaR˜£Í«ø„(µË'gMeµ†R,Q:ŽÔ´¶ÏÝ>6d
-»†–°]Cm1€s].ê᥂¸Ñºð‡kEÔ«™ÝA(ö½L�{Q&õ·óÚ„¼tžCMRÑ<4ŠqžÏfvåe¡€„µ¡v�0…Ât:º¼§…ª¦ÑwaVxÐ^«]\$=˜Lp¢€7®ì`öR@L=
�±ôtY´­#µ-`ç®QN=å^Ï�n:iá‰î:c1í~ü¶Æ3†õg¼
‡#>¦�ÿd$÷02º+ªyCSζ�_.ÿ�1§
â”G}'”{N(;Å;Äõ
-¬ÝNü*Ÿa3XH¹Þ½3h4máŒÜÒÄóµ‚rÙ(¸/éã΃Á;Ó´ëSmf¤)ç
«j\¸ÂÙ2¯*êQQù#È[p¨êõ2÷Øé2°ºìîè¶Aæ]p$—pÊ„k†ÇÜÛªêlU
mUFayk�Rơ�
º°÷¹+dž¤�³p
-½ÂùNæ›é¸×‘ì"AŸù£êc–מ|^Œ]ÓCºî¨ŽøU».‹Ð‘رó²ýs•uy5åy#?üpqnä­ÊPö¯œ#�yÙ­;³UÙ¡¼p&‰o#]�¤ç�.taá�mgïÖγeý™†øÍCeô[ÁeK¼û öXÌ­¿eNœÕ÷äf2
D©ØÉ÷)¯ÛC�iô^Ÿ5_­l5ßþà×K(‰=œóêaÍãû¯S¹àAì”u�æ™ÉøX½¥|¹§‡
-‡ub\¿ ð,UÉ›(зÑÞ¿¤q!Iãß­y�¿•6þNTÒÂËSÀ»~Ý”ø‹p›¡®‹åf	ÈT~�ƒ9õop�ê\q]E9‰JwôL h4´ë³|Þgœu™€¶‹p/œË=ûåÿ°äOZ-ëú·ÍŠ–ï¬ïTÙCµŸkcyÃ]å­ŸÙ²Ë54;ôW�»+ú�`7�»ŠîÍa°ýó…݃~§ð„®Šg
-o-Ó½2G¦�HGXÿ? º€_endstream
+xÚ¥koÛFò»…€ûp4zÚp$—É'7qr.§g»À
mQÐÒJ"J‘ªHÙõî¿ßÌÎ.eÅut—û˜™�÷ŒÌ'!üã±P¦j’¤ŠE!�&³õY8YÂÞ§3îÎLý¡iÿÔ÷wgo>Æb’²4ñänу¥Y¨5ŸÜÍÞÿóâǻ˛ó©ˆÂ fçÓ(ƒï¯®?ÐJJÃû¯×¯>ýtsqž¨àîêë5-ß\~¼¼¹¼~y>å:âp_8G.|¼ú|I³O7_¾\Üœÿz÷ÃÙå]û–þ{y(ñ!œýük8™Ã³8™Lu4y„��ñ4“õ™Š$‹””~¥8»=ûW°·k¯ŽñO…œqÉ	¼‚³”'ú8^Â^7åQÄOöñN¹L˜Š�JÌ‹´LZ©¨¾T¸’LKM’(e±ÒŠå��Ùæ¦FöÀyÙ;ŒI"•
+š"-vbÊƯ‘¸7Õ¶qˆqVäpîïnùêG"0›ÏéJí6²r>†!žO¥ƒr·¾­+FˆKî8Òì¡lm@5¤D¼ÂÆU„m'ÍÓÆØÛ<¸r`[a†CÆ$a:Ý ZÃGB¯ÃÕ3ÛmkËwüü`êœnÎé °VfK!s jÓÐä—0
+¿{v¾
+h†*¢DbeŽãõ¿?|ýr�
•	ó»k³s˜8©îŠ†¾1
+à˜ÑÐ{òRû"Èñâà?Uih†Y° æÓ`�*”>�>ÍÏ$b"Uþ¼µÀ�Ñ
+ݣܦºÿµŠ.R¦u’Õ¼ÈëÆ uù“vÈ7¿Ù¢Ï~PYç–»�w.ÿƳ80ÆÜ¥ÿ½s¹y¤“8û
™ón<üe[H`ûÏ«u–—öÊ�¼±�çi!Æ”óªqì£jö�k#¹Hˆ}­Ñ.@ QOßÅI}ÿ`PÒeîýŒí§:[šo1„QÅ»ÄQ½Ö,:Tl	ux—²PL Uª¯aB<ÆBÝgýv»¢Ñï4›9x™ƒ�ÑPäËUóhðÿ´Ð&XØ7$•²Æì{èH@Š�GD1‹Cªähs»œÐä¦çÉÚóÓþòd}öµý43£à7U˜¨uƒä(µ TíÓ‰Þ&Q„R,VGZ�í©iÿØ!u‡Ð�
+­³'šÜ›á¸†hŸoÎA$£š$AÙD,O«R¥é¾*Õ„¢Ó%JBa©È
c_´ÞW
­»ô?ófå¢xj=ò^{ož/ÀÂ=ÛÛ˜+o6fÛ@RÕ5Ó¬ûLž1"Èý“:ß9Þí“#V¹H×Æ«{ÙJdÁ¹i᤮ñFg#«ïÔ"ƒs¶ãEÒÅ=Jq£±¡×ò°—3³Øcìsö	›Óå–{Ž®ä¨óê“’æ¾QŒól63Û4ó%
$¯5µæx€é¦ÖÁÕ‚ÊŠF×=„YîŽöú�Ø2qïL*8að‡w¶0€ì¸€�z c©ê:o‹ª+f<å¶Qn›Êýþ½ÔwÕ¼»n»dmüºkÑ°�#6¦�þ±<DËà>/ç5M‰8ë¿l.cFþâÚÐqÅÞ®
+ÕªmäÂÙ:+KêWQ)$ÈZp(«í:sÐé1°è[íöj×,s&8’WX¥ÂƯ�;]U­®ª¡®ÊÀ/wÚ)eè{Ú ³Èli†gˆû8ó·Ð*¬í¤®±Ž{-Ê.ô‘=ª=ÈÀXG¸£ +iÇlÉ—n[Ä#¦ÕlóåÒ7(öL@?o\¥­zSÚ7òãgñÔˆ(MÅ€²¶œ?dE»n5W¥ÇÊ
+S×~ãàa|“Å…¯–ÉAÁ#5‹´HFHÿ?�€endstream
 endobj
-900 0 obj <<
+901 0 obj <<
 /Type /Page
-/Contents 901 0 R
-/Resources 899 0 R
+/Contents 902 0 R
+/Resources 900 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
-/Annots [ 905 0 R 906 0 R ]
+/Parent 908 0 R
+/Annots [ 906 0 R 907 0 R ]
 >> endobj
-905 0 obj <<
+906 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [519.8432 252.798 539.579 264.8576]
 /Subtype /Link
 /A << /S /GoTo /D (lwresd) >>
 >> endobj
-906 0 obj <<
+907 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [84.0431 240.8428 118.7265 252.9024]
+/Rect [84.0431 240.8428 119.7369 252.9024]
 /Subtype /Link
 /A << /S /GoTo /D (lwresd) >>
 >> endobj
-902 0 obj <<
-/D [900 0 R /XYZ 85.0394 794.5015 null]
+903 0 obj <<
+/D [901 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 322 0 obj <<
-/D [900 0 R /XYZ 85.0394 451.0558 null]
+/D [901 0 R /XYZ 85.0394 451.0558 null]
 >> endobj
-903 0 obj <<
-/D [900 0 R /XYZ 85.0394 423.9067 null]
+904 0 obj <<
+/D [901 0 R /XYZ 85.0394 423.9067 null]
 >> endobj
 326 0 obj <<
-/D [900 0 R /XYZ 85.0394 301.4703 null]
+/D [901 0 R /XYZ 85.0394 301.4703 null]
 >> endobj
-904 0 obj <<
-/D [900 0 R /XYZ 85.0394 271.3564 null]
+905 0 obj <<
+/D [901 0 R /XYZ 85.0394 271.3564 null]
 >> endobj
-899 0 obj <<
+900 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-910 0 obj <<
+911 0 obj <<
 /Length 1238      
 /Filter /FlateDecode
 >>
@@ -2731,39 +2763,39 @@ R¨£'ËMø-m\EÓÑ;œ¯UT-
 ZÒç &¼’u‡ŒÚ¨ýÌ€D�¨Q*%4;J¯� ›*§	ƒfÊ*Ñt
 Þé½ê,q\
±­ˆ=FA~He�cù˜hª/ä? ›¬KÌGŸ´äœ$€”x™Ÿ£�3ö ?ú)éV1=u##ŽËdÍêîÛA«
\¡T–2Û£˜¯ä
 endobj
-909 0 obj <<
+910 0 obj <<
 /Type /Page
-/Contents 910 0 R
-/Resources 908 0 R
+/Contents 911 0 R
+/Resources 909 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
+/Parent 908 0 R
 >> endobj
-911 0 obj <<
-/D [909 0 R /XYZ 56.6929 794.5015 null]
+912 0 obj <<
+/D [910 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 330 0 obj <<
-/D [909 0 R /XYZ 56.6929 769.5949 null]
+/D [910 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-912 0 obj <<
-/D [909 0 R /XYZ 56.6929 752.2028 null]
+913 0 obj <<
+/D [910 0 R /XYZ 56.6929 752.2028 null]
 >> endobj
 334 0 obj <<
-/D [909 0 R /XYZ 56.6929 693.9224 null]
+/D [910 0 R /XYZ 56.6929 693.9224 null]
 >> endobj
-913 0 obj <<
-/D [909 0 R /XYZ 56.6929 663.1642 null]
+914 0 obj <<
+/D [910 0 R /XYZ 56.6929 663.1642 null]
 >> endobj
 338 0 obj <<
-/D [909 0 R /XYZ 56.6929 628.9495 null]
+/D [910 0 R /XYZ 56.6929 628.9495 null]
 >> endobj
-914 0 obj <<
-/D [909 0 R /XYZ 56.6929 601.0964 null]
+915 0 obj <<
+/D [910 0 R /XYZ 56.6929 601.0964 null]
 >> endobj
-908 0 obj <<
+909 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F57 624 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-917 0 obj <<
+918 0 obj <<
 /Length 1160      
 /Filter /FlateDecode
 >>
@@ -2776,21 +2808,21 @@ h¹@¦–®ÏBµæÆ1([é>FÉ8¹|«Ô½•Eéh	¢DŠ´.Ûµ”ˆV*—kÑaÙs¡$O€Íŵ¸!Åy•
 !ÁìdT½k¢jÍÐC÷ƒºÊMíœòÞFäÓLMÓ¬5OÓLËÙ¦Ÿ»ƒ.öÉëºÛÃfLsƒ­Îçè.Ó_ÏÑØ!%‡ç/OòXíöf­½£ö$±mJ=e‹„°}=yòÈ/3’ìäòoÑë¬úÓ¸55­~(þ›æKµ¶Ê(3ÓűlÓ]»Ä\óË3™Ô‡N·¸U)×f¿l‡(<•é‹9´PkžœõÕ\p¥Ÿ×} V¯RpÆ#ÑcŠ6稌òþ�-3òÍU •M®íd®¿•Ê…™Šë3»b)WöÂas¸e}—äÁé¯n†7­“^Ã[ñh~N|W
 ý¥sùLhd,õ¦5PÙº�)PYÖcl+:yQЭ»#­—*[˸ub”4ãZ®{È׃LQ
 endobj
-916 0 obj <<
+917 0 obj <<
 /Type /Page
-/Contents 917 0 R
-/Resources 915 0 R
+/Contents 918 0 R
+/Resources 916 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
+/Parent 908 0 R
 >> endobj
-918 0 obj <<
-/D [916 0 R /XYZ 85.0394 794.5015 null]
+919 0 obj <<
+/D [917 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
-915 0 obj <<
+916 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-921 0 obj <<
+922 0 obj <<
 /Length 3325      
 /Filter /FlateDecode
 >>
@@ -2809,130 +2841,138 @@ zEÕ´‡[=?®(i åµ'&M's°i¦MŸ<ÏTùÊëp•//xi•ˆA‚‡Ê¶öjP{}ßw�ôht­\4Ì7é°n9=b!>çî
 ÕæUï9@ºì<Rx³¿i±‚S:½J¿C:g`\
j–@q@.4Š‡.¾jÿfÙ†áÎ…Fqì\(¾nî÷`øþ!sPÝŒšZŸ’â“çIJ:@Ê}Ûø·K*'rR™²(>½¤œT&ÄÄTÀŒc¦”¸ÅDqÿC�ð‹³Ç®Üˆpi6|¯Nä…'�üóq¿ÄOn?MC
 u?;úÛ¿tëˆ�Z‹iÕ©f±†E<S(ˆ8:·Eÿ“¸sÖÿOÍÇendstream
 endobj
-920 0 obj <<
+921 0 obj <<
 /Type /Page
-/Contents 921 0 R
-/Resources 919 0 R
+/Contents 922 0 R
+/Resources 920 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
+/Parent 908 0 R
 >> endobj
-922 0 obj <<
-/D [920 0 R /XYZ 56.6929 794.5015 null]
+923 0 obj <<
+/D [921 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 342 0 obj <<
-/D [920 0 R /XYZ 56.6929 659.6382 null]
+/D [921 0 R /XYZ 56.6929 659.6382 null]
 >> endobj
-923 0 obj <<
-/D [920 0 R /XYZ 56.6929 628.8211 null]
+924 0 obj <<
+/D [921 0 R /XYZ 56.6929 628.8211 null]
 >> endobj
-919 0 obj <<
+920 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-926 0 obj <<
-/Length 3376      
+927 0 obj <<
+/Length 3402      
 /Filter /FlateDecode
 >>
 stream
 xÚ¥ZÝsÛ6÷_¡é“<1¿
-'vE|\¸¡ÁÃfF�Çûý¢ÿÁ)û§ó"ÿO:mòª´
-×là-œÏ[Ò["hY¤œ
-¨õ×´h3>CÔ§óo`ôeªûÊÆ›ueí³†hèÐ/÷K‹0»/k¥Š×#T´³aHþêyÁíþ}ÃÃÐüé:öæu~~¿#«ˆ]Ÿ>?Ý}þ„­}#wçSº£ñö#ˆdþMÙ†¥óÔP:“°2ur£Ìã»L÷Ž›Ås×l뮹ƒ¸²ÝÙ×ÿ¼£ƒ-M,Òà”¡Ó®û
“ݧ:¯D•I®ò3ŽERlª€iWŸª�ë(W^fÁM°0P :¬ö�‡[â
“.Ž½È™pá°ÙöØ5cÆ·âÓ@Và_¾5#DÇÆH†bþ	£µÅx–Àó‡°ØSÑ‚Xp|1-Ì‘”r 1ôù
-ÏlH˜¡¤hô¡¤ä^wºÙV—Ls04ÑùJ�£P›ÙITÎ#[¬!7”q)'áêW| Q퉜’BSØÀzS�qYz½±þ*ùhb*EV{_A žä<Q_'’«Õ+y5càƒgÑ{]O]9®Ñÿ~tàì]
NŽ>x3rµÝŠ%Iö×fVjó�r"ásR…^7ÔÅsó/š÷Ñb.‰å£†r¸ <fÀçzj”PYúER¦[’©d­&é²h÷{M龤tùx´-oJ}ÉÎÒ[â„HnÉëRß0ç–DÙjm÷ý¥#Ð.&ÊL9£"MÊ©º
SO0Ω} 8µ‡î³ßà:êæ­ÏÀVš€¤Îwy‘ŠWž¾©ÆKÂ#öû§órÊ*]›taÍ�½¶˜‹ˆG4E£2;¸‚lŽ[ó}ÄÏYî)Ï	ÁF^¶à}ªó¼£ê)Õá¸Òh·‡S3® ¤	<y™�Žj‚���='öF|<¡ÑX£JÉh¾Õù�¼eºÍ�Ù•¡-á8rK­·Ü‘ð—\X	I¶Q›¶�ß…w•Æð�Œ|`a•Q̹
-“YÒnwÊííÕ‹*g§;€"Tá1ce5ÁºÈà”wk:¡Ý™N%ú¦“k*�¸~4Ô
-TPsã€B *ÉÅ>ßC@w^öÏÌZ	 �Ñdè\ÙA#*IÉ@ðÍH<Š‘°sQÐ&
-`<G=P¹x|oP�Jýýt…5k,LXðw"ãïãçï¤ý�¾õ#Š#Ñ…ßP0V’R�1
-`ˆ?¡;¨¿�©÷ì©'üãMvò%§)	ø‘­öb?M€G½ÑÑòà½kEÀ‚æt»†w©xM¼¦§JɸÕö�¨2ºÌ‚ŽŠ™Íôáa�æGN¤ðG[}ãÅg³ðÃp^äåtÊë®q¡s?Ó0qT™$­Ýn¶

Øï1íÇçà'"ô
8ŠM^&
Å‚@Ó»5Æ/èÖZƒ»z8{™
C&UÇɲœ¯üøŽ£9÷›.?tð‡XÀr;ÇòÿÞëøc¸@buç̯| KKË
-?cλ†�²þ_¬–ÙÒendstream
+'vE|\¸¡ÁÃfF�Çûý¢ÿÁ)û§ó"ÿO:mòª´
+cȸéÌy’åO·5‘£ˆ›jOÝ…~Ö^ah[³Ul2ðòYUC¸’¾	QW?Ž%‹­}vúkZ´Ÿ7êŽÓùBp2ŠÍ„÷•�MëÊÚ0Úƒ™¹Óx¹XZ4Z
X‹V¼a¥�
Ã÷WÏnïðï†æO×±7ÿû¨óóþYPìúôùéîó'luH¹FØ�ï:�£
+½n¨‹çæ_4ï£Å¼KM
å{AxÌB€ÏõÔ(ù²ô‹¤L·$SÉZMÒeÑî÷šJ’RëãÑF´¼)&;Ko‰"¹%¯K}CÀœ[e«y´Ý÷—Ž@»˜(g0匊4)§j,L=Á8—
Åe
+üà
+²aènÍ÷?g-¸§<'yÙ‚÷©Î[ðŽª§T;„ãJ/ ÝN͸‚�&ðäe6:ª	>f<öœØññ„Fc�*%£ùVçò–é67fW†¶Ð„ãÈ-µÞrGÂ_r&$ÙJDmÚv~Þ	TFÃw2ð�…UF1'Äæ
+ÁI±§ê±¿
+Ð
Ó&ÖÎÄRÀˆÌÐK?€sWt±foõ®¬»ó﫪Ð6§|à|êŒ1¼´.£>ÕycÔQx´ÍvQ~å“:©G
$#ÁÅå;ª‰õ‡õ¨
+~ZÏ)ã“Ç°SÖ{[7—†ŽH›_ÜÜLÍ«œ0–den–àŸm.VqvÿÏÛ‡O7ïûn�êL53¨Ÿmèg=úĵ¢äÚ4Æ2Âñ¤’CM ƒ«b`ýÊop’˜'�uK˜ð\Û‚ñcmK©cõ[
ö1¾
+£‹FŠ!’wVÚÆçÂ"ö™Ð#Ý&åFÓ’Ç;áŸ6@KF#*LÂûkÕòG3w׊0Ñ3–òH>1šLw”÷WEÖŶä²n^x:®†Ð*˜ô%œâEÔ0X8FÇà„Ôð·
+ªKA/ÁU1ÍÙ˜CˆØ‰"?ø†š÷¨.¨¹¥¢b4ýxAº¨Ê…þšŸÞ·cžî…ñe:ª	&†û5oÈ…½‰v{7Ñ�\›�?|½È?Æ0Ïã`‘ º+jêòxœnuú…ï�]{q
g«w•}ÁãëäK=¼@1˜j€ …¨\
ŒGà¨*�ïêQé ¿Ÿ®°f�…©ëþBeü�aüü=„” ÿ‘øÆ.ŽD~oÁDTXI
+H5Æ
 endobj
-925 0 obj <<
+926 0 obj <<
 /Type /Page
-/Contents 926 0 R
-/Resources 924 0 R
+/Contents 927 0 R
+/Resources 925 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
-/Annots [ 928 0 R ]
+/Parent 908 0 R
+/Annots [ 929 0 R ]
 >> endobj
-928 0 obj <<
+929 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [250.9056 758.4766 324.559 767.8862]
 /Subtype /Link
 /A << /S /GoTo /D (statsfile) >>
 >> endobj
-927 0 obj <<
-/D [925 0 R /XYZ 85.0394 794.5015 null]
+928 0 obj <<
+/D [926 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 346 0 obj <<
-/D [925 0 R /XYZ 85.0394 227.5287 null]
+/D [926 0 R /XYZ 85.0394 227.5287 null]
 >> endobj
 736 0 obj <<
-/D [925 0 R /XYZ 85.0394 201.8676 null]
+/D [926 0 R /XYZ 85.0394 201.8676 null]
 >> endobj
-924 0 obj <<
+925 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R /F58 627 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-932 0 obj <<
-/Length 3418      
+933 0 obj <<
+/Length 3423      
 /Filter /FlateDecode
 >>
 stream
-xÚÍ]sã¶ñÝ¿Bo•gŽñE‚�—Äwu¦¹4Ž3�4É-Q‰TEÊ>ç×w» H‰’œô:½ñx¸„–Àb¿°�“þäÄ&"ÉT6I3#l,íd¶¾Š'�ðÛû+É8Q@ŠúX_Þ_}ñ.Q“Ld‰J&÷‹Þ\NÄÎÉÉýüçi"”¸†âéWß}xwûþÇ»·×©™Þß~÷á:R6ž¾»ýÛ
AïïÞ~ûíÛ»ëH:+§_ýõíßïoî规çøòöÃ×4’ÑãĤw7ïnîn>|usýëý7W7÷Ý^úû•±Æ�üûêç_ãɶýÍU,tæìä^b!³LMÖWÆja�ÖaduõÃÕ÷Ý„½_ý§£ü“±PxuÌ@£{tRØ,³“Ôf"ÑJ{‹k馋bÖ6ב–fšÏfõÇæeõHCmMÏßëªà‘—
Cy5GÀNgu5+ªv›·ÏÔ.‹ÃïÖyYµE•*
4uÀÍ[‚J~æ«
Ë|³)*ž³¬hµ9Û�¤™µÊï¥YÖÛ%¤¦¸Ìö)_½¡×Ú/ˆPñTl_ðc`N_»¤4Â(•Âœ8ղȷíC‘·Q˜‰¿0TgMŸxNàËzS,v«Õ½Îw[ÏI„=Kˆ f°O�{J¦·L{¾B®(PÒf·ÙxYM\Å-GÔ_¥©>Øz½.H7ë=y©xZÕÛ5�ïáßyÝx(	�¿Í½*üÇjæ)Š§÷aŽy±Èw«–^ʆxa]�*Ñ"Mó¢ªGØè%AÛQ©©Ö ¼2™
à�¸ðˆŒ@o�Ëx‚y™¯v›‘u´΀žZ½iË´Fe6�2ɲÀbz(èÙlŠY‰{/æ4PV„ÚŽ“b�0‰‹<•Åó%Ê‚p¶§ £›rÚiÆñ™ì:‰ƒr6-ÙŒ­yCr
+xÚÍ]sã¶ñÝ¿Bo•gŽ(ñE‚�—Äwu¦¹4Ž3�4É-Q‰TDÊ>ç×w» H‰’œô:½ñx¸„–Àb¿°�“þäÄ&"ÉT6I3#l,íd¶¾Š'�ðÛû+É8Q@ŠúX_Ü_ýõ]¢&™È•Lî½¹œˆ�““ûùOÓD(q
3ÄÓ/¿ýðîöýwo¯S3½¿ýöÃu¤l<}wû÷‚Þß½ýæ›·wבtVN¿üÛÛÜßÜÑO	ÏñÅ퇯h$£Ç‰IïnÞÝÜÝ|øòæú—û¯¯nô÷+c�ùíê§_âɶýõU,tæìä^b!³LMÖWÆja�ÖaduõýÕwÝ„½_ý§£ü“±PxuÌ@£{tRØ,³“Ôf"ÑJ{‹k馋bÖ6ב–fšÏfõÇæeõHCmMÏßëªà‘—
Cy5GÀNgu5+ªv›·ÏÔ.‹ÃïÖyYµE•*
4uÀÍ[‚J~æ«
Ë|³)*ž³¬hµ9Û�¤™µÊï¥YÖÛ%¤¦¸Ìö)_½¡×Ú/ˆPñTl_ðc`N_»¤4Â(•Âœ8ղȷíC‘·Q˜‰¿0TgMŸxNàËzS,v«Õ½Îw[ÏI„=Kˆ f°O�{J¦·L{¾B®(PÒf·ÙxYM\Å-GÔ_¥©>Øz½.H7ë=y©xZÕÛ5�ïáßyÝx(	�¿Í½*üÇjæ)Š§÷aŽy±Èw«–^ʆxa]�*Ñ"Mó¢ªGØè%AÛQ©©Ö ¼2™
à�¸ðˆŒ@o�Ëx‚y™¯v›‘u´΀žZ½iË´Fe6�2ɲÀbz(èÙlŠY‰{/æ4PV„ÚŽ“b�0‰‹<•Åó%Ê‚p¶§ £›rÚiÆñ™ì:‰ƒr6-ÙŒ­yCr
 ´>/ËÙ’ÈŸå
ï

 Ÿ5h>
 8bÆ»v�™¡mË9šï@�WõC§ÿ}ÒS˜!5é+ä¡7”K_Æ(«Céß‚
 ›˜)@€Ô!Ð=ÿÌé±Î°ÎC$ø®
-еœòhfpŸKô.4Šf‹P½ksøîþöÝO“þ{W4Œƒ.Ñã†y:Z›UþĶzàž~‰m̆ KÚîIÛÝ×n…Þ4Ak,‘Zÿâi¶ˆl¦D£F¸Ú­êlYÌ~£é¼«ìí)#I!ÏR?•ìèaØû^Ä¿®ttÄÜ
-�ƪó�-²aÄN H’‹ÞBÛÔpcÑÉùL&”íÌ3øÛV1΋s�Å©$œO
-Ð(´FÃ\–bÍyô…ž»†	:dš
-•˜Ë–‘�Κ\°ÉâÄ$„p×
�aw¯A«òÇʱÕ!¨v]üF«óé¨]"ÒL'C¾mò¦
¿3fkBp+(4qG—‘{º`8ÐE¿PmâÀÏÿHþÛì9$¤N‰	�xl¯ð�°¶;„·ð)~v¼‘£�«þŽdvL#ŽÒ>"
ù°™Á7þ¬À1¿k?#ñèäÇ�aâ™Bãæ¦�Öuáß«Ì-ê>lºgxoøÜ	NyÀ\k…sYˆKÏ(‰Zët¨$8í¿v
Ÿ2ó²ÉV!ë‡îGœÁÁ![Åa:šAòh“dbAúJËWå£:…€TÚl˜�þ¹¯=ß{’ú.†¹_§ŠÂž"«à|K9žìfÅ“³�„KQ)
ªçhWÎØólÖ±Ô¤EªÑ	,™êôkïÏúB1©áLÿ'`	2ßÈÔüO¸G�V=&«1&«XdqšœÉýŒ�2hþA q³rvú‚ZïbH€a†s"žj”y{²>cÞÅ2pç™;˜FÏš—¢á^fDº�ä:öì9ÆŸ�rªGħe•ü„¬2
-�MÐÙº¾‰aLÅœâÕmWLÙÇ#û8§Ÿçý—Cß®Qp¶Ø¡ 7}±(Á�Û׋�"W+E*e2ñRK�>Ñø ¤¨�u¬´¡)Óaùü?ÿ­ˆJÌ,Ž4	|tJëó‹wX#«ëƒÆ‚‹M2\þ“vz¸ãäÌÔaŠ‘a'ij~ë*×ðkQaZ0§šr½[å-ÉÊY.˜
-ùºªŠïÅÇÒ÷«
œï‡5¬(Ÿ¸Ÿ¡§?ܾ¿¿¹ûö
½ñ&éåþºæêvˆä5Ò
•:5Ôô¼zác“­‡}ŒmÙÍ«:¨ÃÒ>Ceg®gEr褡öꨯ뾎ª˜��F«>¹�uFÅ–/Äå°‹Õ<š­Jì\)–Ò"ÑàAÏÐa�P0Ø,L‰„@u@·ÚÒ¤sÌ?ç<X^ËiŠ©õ¥e_oV¾ÝêËÚ8À_’=#„‡·‰¹kàQÂœ�Uݹ	�Z*‰¾Í°èÜôþ:SSêQEŽˆ¯�jëûâ§|^p)u�ƒÞÁé�h†“¦‹ÑF$s _‰‡/M/£Ñ/nà3±¢®:öü$·Ïu(ünr¼0´z¡Œš†Á
-«Ê›ïÚeT}œ×x‰a„\0d)âì é1N¶Š…QÚ¼¢és»˜)»C)9Æ,ð}¯NÃŒ±¡^\ÂÙVäó“)!�Ï\|Áé÷±N[d‡åå^7m„w	ʦ-gljNEgÙy:¬
-†	–îmH‚�~¬ì�Œ>¶2„Á
-RÜ‘î„Mý.îŸ�}\ÖuÉN›^é´å$oxeU®óU´ådãØÑ¢q$-Ÿ[¿C:&`x´€�˜4Pp»aü.]òŠ#ÝõŽt›†‹Ö†ü GЮm(HØd�[5„¾Öö<¬
·@à¾e
c�Ípœ1©`oº|ÇûÌÀ‘ØÁm—5Dã8³Vœ‡i9Lµ
-	£–!alhœ7¨ýI&!²h8Ü�(÷™ ¦›'…xôÖ…>fU<ú:ˆWzmÁ ðÝg¹Z
yE÷ÂÎ&£t‡‘Ž¾ÁuxkŠ/ªìïvÝ	e!°‡ùƒ7=„Ô±Õÿ�Á…¢�x·yDßãÉÅÒök¯Pïï—¬¼:5n9�èa…E¢�p£Ž]ßµ>&ý? n}ÿendstream
+еœòhfpŸKô.4Šf‹P½ksøöþöÝ�“þ¶+ÆA—èqÃ<­Í*b[=pO?Ç6fCP‚�%m÷¤m†îk·Boš 5–��H­ñŽ4	[D6S¢Q#\íÖ
u¶,f¿ÒtÞUö¿ö”ˆ¤�g©ŸJvô0ì}/b‚ß
W:ºbn€´8P?³ƒë)
/æÇjz÷Ë Éöx{�Ê»*f�C¥‚£‰˜\-
+cOÅ¡—jŠvèIäMGÆ`;@“±{�÷õà9g9Óð°§­%®VÞiào£GK&…NcÕùÆÙ0b'
$ÉEo¡mj¸±èä|&Êvæüm«ç‚ŹÎâTÎ'
+#&øgÓîö_ቛX¶ÁÁœÁ
+<¶WøFXÛÂ[ø?;ÞÈÑÎUG2;¦Çi‘†ƒ|ØÌàVà˜ßµŸ‘xtòãÎ0ñ…Ì
¡qsÓÆ	ëºðïUæu
6Ý3¼7|î§<`®µÂ¹,Ä¥g”Ä­u:Tœöß»†O™yÙä«‚õC÷#Îàà�­â0Í y´I2± }¥å«òQ�B@*m6ÌGÿÜW�Žžï=I
}Ã\†/†SEaO‘Up¾¥‰Ov³ŒâI‹Ù@Â�%‡¨”
+c­½À-gEl”¼pâ_T®ÓVاã3æV’ALÕØ3ÜJµˆ]’]8ÃOpë.«OÆgÌ,›
+kì‡o)¤–i?pþó<;g�=r>Óö¥ôÿG,$38¹ÖßÓ«çÕõ1U‡@…È&èl]ßÄ0¦bNñê¶+¦ìã‘}œÓO
ƒó~
„Ë¡o×(8[ìP�	�›¾X„àÇíëÅG‘«•"•2™x©¥NŸh|RÔÇ:VÚДé°|þŸÿZD%fG
š>:¥õùÅ;¬‘ÕõAcÁÅ&.‹I;=Üqrfê0ÅÈ°âY¿u•køµ¨0-˜ÓM¹Þ­ò–då,L
+ÄØŠGõõ}
Ô¾•?/¸œº¿ÒAïàøF4
CJÓÅi#’9ЯÄ�Ó—¦—U�è7q	šXQgû~’Ûç:79^aZ½PFMÃ`•UåÍwí2ª>Îk¼È0B.®RÄÙAãcœl£´yEã-æv1S:v†SrŒYàÿ:^�*ˆcC͸„ó­Èç'-RB*Ÿ¹ø‚ãïc�¶ÈË˽nÚï”M[ÎŽ-�ŠÎ²ótX#-,ÜÛ�
YÙ;}(le…
¢ð—È_‹bÃ>Wr«WN{{ðHß�ÄOŸ(ø7;̉dïšLN7hä>&Ø7
ò·Â!±‚´wØ)Û%»ú![ø?PÅ
+ñè­}̪xôµ¯ôÚ‚Aá»ÏtµòŠî†�MHé#3|‹ëðæ_VÙßï<ºÊB`óo{:©c«ÿƒ…+ð~óˆ¾Ç“‹åí×^£Þß17X}ujÜr ÑÃ*‹D!áF»
+¾o}Lú
 endobj
-931 0 obj <<
+932 0 obj <<
 /Type /Page
-/Contents 932 0 R
-/Resources 930 0 R
+/Contents 933 0 R
+/Resources 931 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 907 0 R
->> endobj
-933 0 obj <<
-/D [931 0 R /XYZ 56.6929 794.5015 null]
+/Parent 908 0 R
 >> endobj
 934 0 obj <<
-/D [931 0 R /XYZ 56.6929 553.585 null]
+/D [932 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 935 0 obj <<
-/D [931 0 R /XYZ 56.6929 541.6298 null]
+/D [932 0 R /XYZ 56.6929 553.585 null]
 >> endobj
-930 0 obj <<
+936 0 obj <<
+/D [932 0 R /XYZ 56.6929 541.6298 null]
+>> endobj
+931 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F58 627 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
 939 0 obj <<
-/Length 3586      
+/Length 3588      
 /Filter /FlateDecode
 >>
 stream
-xÚ­]sÛ6òÝ¿Bo•g"Ÿ8÷”&NÏ�‹sç¸3½iû@S´Í	E*"Ç÷ëoPü’”»v4#‚Àb±Xì7È~|auÄd¢&Q‘f\/²Í[<ÂØOÜìЪõãÝÅë÷±X$Q‹xq÷ÐÃe#f-_Ü­[¾ýû›Þ]Ý^®„fË8º\é˜-¼¾yG=	=Þ~¼yýÓ/·o.�ZÞ]¼¡îÛ«÷W·W7o¯.WÜjó…ÇpdÂûë\Që§Û7>¼¹½üãîç‹«»n/ýýr&q#_.~ûƒ-Ö°íŸ/X$«ÏðÂ"ž$b±¹PZFZIzÊ‹OÿêöFÝÔ9þ)m#-T¼X
pK5Ïe1
\[Å"+¡¸¬f¹ �Ë›}ÙÛ2_eUºÉ›ñ®yÌ�:¡}Ô:¨
-d�Ç‘4ÒI¸{*`}¢—õ¶-êŠÚϩ댗û&_SWᇼ@ËH[ÓkZ–õ³oÒc]oRš/qƒÔàŸÒ¯¾'°� ßÞ¼ùp…¬
-¹&ˆÂﮃģýÁcwÃäÄ8¹“ä‚E‰’v¨þ(ƒù·,ß"%Ró¡:+€íNV ]¬�êí‚#	{ªÑÔOßPãC0AÊ’¼\ñÖš¬‰›WÓ3­^úË5ôÒm~´)WßH°¡�¦eS¯6btxšGFiå5‘¼Näí½aŒÀÕóã*Ÿ€Ë3A›óo۲Ȋvf1e"+˜ñ€°ag¾Wкy
a”
ì®+´õØr.Ëô؃�aÕ
-ˆ=Trféjfí�êIÅ’�?bÖ´eñÉ@¢D
-{PdçÜ\|˜Š¼90øþeŸ»Ã…&i/t4mCPÞY^u~°"xçT°|Ny.ÊÒ¯Ô‚¸¡ïÂnŠéDü~� ø
És½ûì�<&dóAý—}A
Ü
#ÿ$À«¦Uóì(`Þ×aƒ¶Æ9GÓ(…uƒm'·0tg¦<Ó‚GÇžn§Ð^×Np™³Ž~BI¨Óõ�|®\Æӧʓ
-Îm,—KrKãØßóQXO­×8xOûÝ`AÒ
`³³�GtX.ÔÁ1ÂÒKÑ̹ˆÄDR›ÿA´"ŠhnêÖ/Ò>¥n|jÛyg9ª£ô(v½S
-|
¸øâ˼�JIP½¶Ûì�	®ãõõF,ÞÕ°¥EW
óª�Úí˪ÁñÂ-
-bAJAå©ç´Œ]¾\
-^�^ŠÍ¶t¡9ÙyKõ>xúZ*´’Éá+pرŒå¢ÇÞ?w`ÒbE�ÉÅêPôþsâaW„ƒ�Ä€çæ„q„å9
-A6‚à�Ÿ)¾(4`ɸ²�%LWäMÐ7¡`;"ƒ\Ç5añúHËÑ­‹óàf™fXúpìÖñÑ‚h	xƒ .»j�Ñl\tN¼”ŒTÒù0Œ~µ
U"œç…
-V\ï7[êFm|«¦1’Gè K êìê‹ÐOFÇjJ‚Ð,Þç1håñÍda4Ǻo±djÇ]¨=œ¢Y¢ÎÝ.„`¡>£ê#œƒ›º‰àl#n¦·ÎçÙ>9S‹€ÎP1Æ5œuF,
-Õ挑íA�0²
ªs~ßÀêObpº	äØ'Wî ¦K=èDñpmò|@R¯«–]ßqÏ—Ìzrd”p…œ÷Rï©QåTªõ7ð\Mz_æôrýëûÛápJ�mº1Þ—éŽÞ»ü
‰ô5áÅ£ôŠ‚‚ˆA� ¼ÌݤAÏyÃó2IЯí®þZ¬‡5V-PF«âQMÛ_ûŽ¯É8
–`†Zr‰'Ôªƒ_õ'Ì\˜MðΫ–„A0ƒó죟ÈZ
-Ã
-Õ_»'¶J@t¤õ(V¯ò粨º/#û¥*j~Z•¯_�¾ ì¼È\M¯x¬jûYêHͿƺº÷Ÿþ>ùðñ¶‚´ÌZqÜ}X‘˜@òGM"V
îW[afHÿ/¢Lendstream
+xÚ­]�Û6ò}…ßêb…Ÿ…{J“Mo‹Ëæn³zhû •åµYr,9Žï×ß‡”õe;w-X9‡óMñƒŸ0«Y«@3®géæ†Í^`ì§î`hÑ…úñéæõûPÌâ E8{Zup™€ÃgOËßæoÿþæŸOw�·¡Ù<n:dóïÞQOL�·ÞßÿôËã›ÛHÍŸî?>P÷ãÝû»Ç»‡·w·n4‡ùÂa83áýý?î¨õÓã›Þ<ÞþñôóÍÝS»—î~9“¸‘/7¿ýÁfKØöÏ7,�±Ñ³¼°€Ç±˜mn”–�VRúžâæÓÍ¿Z„�Q;uŠJ›@Î
+à{(Ø#b­…¥xwËÍ<K+û\�RJK�”bþ5¯Š„ö�ÝÕŠžÍ:£Æ»‡OX7I¹L”N»­áh‚OŠCrtkÔÍ.O›âH Y¹"Ò¬,B;°ÍÝ­™ï:Z8.·býsÕ¬Iê-“à¹Iê&ÛQûwÆN´/@+5–G`džÒË~»Lš¨j‹ÉЄ
�ÎHw+·]¨órÛB!åeÕä«ãH\¹"®ååu[¨‰…{âÊ£ ŒÃ°¿òý
+W}ý^›.(„ŽbÀ� Gâö
+Z×HžDCDʉvW%ÚzlY—u؃�~UäÙ…í}�—/ŒJ&VžžËŒRà…t ibg ÂHjYVÈüùAävB¦'
+ƒmoÿX[6i2yAëÕ:Çõ4)! 
¡àª¥ðÌ–%0Æ{²
û†¨`“©�<£ÖsFÏz›¥'µp¡
+L+u À¹E¬�žð:ÐàæDM¶�-ã”í
+‡už®©™&µ£'oèY�¬ì@iëKÔ,ÀÄLADÞã5m%ÍÄçÙF /CÑŠp~ßÐäCµ/–ÔtmŒe�Åœ¥h$wGzµrÃÍ~Wº)+<ó•¦X»}¬À¹ÍÝ‚iâ‚F«òê¹."º·Ût—Ôë³aŒV
+,HÒ¬·`²€ˆ:8æBXzÉë)G�ÔÑÿ Z
E4UãiÖ‰]!>5Í´ƒ3ÕQ:»Î)
+ˆN0Ò­ÀþPÓœ4I×Ùßœ¹kÌGºK [¾Ì—{Î=šp/	<ä‰Îï"û¤i°Â‘6¾‡6¹Å~Ú9õ}Ùßòy¶Ë1+„ãƒlÐÓZ
+™¾œhC®!®ƒ!;‡mXàWÉH8Û솴O,—Ô¢œ*š(ø0+Oô!Ç:Jqäò 
+¹�ßãFÝô)ôYŠî¤:ºMuÔ<­Š‚‚ ñÛ¶±ÞrPŒ‡7(e{B
äSM8°Ú·/
+j�/Z
+NÑ,V×n|°Ð
ŸPõ
ÎÞÍÝDp¶
�Æ·Öç™.9c‹ã�®P1Ä5œµF,
+ÕÑ#Û�º`d=Tëü¾�ÕÅ>àtcȱ/®ÜB�—î{>Ð5ˆ.ÂþÚäù€¤N
VÍÛ¾óž/˜!tä(RÂfpÞ±ÚS£Ì¨Tën à¹Ìëä¹Èèåþ×÷�ýá„Ûdb¼/’½·ùÕë«ý‹Céƒ 5(@æx™»IN‚æŸÓ
+†çÅ^¿¶»êk¾<ÖPµ@�
+5mwí;¼&‹á4dX‚AjÈ%^P«~Ñ�0qa6Â;­ZfHÁγ‹~$kè
+#\�àh”Õ÷ˆˆC3Có½\iá¯4Â;âŠ
+ä(0�ËE–x +Œp]45<¿¨˜¸ljºPçMM5%Áý@‰”òòê-ÔÄò=Ûª@9hCoýöô›S~]§»¼£+ÕjB!Eb`¤ÿ=ëˆa
+%cí}ý„B¨ 6í…þ”ÀÑGÚ'㸦oŽ®u²KÒ…»Î�4�Eƒ�c÷™…Ï…"H¹èBè:Økº/±C	½ÒùÚ¦-æÂH“<»+»dsºš3þ³Žp¾JÒ¼Ào¯Üä¢J–î~&¢[褼[§/óp¸t¤Ðã—‡û_¹GH×6S÷9îMÁF²ö“
+x{ÉJ¼5!YpÕèNÜó቞vkð|÷ñ56öŠ‡îÍüÞ�{
+çñ+zºï
UK%´Î�?Gg›kç/
 endobj
 938 0 obj <<
 /Type /Page
@@ -2942,51 +2982,6 @@ endobj
 /Parent 947 0 R
 /Annots [ 941 0 R 942 0 R 943 0 R 944 0 R 945 0 R 946 0 R ]
 >> endobj
-936 0 obj <<
-/Type /XObject
-/Subtype /Form
-/FormType 1
-/PTEX.FileName (/usr/local/share/db2latex/xsl/figures/note.pdf)
-/PTEX.PageNumber 1
-/PTEX.InfoDict 948 0 R 
-/Matrix [1.00000000 0.00000000 0.00000000 1.00000000 0.00000000 0.00000000]
-/BBox [0.00000000 0.00000000 27.00000000 27.00000000]
-/Resources <<
-/ProcSet [ /PDF ]
-/ExtGState <<
-/R4 949 0 R
->>>>
-/Length 950 0 R
-/Filter /FlateDecode
->>
-stream
-xœeU9²,GôûeË@@Q‡�!é¡%bd(dèúʤ—÷ÿ(žÑ¯
-’$¡T¬)ÿ®ïë¯ãïãÇ_¢ýþÏaíÏc‹®½Ú¿G—=ûÌöÓ1ÄF¬lÖ]töö×ãqu‰Ý¦‹÷5š�”�<8Ç—ý:\;âúãñ‰ü<q¸Í;.\ži2c¶û~ð¶e¸í×qc¸=7Ä+Àg
¯ã�ã×ctéa³ÙL1ca·cu™šmQOƒ½¥ì-¡
{wñ¨¼&kñÄÞ
-¨9xcH
-¤Ï’ÃigÙ¥—ÇáC6uéíÛ&”\ÊGTœ„Méêö–KòlÜ’Fyu|?é%åiÈ¥K”êNÊq{vˆ�*êèJE¢]8hÍò¤p0R±ˆ$Á(+ÁnÖN¬
-q�ª„Ñ«ò�^ÿï>‹«>÷—
.13×…Óƒ!¶3¢SËAÕ”ih¥Å¨Š^…(€<Îm䦽ªšÛÆlLÊâ³ò7Ù
-г2"ïE9~ 
-n*Œ1½÷¨¾x¥Æˆpîâ‹
&Xî
Ãœ§³±è\íD¤ß�ä0}#XŒûž˜‹¸À>#^V°¡|2Îi‰9ÊÎ�r)`˜¢Xh¡Ò& „hb—H°Œe"Ãê
-þrÓGçX5¾ûû8‡´ÕªOª«t–Ô³$Ây°‰—BÒ›ÀÄ5
©/¨�vp�÷o`kA“ôr±ñœÓ4N.4Žæ
-endobj
-948 0 obj
-<<
-/Producer (AFPL Ghostscript 6.50)
->>
-endobj
-949 0 obj
-<<
-/Type /ExtGState
-/Name /R4
-/TR /Identity
-/OPM 1
-/SM 0.02
-/SA true
->>
-endobj
-950 0 obj
-1049
-endobj
 941 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
@@ -3033,11 +3028,11 @@ endobj
 /D [938 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 937 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F58 627 0 R /F84 848 0 R /F56 618 0 R /F14 608 0 R >>
-/XObject << /Im2 936 0 R >>
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F58 627 0 R /F84 797 0 R /F56 618 0 R /F14 608 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-954 0 obj <<
+951 0 obj <<
 /Length 3752      
 /Filter /FlateDecode
 >>
@@ -3058,88 +3053,94 @@ zà6+
¶FÁ,]ví�,ZQ|ÐÂeŸÏy{âJ_"ê–G
 Ù½“ŒóOa|t&'ÎðI6ËÞ}©båMåÈÀeÞ×�ÒÛªá�è>k�ƒ•dŠ'ª
Âœ¥*wo�tºùT1â ‹�žì~]K}
üÒ‡Ïww×Wî·"{°HP…0äº.V¯"H%¿Ö|±„lqöÇNZë 9~ÿçN!\AæpDpI*¿[Ù¨h… �|ŵ®+#(Ïò^“½GÇ?QsÇByáóÜùD
 K”%Éß)WY‚|ÁÌÞjè—øÛ?�~W¥�ɲ7§N38,"D!áQtªTdÒ3¤ÿÆ Hïendstream
 endobj
-953 0 obj <<
+950 0 obj <<
 /Type /Page
-/Contents 954 0 R
-/Resources 952 0 R
+/Contents 951 0 R
+/Resources 949 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 947 0 R
 >> endobj
-955 0 obj <<
-/D [953 0 R /XYZ 56.6929 794.5015 null]
->> endobj
 952 0 obj <<
+/D [950 0 R /XYZ 56.6929 794.5015 null]
+>> endobj
+949 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F58 627 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-958 0 obj <<
-/Length 3405      
+955 0 obj <<
+/Length 3408      
 /Filter /FlateDecode
 >>
 stream
-xÚ­Ërã6òî¯Ð-rÕƒ_GgY§6άí­Ú­$Z¢dÖP¤#RV¼_¿ÝèDR”|Ø­ÔD`£�n4ú
«™„ÿÔ,�„4™�%™‘TÑl¹½’³
Ìýt¥gá‘}¬¯>~�õ,Y¬ãÙ㺷W*dšªÙãê·ù§¿Ý|{ür½Ð‘œÇâzÅrþãíÝg‚dôóé×»¯·?ýóþæ:±óÇÛ_ï|ÿåë—û/wŸ¾\/T)X¯y‡3¾Þþý�~º¿ùå—›ûë?¾úòÎÒ?¯’òçÕoÈÙ
-Žýó•&K£Ù
>¤PY¦gÛ+Yc<¤ºz¸úGØ°7ë–NÉÏF©ˆ´�gcEÓR–BF µEe"6Ú)ÛI){,”òŸûb÷V5›ñq•Ž…”Q{ŠrÀš mz¤•‘"KãdHûá¥X–ë7»™ž‹î¹Øч㊆ÀÛ¦¬7ôÑ>7ûjEã§í¼íò]W¬Â.5�ê|ë�®ß¨l~»Æ“Ž$c”©Ñ	j,“ÑA¬6M<bÙ2­¦cJx¢®ƒKbab…RR"‹"í–ü.¥&¾ä¼cf݈áà²pÉ”ä|UtÅn[Ö~‹§·Ñ/»k•Î‹¶¨—iÖ#”ÁÆ˼+6
Ðœ�J,…µ¦/•²h'„bŒH"£OœX«g¢bTûŽ÷°.è°ÇBŠËçbù}�Þž¨1\XœfïXÔjlS'rDþñoÇØlÞ¼teWjøƶoñ®Ò5áêvå²ã¼œZ>ç»|Ù¡ ¼-®ÕœqòzE8í[ÝåïÖ­+v]^2åU³¥1L�Pˆ¡šõ2‰¶v¨–Û¼%ª&v*Z¹Uð
d?6<ñùî�|‚—¦n=�–EùêŽ�µ5[ú¢# .ºC³ûî¼q
-²cðªXçûª£�×Üi1°\6n§•ÓY·WãN"ý(^ìÛ|ƒžfóœ¸É�ˆÕñü+lpªÞ‰V[¯Ý,€Iå6ÊXFûOS#cH„ì	�uü(Û	Ri*²$ó¤ÖyYMR‘°™J‚
ëÉÖ5St¢„ÚVùk1±!øf¥eôäü�ïê)BFh«'8‡}SРö@’EŸ¨!ÀƒÐÊ7ÔôJGÝx.Öúø]Fr‚c¥µˆ¢4cnv¬¦S¾Ü^ï¶`;5"wÙó)±8‚‹ÊQnêf7y™0&Kúr›&t¤Y€Eš(bg‚Ä-T:ß;3%�¯�4
\›¼¢ásÓvlßøù‘0·¨]@~€gÙ$x<9É·>ʦî¿~¢Ai^Y3b˜Jµâ)ænÛ¬Jläëõ1ŠÖÃ@)И	iÊ¡(Fn}$SN‰	‘8y©œËЊ­–^Ï
Ðj—YÈàtM ›ô}ssC:1Ìüò/°‚²jAÃuÏo;F¯Z&x™öËîò=÷Ayg-“¹óßÒ»M
-Áßâ)ÐíÝ#úœ)C
-ÞÓÚ-ê…SA<Z–UÙ½Æ2¯	üÄK8�
HÇZ²äðÚ1FNÓm¼ah[vÅâP®
-š]æKÏDÃræ©8ðŠb‡÷�2u"²Ú/™Q0†]¾F ºšåÔE4¯.‡±pëeý½¥¡ãÚdóâ/ð5:O„ҭ∩bBâmÂJƒõÖ�£'^À�-»ÆãTÍ�†>K¦o„Ç$˜§Â8ZñrW>àà™ùø\«’Í
-ñ ¶BNT´-�:e+Àm�ç,:#øè§}G‡²}î/IœiÐ
qœŒJ—ï
Ôû#¤X¿ò·k¥Æ÷ÈjV¿ž&
V³\îw¼¢©«7Ú´©§¼@Ö×+zÈmbèw‘‡çrù<ŠÈ$ÈaIÄÅÜÂöÜ•]ÞApcPÍ	Ū)ÆèNØÃí9U¡í٨ˮõ•(ðÙâÆƉ€„ûrmÓC:_Úx$—*’�ŸçJD‰Ê.R
H§di'ø‰’˜
].iÀc…’&Só
-qDêBƒ^\@
1–«Xx,©Øü”ÉüŒœŽ0/«™îšòJî°‘=›¡ª÷ˆ‡ôÊ'Tñ°À‡0­#Šû8à¬^S"䦚åµÙsfBÐÆãÓÏå¶ß„qäm‰Y�6œ*j$5í�›ªyrÍžðGþ¸åUÍd½…[ÅÆeC»rµr¶[Šh
-Rñ-ÿvÿòâx$ÖEéZ°}µC}Hì-d”c½L£-ðVÖç³am•ˆµz'îc��˜
Ë¥cáíñê‘ÒX›dÑeփؙ@ÞËtÈÅ všD±dpäk&~Ä}£pãIêt�X’¼ä
-ÁÂuµ"í†3œU$^Ä„G9Gâ‰FN›(�I}&œ…º`Üy�¤0˜KÉê8%‘°Rû><—�@�’DZ%i_WxõÔ0_ùJ:Š€¬š_•\”áÏžx\‘ËhO…k\•-ÞÒꌑ/›í6”ÍÉ�»í…ØLyn�fø*æ[±ááUÎvªí®D’Õk»O‡ƒŸO!vOõÀ,‡ƒ›ž >5u·kª÷›aa×k`Ú||
-ÿÎàê
k‚üðÙ,&NGô‡ V¡á¦µ‹=>
ÜñL•ƒðËGp�k!”
‰fl!†{­d�3ÀÅ·Iš…”§Þx†¨~r´�
È€E¤õèýÚE›ÔwAa@[âˆ^vÛ)'“¹×Mÿ„4º�Ó÷&£Lž‹ßhwnÃè‰éõšpYó6ñ^i´�ÖƽgÚ©>	Ä�( AÄ
Ï
-rYp dÇɘuðkqQ¿6)}^DñFƒÞbÂG�~èÙÛ
Qh~¿5�°,sÇW‰™‰õ0‚Ž:L—^}…þ¼¦9F� ü˜4ßí±ÀœzÍæ@�<ÿÐútÚýñ
ØŠ8÷ggñoÅ&Ü
-™Šg
-j£³áà”õÿÃA'endstream
+xÚ­Ërã6òî¯Ð-rÕÁ‹¯£3�¬SϬí­Ú­$š¢dÖP¤#RV¼_¿ÝèDR´}Ø­ÔD`£�n4ú
«…„ÿÔ"�„4™]$™‘TÑ¢Ø]ÈÅæ~¾PŒ³òH«!ÖO÷?~‰õ"Y¬ãÅýf°W*dšªÅýú·åÇ¿]}»ÿ|{¹Ò‘\ÆârÅrùÓõÍ'‚dôóñëÍ—ëŸÿy{u™Øåýõ×ß~þòùöóÍÇÏ—+•F
+ÖkÞá•_®ÿþ™F?ß^ýúëÕíå÷¿\|¾gžWIƒùóâ·?äb
ÇþåB
+“¥ÑâR¨,Ó‹Ý…�Œˆ¬1R_Ü]ü#l8˜uKçäg£TDÚÆ‹•±"�a�Y)K!#�Ú*‰2m‚”í¬”=JùÏC¹©Ûíô¸JÇBÊh€=G9`Í�6ÒÊH‘¥q2¦}÷TÕæÅn–ÇDz,÷ôḢ!𶭚-}t�í¡^Óø¡Ä_»ìú|ß—ë°KC£&ßy Ã€ë7*[^oð¤É¥Djt‡šÊdrk„M�XuL«í™žh…ëàÆ’X˜X¡””È¢H»%¿K©‰/¹ì™Y7¢A8¸\2%¹\—}¹ßU�ßâáe²ÁÓþR¥Ë²+›‚!íf‚2Ú¸ÈûrÛÍ©ÄRXk†R©ÊnF(ƈ$2šñÄ™å°z&*F%°ïèð
+²cðºÜ䇺§�çÜi1P­ÛiítÖíÕº“HŠ‡.ߢ†§Ù2'nr bu¼üœ«w¢„ÕÖk7`V¹�2–ÑþÓ6È!{‚A`?ªn†TšŠ,É<©M^Õ3„T$l¦’`EÀzò
+ë‚):QBíêü¹œÙ|³Ò2ú?r~Ì÷Í!#´Õ3œÃ¾)hPw$É¢OÔàAè#åëz¥“îŒ<ë}ü.#9ñÒZDQš17{VÓ9_î¯w[°�š�;‰‡ìùœXÁE娶M»Ÿ½‰L“%C¹€M:Rƒ,À"M±3Aâ ¿ýeº<83Ô Â'M
+·0”
«f]a’²öÈyÏ=A\jß9}ÒÎÏå¾ãíë¶ý~xb
+‚åôé-ˆ€èPÞæ¥l¦¢{«8�»¾Y]}út+®n¿]fšô
+Áßâ9ÐõÍ=:�9CX�‡Ï$ä˹E*
%XÄ@â
f©¤”èaÁ!»°xnÀ!ùÿøäVðž6nÑ žÊRQÕUÿBEÞø�—p�žµ¤àøÚ3FNÓ5m¼ehWõåêX­Kš-òÂ3Ñ2…œy*�¼¢ÜãÅ} T�ˆ¬3
+Æ°Ï7DWSÌ]Dûì’·^5ß;:®M¶,ÿ‚ß ÷D(Ý*Ž˜*f$Þ&¬d1XoÝ8zà,زo=NÝièÓdZñBxL‚ùq*Œ£5/wõ9’Oϵ®Ø¬ýnQ”]GcǃNÙJ
pÝà9ËÅhãåá'„cÕ=—$Î4h„‚8NF•Kø
+|d5«ß@“0ÅaÏ+Ú¦~¡MÛfÎô`}ƒª‡Ü&Æ~È`p|¬ŠÇIH&AŽk"®¾à°ç¾êó‚ƒÎ(Öm9EwÂoϹ
+mÏF]õ�/•@�_­nlœȸß.nH¯×6ÉåŠdãçÕ¹Q¢²7©¤s²£¼üDŸ.×4à±BM“©e€ÑÕdWæ
ÜþæPÓLµ!8)#
+í¸ù�?¼žŽØ
+ÝÛ¬»þF€|½æJ¿8-¡¸æ|S(Ä©
q
5ÄX.k`ᩦbóQ&ów0r8¼¬aºÊ+¹ÅFölƪ> Ò+ŸPÅãc´Ž(î〳zM‰�›j”×öÀ™	A[�O?O”Û®|Æm�wf5Úpª¨q]ç�Ûº} 
+/:KÖ9ç�;^ÕÎÖ[¸Ul\6´¯ÖkgÛ±¥ˆðœ~\—ʼnæ\f@ò˜	aÃèߘ°¶‚“X
+.ãGv¿3Ž)Õ"¶™ï<”ÀæEPùp
+ïÓ”�OÎÂÙ„ÏKêúƒO_Ê©¡›8Åg
+H
+‘{®f9\
ñ±mú}[¿ß
+‹¸ZÃæã T0¦”fxrøpçÎ0Híh¨H–¾ Ã�Ë£í(�¦	çžO˜J*à\¢‡¬¼t}¹ÔU½;Olj…›qoœ)?½¿‘8üÕpÁLÄ>Ûwœ8
+HqÀ3@Áã:X:PàÄa‘wÜø0à/Ì»Ç/¸íKD—€ÀgIé,›�%qæ�jP\óŽà@È*Ž“)ëà×â$¢n;lRñfÿa4ê,&Ü_pôè‡^½Ý…æ÷Û‹2w|•H‘™X�#褿ôÖ£ïÈ£Ð_×´§¨”sb€æÛ²;•—s�Ù¨‘ç:ŸL»¿=
 endobj
-957 0 obj <<
+954 0 obj <<
 /Type /Page
-/Contents 958 0 R
-/Resources 956 0 R
+/Contents 955 0 R
+/Resources 953 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 947 0 R
-/Annots [ 961 0 R 964 0 R ]
+/Annots [ 958 0 R 961 0 R ]
 >> endobj
-961 0 obj <<
+958 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [367.5469 342.5455 428.747 354.4457]
 /Subtype /Link
 /A << /S /GoTo /D (zone_statement_grammar) >>
 >> endobj
-964 0 obj <<
+961 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [483.4431 140.0267 539.579 152.0863]
 /Subtype /Link
 /A << /S /GoTo /D (address_match_lists) >>
 >> endobj
-959 0 obj <<
-/D [957 0 R /XYZ 85.0394 794.5015 null]
+956 0 obj <<
+/D [954 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 350 0 obj <<
-/D [957 0 R /XYZ 85.0394 576.6195 null]
+/D [954 0 R /XYZ 85.0394 576.6195 null]
 >> endobj
-960 0 obj <<
-/D [957 0 R /XYZ 85.0394 549.9907 null]
+957 0 obj <<
+/D [954 0 R /XYZ 85.0394 549.9907 null]
 >> endobj
 354 0 obj <<
-/D [957 0 R /XYZ 85.0394 326.4739 null]
+/D [954 0 R /XYZ 85.0394 326.4739 null]
 >> endobj
-962 0 obj <<
-/D [957 0 R /XYZ 85.0394 302.824 null]
+959 0 obj <<
+/D [954 0 R /XYZ 85.0394 302.824 null]
 >> endobj
 358 0 obj <<
-/D [957 0 R /XYZ 85.0394 185.8791 null]
+/D [954 0 R /XYZ 85.0394 185.8791 null]
 >> endobj
-963 0 obj <<
-/D [957 0 R /XYZ 85.0394 162.3886 null]
+960 0 obj <<
+/D [954 0 R /XYZ 85.0394 162.3886 null]
 >> endobj
-956 0 obj <<
+953 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-968 0 obj <<
+965 0 obj <<
 /Length 3222      
 /Filter /FlateDecode
 >>
@@ -3158,1603 +3159,1664 @@ N½Ç¤÷€/›à´mÄRt2(»ƒP1è +<bu0p
 ÁD:ì]õŒ-„±à`æÇA<+uQÂt‹‚jŽ§eÃì÷b´=!k9tŠÁ‚»^ŽöÞ�ó+w›QóL@Ù—˜�`ÖÄ|+&A@Ý’”¤EÛ~êÖâ÷|\¼1¤™•L;S&¾Õ€ߘ¢N¤�Ì0ÛkÆ
«’Á—(=Av§zÔþÆÁ7K¦ˆ¼}ÅÓk�¾Äé3Ë„F=¥c€„76,Mh'Á`•oi(:bÅâR†S…ª&4¸èŠÑ¾Ÿ3}%sŸ œ‚˜,Ôxc´qÏþsE·‘Õšuÿ²u(Öm¾X—UZ?¤µi&È.F~I³IÚ5Uƒͱ;hP¿Lýa=
\É_ãÁôŒ*8�n³ëÜÃLLbOŽƒÅ€1îgÝ�>ŽçúKRu¶ÇÙS:Ö‘…\–KÕ«¨¾ òà€í6E©v¨„VG\‡z¤ëëdФˆ
#!ÃP´axBes˧xûÙ¡eéŠj÷wd	£+lIOfôטA½WV‹zKúÞutãïêÐÏEŒûOé¨.ýËõ0ÎýÌÀ1~Qï{@Ù‹71ƒT(±Óœ&bÔ[Ù¨|ã.d
 þRȉ͘�\þé	Î:ÏC073`÷qÝ‹i‚à	ªã¿ŠÃHð:‡€ÂD³‡—r
§•†´=j÷\ú9$ÀSµÿ²ÑAlzFçÜ	OÉœ^
 endobj
-967 0 obj <<
+964 0 obj <<
 /Type /Page
-/Contents 968 0 R
-/Resources 966 0 R
+/Contents 965 0 R
+/Resources 963 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 947 0 R
-/Annots [ 970 0 R ]
+/Annots [ 967 0 R ]
 >> endobj
-970 0 obj <<
+967 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
 /Rect [369.8158 524.5277 418.5625 536.5873]
 /Subtype /Link
 /A << /S /GoTo /D (dynamic_update_security) >>
 >> endobj
-969 0 obj <<
-/D [967 0 R /XYZ 56.6929 794.5015 null]
+966 0 obj <<
+/D [964 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 362 0 obj <<
-/D [967 0 R /XYZ 56.6929 355.3526 null]
+/D [964 0 R /XYZ 56.6929 355.3526 null]
 >> endobj
-971 0 obj <<
-/D [967 0 R /XYZ 56.6929 331.517 null]
+968 0 obj <<
+/D [964 0 R /XYZ 56.6929 331.517 null]
 >> endobj
-966 0 obj <<
+963 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F58 627 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-975 0 obj <<
-/Length 2574      
+972 0 obj <<
+/Length 2254      
 /Filter /FlateDecode
 >>
 stream
-xÚ­YOwÛ8¿çSxO#ï«Xþ—Øž2mÚͼmÚI=‡Ù™9(¶ëU–\ËN&³o¿û%K¶’v·}9ˆ
A�
XL8ü‰IjWNO§™áÂLæë3>¹…¹·g"ðÄ-SÜçúqvöü�•Çœ•v2[öd¥Œ§©˜Ì¿E¯þqþavq=�¥á‘eÓØXýxyõš(Ž>¯Þ_½¹|ûËõù4ÑÑìòý‘¯/Þ\\_\½º˜Æ"5ÖË á‘o.ÿyA£·×çïÞ�_Oÿ˜ýtv1ëÎÒ?¯à
-òùì·?ød
ÇþéŒ3åR3¹‡8ÎÉÉúLÅŒVª¥”gÏ~îöfýÒ1û•2“ÊdÄ€Z�Ð8f•TÞ€Ùb±�Š4Ê›ήœ‹.—pÄÄE»Uƒ”GÍC³Ë×D¬«ò�¨«¬!RQÍëõ¦Ìw�ýüÃ%M4ûͦÞ¬·D½üpgŸ!-‰Võ}~—oÑÆ�Òíy“¯²»©ˆ
-¿EC_â@éÙ:ð‚"p
`‹X挑þ`»U¶£»¢­a
-¶[µ| i700…HSÏ?åǦÈ3ÜG=ÕˆÐ;Ù3¢Ð¿·™ÿ.J˜ :Z	¿÷«4’é‚`°È›‚VÁä&Ü%nMÒÎß<I ǽ±wûrW€Óá¸y'4g0r°Éjq]ÅpsÄÜ�	cY":æz³+ê*hç¯ÓëÔÙ7ùcD
-]?ÂT0"ÏœJÒ°¬¯¼p
-B6¦˜9Þv	7ýäÎÓéÖj�$Àlb†{¿öíÊÊw#dJÕsÝ–õMV)üP#‡0K•tzÒÊí±„ö
PBû†ÈÔMõk»®†LÛßP€!tC€võ~vùæW¯a‡ì6oB‚
P#}Ðõ¼æ~•Wyh pj�ˆP¶äÍŠ¨ózó@#òÆö·Ë;—ç¡Ã"¼£RS!MCüøľ $	ÿ£êI9œÕ†~ß‚8Úõƒý~;]}kè’êóšZXRiOÒÊW»ŽG«¼Ü„¡÷døæU³oÍ*�hsþä”ê¸ðCŽk£ØP—0ª`‡]¹bþɇŠ_^ÝQê6B*ZGÌJÌ‘Øu꼪Ô)­KÃ_9G\™wo÷7ÿ˜zÀf�ÀÓ”Êñ PܲTBÙ”BÓëäXóîW×SÕÿ’úžçendstream
+xÚÍY_s7÷§Ð=Uêdþç2yr'§N㸮úpÓöa-­¢�H»ŠV²ë¹¹ï^€à®VòÊIϾ™›Ìd)
ø
¤Å€Ã?1H
ãÊë�óš.Ì`º:ãƒO0÷þLDž¤aJº\?LÎ^¾³rà™·Ò&󎬔ñ4ƒÉì·á›ž_M.®G‰4|hÙ(1–_¾%Š§Ï›�—ïÆï½>9=œŒ?^ùúâÝÅõÅ囋Q"R#`½ŒN,x7þé‚Fï¯Ï?|8¿ý1ùñìbÒÚÒµWp…†|9ûí>˜�Ù?žq¦|jwðƒ3ὬδQÌh¥Êòì—³Ÿ[��Ù°´ÏF¥Ì¤Òõ8P«>Ϭ’*80›Í6#‘óºÛ•÷ÃñLt~¸]ä0Hù°¾¯·ùŠˆU¹¼'ê"«‰T”Ójµ^æÛÈ~~5¦‰z·^W›-QçÕ†¨ã«[ûin¸¨îòÛ|ƒ>Ž”vÏ›|‘ÝŽÄ°Ë€PÔô%”ž­"/(Ç
+Ô–@#Õ�bQBä!
´ AÌ%˜;Î%˜ü�~Wl‘�ˆuQ~j
õfÓ‘q6Ä9,˜b@ÏÊY«U�CIGáMtŸð:D4RH7é†L„,8YDJY5„’¾ÁM8³¦Å˜_ÒÔÁÉio,.is9Ì‘UqŸàD¤Rúâh•m§È »ÐŽnéË£ÉÈËaE±¼Ê>çÇÏÇÁHP$Fˆßpªcí)�êÉþ�	RVeþMñk‚œñ¼Q»#¤d)TÂÿ"Žpì
+96[Ö8*$ÈÉ‘;/£¨ŠÜ
´Ø7)BÒ�xŠF“fñ¾8òMâ�oúcßA¥^Ä>¶ÈJclôÔ^Ùòg'ã:VÞ²u�$

¯q"²|ߧ¶ª¡—dô… _Û-5[ZÏÀäQÍ�ˆóÄ~xª’ ¹O+ë OmÜu|yþöíƒK€v†AjhÞ
´ã à®
�+Mû/
I+1銤ÿÀý.e©€[S˺ÛËõ¸ Ðzí¢%¡>4NZ’Sn¨�L4 ˆvp«8H‘¦âª?h`ÒcCrô(!àš$åc�à™æV>
+- r×(«§žhÅ„ÐmàßVÅ,¹ÕÉn¶NP^_¤ž9©!ŒôÄ›gB{w 6ŠÔÌÙý¡PFßÚG·´ànÃgö6¸±~Å– ¶/·
�d„àÈ3sÁ�
‘—ùt
ZlžóÍ6+¢ü Nìœ'ûëÁ<ƒ&>–Ð,ZOÝ(}Ð%À:u·{°i‡ÁœŽ
Á÷4½Õ™hbs =Ã|¸È0ïœé®¡=NA�ï�ªÇ1®>ÔÂE[yR=yZ=çOégè×÷2¡ �‘Î}ÓË„
+)2G“4.ëj Rµ»a»¨ÁRæ#Åäâ�›
+o08úõíqFP'pÁR£ÕažLÞ\áŽntƒò
|Âk�Þ ’»ð€dš§¡p·é€QDÏÖëehœp®yž2„`iÔ	Ç{ YuB’¼¼CÆ�¼�Ä+̃«¾I¥øP‚}/ø�Å…dî+�[؃ÖÁCWj
:™ð´ÜÂ$6®/Éþñɉw͹}YN0kÅßA‘fÅ)N3á¤ù
+ŒH.æ/Ÿ	FDš°{óü0Ò•üŒo¤ u¿ä9\x�|ˆZ€�ªif·ÐÕsŒà< Ãã0
©B>ê^È3•6ÍÜy‹ù×°bO„VœÎŽî	?-hþÿÓnðNÚ¿ci\q*=Ä?çéW²«6´Ï˜ðåÜ?jìå>–P�¼Ó)%F^ôE¼/¦|QÀ
éBŸâ9ñ@yÙŸ<h^pp@oØMA
+”|K}°jþˆ¨±U
;4U´5`5êÂÇœùŒÿác`(_§’£s¾O‹˜ÿIn@X¥Ö˾?dñ¶9òŸÍöÑ®`P*ûÿ"¦¸…{5ܯà²
+²5µ;vmû¶†­£ü_�fñÈendstream
 endobj
-974 0 obj <<
+971 0 obj <<
 /Type /Page
-/Contents 975 0 R
-/Resources 973 0 R
+/Contents 972 0 R
+/Resources 970 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 947 0 R
 >> endobj
-976 0 obj <<
-/D [974 0 R /XYZ 85.0394 794.5015 null]
+973 0 obj <<
+/D [971 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 366 0 obj <<
-/D [974 0 R /XYZ 85.0394 532.5775 null]
+/D [971 0 R /XYZ 85.0394 522.1841 null]
 >> endobj
-977 0 obj <<
-/D [974 0 R /XYZ 85.0394 507.7956 null]
->> endobj
-370 0 obj <<
-/D [974 0 R /XYZ 85.0394 170.1477 null]
->> endobj
-737 0 obj <<
-/D [974 0 R /XYZ 85.0394 148.8279 null]
+974 0 obj <<
+/D [971 0 R /XYZ 85.0394 495.7928 null]
 >> endobj
-973 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R /F84 848 0 R /F86 980 0 R >>
-/XObject << /Im2 936 0 R >>
+970 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R /F84 797 0 R /F86 977 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-983 0 obj <<
-/Length 3570      
+980 0 obj <<
+/Length 3477      
 /Filter /FlateDecode
 >>
 stream
-xÚÝZÝoã6Ï_‘·:ÀšÇQ"·Ûl/Åuwo›âp×öA±åX¨-¹–½iÎP_–�wÀ
…L‘#r8󛥮%üÔµME굿Î|"¬Töz±½’×�0öí•bšy$š÷©¾¾¿úËûT_{áS�^߯zs9!�S×÷ËŸf©Ðâf�³w?¼¿ûöÇÏoo²dv÷ñÃÍ\[9{÷·[j}ûùí÷ß¿ý|3WΪٻ¿¾ýtû™†Ržãë»ßP�§¿3“~¾}ûùöûۛ_î¿»º½o÷Ò߯’7òÛÕO¿Èë%lû»+)Œwöú	¤PÞëëíUb�°‰1±gsõÃÕßÛ	{£áÕIù))´
Y�
-01=
:%¬÷ö:³^¤F› À¼Â=
-^9(Ü÷h7õC¾™Ô‚*iwòä´P™µCÈÁì¬xk!ga@¤-<dÇ
É
-Z>Þß½ÿ'µ·°ƒü1ì
žVõž‡uÎĨðFÉÙýš§Z«ü¸a‚²‰¯ðh±Ýž©ÉìBëgi%È;´Y0¡�ûþYJ½ÈŠÝ[@¯Ä‰Ç
»Q*½Î¤ZfÙADó>9ˆI©PVÛü÷ùaŸWͪê�Êm1/«1#ÊJaÝe>˜f‚�
Ü
-^žJFlÑ»ÁSIÂÖ
bˆGØSI‚Wx‹EÂ
-:»ÞÓÎ`ÛÒg­¢rÒ­AJpΩ$༷Ée§Ò§:ïTZª‘xqoc�¢œH_X�i&xmDš€G¬~‡êÑ>‚S»™Cõs©…c9X¸<ÃûhÑ4:I’
0hA*nÀz¤~èéÔ½­úa ¨ú@¹‹ãž t¦aWDïp|S�Œ÷üP,àyÒ¸FÆ€'Ùlê§bI#èñ?DMøØÀ )D#õ�(òBƒ«d8†Ù+Ö#3ËÒÄqOËšÖs¡ÂÈÙ¡„e×¼^Ü5ŽÃ®§ì¶ÏY=àÄ7GŽGœÇªæT¢ó5•ªõmAé5ªUR§Õ²û¹« Îää÷4•÷î.–€—±»KÐÝ�¯jÔ‰‡3U6²Ü¶8Óm:W8¨åMÌbBlCEãã±!
r­gB™DòÇ|`–dn$�3îÄx)Re_(ûô©Î»“–*H§Ÿ
-L}óáêáZ0õ†
{Ù
Âዢ߻ '¹¤W¢èil9µ'
öü'¯D†‰jkß»|ñ+óž7´b8ÍQí;Õd“Q)é”w­²ï
uæü¿«›¦|Ø0)d`5�ÓËHLâPçÔkQï„TíõGÉ«oë.;ÍfE°ãP/ùêG›ÙC8d süR]…s´šãnWïá@ʱ •€ «F1=Gnò„ã
÷UÅ5ây
-8Î4‡&‚o¼_„’sÐÿj¬.‚A“KŽÐŠ—ò4ç
-“Í‹5äaÙ÷Ô‚�5pms�W™ð*¯D’¥ö2
-ûTçQØR
Q#ZuZºÑN$‰Q—¹h©&Ø0£Ï]8ùàB_¿°]팋'Jv«×ᑾ•�ŒEìz`Êì
Þß³ÓbuppâpEWÈŸ—!ÿ„¿ø…‘�ØÙÖ¡
+xÚÝZKsã6¾ûWø¹*ÂâE8NOÖ©�';ã­Ôæq %Êb�D*"5Žóë·Ý HŠ’'»‡­Jé 
+ã]rý)”÷úz{e#kLlÙ\}¸úg7`ïkè:)?%…6 «S
ÚI
&^¤F›N€*ˆEJ9û©®
+ZãÃ�Rj¶Ï«fUì\(gzÃÉk ƒ�T"Ù™4�­ó†
+Ûb±Î«²Ùr½¬è·ÉÛÿ³Ù*_”7j¶)Û¼-¨é�ÀJ ê¸Õ¼ZR¡)Z*lÊmÙòך'i×Ü;ßÖ‡Š	ëw¨ó%ÍÒ®ó‡ËQJø$!`õæDi0ËXÄ	ð?L€…æ¥i‹-@È([l]Õ›Mý\VOÜk×–uÅ£å»Ýæ…G©éÿ�NðÝÌâ]Jd
+Ä�z%R—¹3h ¢yŸê<:*\t¾iêyU·åêe<·’‰ð6Ë.OÞQMÌÞÇŽÈžÌþMñ‹”º*p#µ›åø—Íž6õc¾¡¦MÙ´T
+	_ï~`âår£Ü¬hêŸ1‰›Uù¶ RSì?Š4o<õ¥ž\
ASTLpÿîáîí¿©¼…ò§"((€F{;„Îóº¨
+˜
&Ã2R5[1{kj]Ô»*$UÄ«ìp/geCŸ­ÅòK¨8ÇJ$qÅ%BŠj¤G½QŽk…
+Ê­XEì?˜ïžéþÃPtX±¾¨Ãÿp9·F
Ò‘?íål]lv\p†ÿ¢jQ¬Ú+–6~�•—SãÚC¯5“!/üí¹Ül¨ôÛ¡\|úºW(Zù©àA*êKÌ7íšyùÌêÝjjYyÅV­¯Êã2 �ЇˆAÓ\
+f”h	›:ÕaÛ4ó©üTTÜÄÿùÄŒ(¬MS&ìþé\ü‰O&jÐJn
Ÿ_â°É¬liF–LTÃê÷å² Êwj©©õ<èÑB!£WîœÈœôcn)…q0nâôP+~\ax3)“	•ßB =/üljÇ,P/¦!�€åéœN§“¸U=1,
+>I!‹¥àT ´Í«ê¹-«C[p3!	K�qžb¿-çªÌ
+|œÖÿ-¸ÒsØRGlýÿ g,¯�}Z=ªЊTç�T}hO­T*”òê2+Õ/l¥°Y‘ÚgæÝ¡epa4Â^£ÒÞa
+ª}S…õ
€„­U ÖŠJ1–"L…R·½½€G‘cÃ.}@y8
KÿµV6³"�qR}ªó�ê¨Î[«IHA°lý+¬tT¼Í•ÆÈ3GH!e¤Ø+©Žö
+ÊÁ^Áÿ„½‚ŽÁ^Ɉ-êì•$lÝ †øÛ+Ið
+½X$°Td`ņ
+³:�Ýæ‹5µ7‡XŠÌBñ@g(åôG[ÏMœÓŽR*ØF¡;·éf¤UÞÌ3;û‚G«Šö¹Þ¤Êc^-ŸËe»Sí‡'R ‡RuXLx"h븀rà„8"ÑÂ*0
¢µŠIZ ñ½!›Ñ˜
V4:O÷¼Æã‚D	QIºTTšp’…Ôc}jR±‰¥v并NEâU<£N¡~×,º;åÓ�W­Ô,¸D‰™„¶@O	;Á_‚ÎKNý ÉÑ8Ȉ+¢ˆÌ×.U<	Ê€ùØ´¨«¥ ì­s{F8%‡¨œ4kZž5*&±Bé×Nk}ªóF¥£‰·¤ôÜÀ¢('ÒWfgš‰ÉE‘b0=˜ý·GûNíf·Ç˜3ÈH8œƒ†Ë3¼�&M-ðÖ€ARŠæ£í‡–ãöcò3n?|Ûm°¹‹Ãž ö>æˆú°S’ŸØ¡0ž1î#cÀ’`¶;äáKÈFÂðšð6°iA¡ÉE#uKÈóB�seø
X¼�É’x§
+ñ$ º;Ô0»�'åXb®‹ÎÁe3ͱʼnߙ˜|ªƒ]lë‚+8.ß@©Œý
­ð"tŠŸVþÑþëBwï°Ð;mô¬ö>^cé(ËP
Ró>‚‡/žÜìûrAI‡¦^qÓ�7IÈYÖÏ<(ÞG÷®'ËÇnYÀ	…âé°e‘ÃÁŽ•ÍÜ$(GwoùY66éÛØñ�¤ðÞ¸?gDµÐ>ñ!°ãÄ	ƒéBrIQÝÚb{N;>ZÐÐ5oBŠ¨y4vpX<sâ²Vïý1Þø4iÁnJ¨È‘l‡W™S
‡Êð”½qô©Î‡ÕàÁÉÔ½€¯†<^œ½£š˜~x©iñ½P2œ?€Ðh{<?`¥‹¤µå˜ñ�9ÝÝ èá
‚¶Ýû
+K
™rpU…ƒ	X|y„G
+Zâü+ús$º >L4”úTž
 endobj
-982 0 obj <<
+979 0 obj <<
 /Type /Page
-/Contents 983 0 R
-/Resources 981 0 R
+/Contents 980 0 R
+/Resources 978 0 R
 /MediaBox [0 0 595.2756 841.8898]
 /Parent 947 0 R
 >> endobj
-984 0 obj <<
-/D [982 0 R /XYZ 56.6929 794.5015 null]
->> endobj
 981 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
+/D [979 0 R /XYZ 56.6929 794.5015 null]
+>> endobj
+370 0 obj <<
+/D [979 0 R /XYZ 56.6929 769.5949 null]
+>> endobj
+737 0 obj <<
+/D [979 0 R /XYZ 56.6929 752.2241 null]
+>> endobj
+978 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-987 0 obj <<
-/Length 3209      
+984 0 obj <<
+/Length 3050      
 /Filter /FlateDecode
 >>
 stream
-xÚ­Z[sÛ¶~÷¯Ð[å™�ÅàcÚ:9î´IŽã>œiû@K´Í‰Dª¢dÅùõÝÅ)A²;=ã—%°Xì~{!ù„ÁŸ8�3Y¨‰-T®דÙò‚M`îý4Y$ʆT?Ü^|ÿΈI‘F˜Éíý`-—3çøävþûôÇÿ¼ýt{us™	ͦ&¿Ì´aÓ®?üD#ýüøñûë÷¿Ý¼½´jz{ýñ
ß\½»º¹úðãÕeÆ�æð¼+œxàÝõ/WÔzóö×_ßÞ\þyûóÅÕm–áy9“x�¿.~ÿ“MæpìŸ/X.§';è°œ…˜,/”–¹VRÆ‘ÅÅç‹ÿöfý£)ùiérí„MPÉ�
-PV�~Ãj¯«“¿&ÐQ覧´ýa÷Bðß_/Å䧎4ž*®œ
—öçrjhŽèpP€ýZKfp�-Øôùþµ[ìðé¼¥Á¦ÝÐÀ®îiˆ4†¼Ý &Lƒñà$(à¨Ô¥°ZeÐ+¢+ß…U@Iç	ºÇv» g$zg§acEŽÊN
-�\Àîð°WjlDÅ‹„‹\hA¶\­Öí
-¸†0¡†C- ‚P‚¬
xäÅù-MD6±íe…�yµªš0¸]µ
Ù_¿U`›¢ì‡j³!@¶ÃÿÓt(½]8„»+gxˆ/ÔC!ú_ï~ �žxÝm¨³®î×^vþÚú[@ñòM�V€JÒÈÉÀ$þ�‘I+¢gûÈúßA@&Š'A×r)%?ã“Àx‘3 xÖ%*yÎ%¥b
-xBêOz¥@”
©^É™ÜX+Ǽ W–
½v÷^	{C¯$,§œÁÆp
@#z%l§½s9ç}\ZÜ;Œ‚”{&ÏxÚ3
PZfž‰¬B
"C‚¥ÆÆ|&F8d4‚yÄ|É3ŘEY
zî^l†T§µ¨§:F óÁ
^=#ç™é©ÜŒ©
-Ç÷*“{•êhº

-àëXC2°ùÔXš6qé�¬qu©…ó­Á=…p·Áñ`GÍÒ;r&s+Š˜F=W]j/qŒŠ40Í(õÕÃbˆ‹IÒréÑ]½¨7Ï@ÊO+¡8˜”p@uF	#ÉkSß?ŸR;Ö‚yÿÙí{ªöç�\Apzž�ìFæR›˜	Í+PÉeÝ ÒaEc÷XÏ0Î`z
-Éh¹ ÑQSå|Nz×uo0§wä ‘´]azZ.Ðscÿ·Ÿ>Ñ3«v½	Ä»z¾«‚oFMв8
-)pUCþ;ï×¥±Óo¯ßý�F—ÀGùPu`&ÆÈP•Á‰
Ÿ�r‹>ÚO­VU¹¦6&Û¸&EV¸Í¢|ŠÍjý„&jÕô»Tb)M
™e�.K€ûuJ�±’%¤8¨ 
-VâTÁª¹ÒœŸ/4y5c
-’ß‘š½¢rõª
-Øÿ»r%µÌ{©r5¤:
Ï=ÕÑ]¤âK0
�Š³ôT	F¾Ë€£tÜ�yø¥þR%˹uîµ:Ð/$צ‚�0·E]í]¯ÿ
hàÛ1c´ÖlÆ´X™
-Kí!
66pÃ!¯Âº†´„
-PSÉ¡ØS[ϳ'•mç«ýG
-W!•–²/§ƒ_ˆï­áQ¶aYóŠe£~ûÈʯàF
-Šìi ½§�š
-$è¦Â�¡!:84hG?»y,ÃäqÌg±81
# ›ò�Âùz'üBÆþ®gǺú¡!
->ÎV`6r
-&”avt
-š\?„—7ƒð²§Oð8R�£uqÿÏÕl/x“ó£‚3 ¶àªqsâöT/ðp¼ò�¥Óç˜e�I­õ
-ìPqÅqÂu‡ß¯t[�ìØì—8ζ	ŒÇ·Õ\0±ëâl´üSŸ€6@¨ýÂ{¢3"ïªÚu•‚9“ö_œÙ¶':Þwä…ÁÏ‘Æ÷ŸìAáY‰¸FARLu‡/þçÛå*@äí	ç£D=˜h;ŽobÌ‹ŽA�½©>ÌO}¯%uŽY%$ÃúW®ÿú[®ý‡nàW¥s'òaÉ
+xÚµ]sÛ6òÝ¿BoGÏ„,¾?ÓÄé¹Ó&¹Ôy¸iú@K”͉$ª"eŸûëoФDËî$Ϙ`
,û
ñƒ?>sº`Ò«™õªÐŒëÙ|}Æf70öÓ�8yBʇX?^�ýðΈ™/¼fvµ¬å
+æŸ]-~ÏÞüûõÇ«‹Oç¹Ð,3Åy®
Ë~¼|ÿ–z<}Þ|xÿîò§ÏŸ^Ÿ[•]]~xOÝŸ.Þ]|ºxÿæâ<çNs˜/â
+OLxwùËA?}zý믯?�ÿqõóÙÅU–áy9“x�?Ï~ÿƒÍpìŸÏX!½Ó³{h°‚{/fë3¥e¡•”©guöÛÙú£aêÿ´t…vÂN0PÉ
9X™™Õ¾0RÈÀÀýö<—œgÝm…€ÈæÍæ®Ú�s—ÝT›yE£Í’ÛUy»þj6Uû
+`a³ë}G�uGxåªm¨g]>PW½™‡U«²­F[òlÕ”Bj6ÔДuÓEÔM¹Ž#mµC:á~
+¼8ëPXØ,ç¼ðZ‹pÊnWnÚeµkó-�-ß´qÖ�CVZÃõ±0‰Hw"»Æ-�ÌØpW/Õ†ú›ø-i8-)£©e[·| ´}[on¨�yL»P¾ÐÒÈHFOûÁJFù„¹½Ýs‘¶%í6½E.�+¬Òc.EÂ�·‘ ›Æè¸MÛ•]µ®6]q$þ¬`4Ó2«z?­î)b‘´Nª{Âò‚øÜìwóê�®Eá…z†ˆë*¸¶…gúedJpÍ:¹¶¨ºj·®AiÀ‚H–ÝßÖó[Wͼ\!ȳr± ‘oZ½Z„R¾Í~³ 쮡®Ë�wŠ «7	
+®Ï&j›ÝÄ:°«3:ø3¹³ÞD¤kpX_‰¶!�

+YÔI2uÙJÐ"ÀŒ‚Eqåë¸
+ÅèG´·Í~@ЈõÎLÕøHÚI¢‘
+Ø&©F Iö˜%\Bëde!ÂÜ5[ â„…�³¤n
+B¦á&Ç~)"M�2òKÎÆZ9¦ý’°lè—°ùè—°5ʤ-§¬Á¦€

+—¬„ó#‘rn(R0ø(R-
7q
+<ÆióYHmøDýk±ˆ%™NõSì…á04*BVïÈC#ê°@ˆíPÄ9±.ˆÈTÃÑë*:g”-ýTUr¸ømƒc—Æfï?\]¾û/õ®�Žò&T
++„wÆÙïšÂrþ˜TöHa‡KŸHa¹7cŒ\ÎoͪŒI[°³>….8�ä
+¬’�k¹Á«„zív»Š¯Ž,>ز¸$Á)¾H¹Í¦ãb%7.õp`82a¨¹á…ÐX” AŠ$"Ã!ý
+B<0Bö>z:SäžX—5/X¶÷^˜†Þy®§4˜:§ï_×%<ôúž�ÐE€v£Ým—ˆÏ«>ÖÇ°+’ g˜.ØÉ÷xžàËßuC_[ßlƒ�S{MÀ%.ÝK@ž‚ùÃØ©¢œ�‡ó¶q
’ˆ;G¿¶‰äÐûw³¦�ùmÓÄ÷�
©5±|êQRø+¦	¥c½3úæK=þ’LÙ쑘Ö^‰Eám"
+ù®ü!åý¯ªŽIÿ?u¯‘uendstream
 endobj
-986 0 obj <<
+983 0 obj <<
 /Type /Page
-/Contents 987 0 R
-/Resources 985 0 R
+/Contents 984 0 R
+/Resources 982 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
-/Annots [ 991 0 R ]
->> endobj
-991 0 obj <<
-/Type /Annot
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [389.4645 148.047 438.2112 160.1067]
-/Subtype /Link
-/A << /S /GoTo /D (configuration_file_elements) >>
+/Parent 987 0 R
 >> endobj
-988 0 obj <<
-/D [986 0 R /XYZ 85.0394 794.5015 null]
+985 0 obj <<
+/D [983 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 374 0 obj <<
-/D [986 0 R /XYZ 85.0394 332.07 null]
+/D [983 0 R /XYZ 85.0394 119.499 null]
 >> endobj
-989 0 obj <<
-/D [986 0 R /XYZ 85.0394 307.6688 null]
->> endobj
-378 0 obj <<
-/D [986 0 R /XYZ 85.0394 231.2958 null]
->> endobj
-990 0 obj <<
-/D [986 0 R /XYZ 85.0394 204.4238 null]
+986 0 obj <<
+/D [983 0 R /XYZ 85.0394 95.9037 null]
 >> endobj
-985 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F84 848 0 R /F86 980 0 R /F57 624 0 R >>
-/XObject << /Im2 936 0 R >>
+982 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F84 797 0 R /F86 977 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-995 0 obj <<
-/Length 3216      
+990 0 obj <<
+/Length 3131      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥]sã¶ñÝ¿Bo•g" œ>].¾Ô™ä’úÔö!ÉDQ{©ˆ”}ê¯ï.vÁ‰’{Óñx¸
-ùóî·?Äl
lÿx'•={…†dš†³Ý]¤U #¥|Oy÷éîïÝ‚ƒQ7uêü"mFñl¡¢ÀÀþÓ§,ƒDJ@JtÄ*TÝ)G“§ì±ð”׶µMñŸüœÝTI¬’ÙpÉ‹�=ÒÄÆj°1H5‰´o¼Üæpâ©œïì—bwÜQÃîêcÕ\oð+‰ŒšïêÉàÖÏoòÃK~ðkñè±ÉAð‘
-û}ÖùÆK^»h�áo?èd@§RÀOšh`Î
Opˆ#†"˜HIÆs)Ø,2Kà 1 é)ƒTëС;^ô|k÷ÒÌ×Ô*‹]ÑXWôíùŠŒk`Í>;æ"=ÜPÆp’žÛ¶Íwû{8ª†±j(Ë:³-O®]ðÞù—,oxVÝíÁ|‰1?ŽôoîJ$žŽØoQ3ñüµ(K‚6¶(¶™¿n‹lK½,¸˜)ˆçíñÀP™Û^µ[¾g3ž+»*=BMß}~ØÔ‡5¾ÿø©ŸUdpv#.¤WG'�æ¹/ÒÊç¸^¨8œ×{baßw !æå‰Ú v›c‰°š[ƱôyµŒƒç‰_wnEõL-ÇšCg¢zñkÚ`¢=ˆ³'DÃǸ	U:_QÉÚ}ãyf+p±œ@Ú
!wœ€}°Eÿ†#¶D>b4§”�†Ø^
rŽÅ�{ýÆE·–!g/
-õ²fü�uj‚ôœhŒ�0@�‰Qß'Ø<ÕG@)hYƒúªå(‡¿/v9å�¾ÎÇ@§SnèëŒ
-¥MÄ«‘Ž7
-‹
-dj×ÁE$äpë$ˆô[1iˆu=&uXHÅïB„eÞœï›hH! zÜÜ×#Mì;dÛˆ 2*ïK¡B%ƒ��ê¸[9_°Søz
-]£õÓ:¯ä–p
-lÀÏ¿ð0˜LEPVW 5rUÎCJ9w*®{"úx�éx•¨ ÂøKÂ;VNÛóõ„˜5F6£ºˆuM¤a™¼%Ò
Ö
‘z,ç‰Z›}žÌ3’ †˜y{g�4±ó�I) –B�·¦}î¥
-�Î	
-_G$ãz Ëǽ|Ýb<J™†’¢ß¨—ZÑt¦!#´ùêLãÒ,"p:ŽµËÓä³gC¦
-I±bþi@ûSÞÔÇCÆÔþ„J3åÀˆ:H´$l*L盂û+E®Ðô>Çš¼% ¤U	£¢¾Ö¯àüè_x"ÐqÈÁã‚­4Ç��½nË{pð¥MòŠ#wæâ#U›*ˆ('jƒ7Ÿ“҅жõ0ìW�)Â0øáLü®•Á%§ Ä›F5ĺnT–'Å—�ãzQÖÏ‹)“�ÔF*Šn“ÑaMÐ121e‚H‚⎡ÔW¥ªO’RN’°oÕÔeÞæ…œ5Ž\ê1¶Y–ï['4lUk~®8ã¯è*‡8†:²z·q¬Š²h;_š€ï]rZ„÷P#Ïq¦õÒ¤””‡Aûß`/ IWö	Œîü0'ŸE-ëØCiY¥6Ç*ãÜØÅYúöWTsU—"#ƒ(Õém]b]×¥ë—çj$ôx¤	ΕH@ðSð)wþ‚�¥Oç¯U—Jb7é

-]8Õ!ñ”•¤+.v‡‚ÚŸ‹²^�Ú¼AsUÚÏKæ/¶<ú%6Ô5]‘sF_T,®W%’ª0U%h+wï½è^�]hÜسâö:Ïè\-•Ê�)>Š0†{Q¬ÎŒÝHãu¬Ý²>²G^)µ¼fíp‹”1oXû
-:¬	ÆY©¦êˆvXX€DB&jàZˆ�aßn�C1=n¯?èÜ\
-€]Q±Ë£â:Ï}ÜŒZ
-WŠC•—7Çý¾>¸r'³>C
ÅÅs°‹ix9æëwë21l…a„~‹½Òú„4į’
-á®·öï�.	Pg7&‰ïC
-œÙEŠÞãñÙù@M’
B}iÛzàÔÖC|ÅðOˆvá�µw¸‘¿½Dîá;ÛúÕ!†Ÿ¦ÊÀ�A"äëÀÝÁù‡ÖÈä¬^08ÔóÚ\Š¿ò	'8—#§6	WžT2È[±ál¾± ï•9}j
+L
¯mO®Gº²(Ü}ÃñºT'ä_®­#ô×ùœójgŒðßзª»ëù@íý¹�_âëî�ø”\û©8xü}Ô„þÁ?úÿý3¬þ7jQ€³»ò¶&_Œ•'
-䲶¬¥
+xÚ­ZÝsÛ¸÷_¡·£g"”ø NŸr¹$ÍÍ]rµÝéÃõ(Š¶ÙH¤N¤â¸}w±~H”|¹v2-�åîXüöƒ–‹þÉEb…ÍT¶H3#’X&‹b{/`îý•dže`ZŽ¹¾¿»úË;«™È¬²‹»û‘,'bçäânýkd…× !ŽÞ|úøîÃûܼ¾NMt÷áÓÇë¥Jâè݇ŸÞõþæõÏ?¿¾¹^J—ÈèÍß^ÿr÷ö†¦,ËøþÃÇh$£Ÿ3BoÞ¾{{óö㛷׿Ýýxõö®_Ëx½2Ö¸�߯~ý-^¬aÙ?^ÅBg.Y<ÁC,d–©ÅöÊ$Z$Fë0²¹º½ú{/p4ë_�Ý?¥a¯N7Ðè¹
L2aµÒ~÷y½n¶¸,µÍa-]T”ø,£]³ïh&§Ÿa {Ì;bªZYmšâs¹æ‡gš|F‰~ä_q¬¼ðò)ßl`¿µL¢÷ñ¿Ê=¿øTÖ¬©90ñTu�4ÙŠÇÉ‹SÃÉÎWx6°AK)E–$ʯ¶{,éóº}*÷D?5‡ÍšÈºéˆx(™ •ÄÛӅië#®:ß2Õ–û/3šó/ÌÐ5ôÛ¯ä=äU-p
p„ã;
+gM¬Ëûü°éfÕFdÎ>°£=ÒÏ›Fc9SO9³Uµwº¥6
+¤Ç}øÖeFO(OF�†Ë�,¤“— ué
+Vp´ÏDžÄm´MPdùÔ7‹VÎ.)ß´\4
�ÂJ"IR~;�{ŸW-OþILOF1݆û
+Cì8ŵ}Šk)aÒÛ4Ì¿¥íy¦9¾„>¤[ô÷|nÀCÅVµèOàZÞr	zqÈ;Œõs¥	cý%ˆ]X?Œ®ž�^�n¨L‘w`™I�3#R�¤
+)¯–!
Å&ÀLáæDfL¨
÷eqØ·Õ—rɘã´p2ÑSG(6UYÏÖçªÀÄ…¢sÈß0°Q
y6&�Bºh“Ë1iÌu>&õ\h6D6e{¬7…¼?†�~Qo`šÑ;^¶‹…qÚNõrV›ŽÂ4ªÛ%™)¹üýC^ÒÑ”

ªMnËàË;_›
U45œAGÝ
xH)#ïâÉ`įàa>^¥ZŒ¿ñ‹År‚‘Íé—Ò[a²²ŒÓ…e&C]^|žM2Ra!`^TxNÕê£n†•Pì�õÎç}ýõe~ÞBæ
Hp®†¦“¥,úÛC­!Š÷gÃ㞉
(H,8ï\OÆÜûÙþç›vZeãbOc—.€Îùb‰P»yŽšÆº á¨í‡C}
hh Á\’roº^JÎ:úž*)ë¾²¦éªîÊ}
¡ä™ž
Æ/unLJ1í1Р︗ÒLû¡õÎÞ&‰¯R©º|�Æ\çïSÏâHõõÞ¯z¹i–s—û‰FsÙŒžkÆŽÉÓN	~;1„r^�é!;Ê8;±UÛlÊ®ü+6A�Ï9ÆÓyQ”;_¦ú§zÍÓ5§`<ã;
+«q´þ7\ð¤³ñÚ	—ô
+Pl8=PPt·åi7Ò8!¡6Ÿ¬æR/ð¿°°S¹“6Zd–OyZ(“$—w·çzÁŠSi”M�{\/GÿôÝa´†ùÌR"©¤°&ÉŽŠ×÷Ù0‹EGOCþ„ÿ €2|þŒpv˜(;Í
4ô1wüZ³Y—mǃû¼nó"d¡0â/ɘ½·¸®jÅÓù¡k¶
+…Çÿ™j�°eÛ|éÛßß¾eœ"fÿ¿”Kf™Hcë._ì1×ù‹Ýs¡ÆǦí–�ØtU»Ñ.áV�Üm‹4þ‹Fô\3VLn·IDš895ãCM-9@m÷Š2ÝÁ]ZbáòÞŒ[BzÈ¿a‚zƯ�(^ $UA#�Qï«^dC¿Þ;@Øgˆ8¾w¢¢�MGžn�€À–L½¤ÂÏt[�Ú¨§`��?S8£Ì�ÌuáL×´ÚUtS´†æ
 endobj
-994 0 obj <<
+989 0 obj <<
 /Type /Page
-/Contents 995 0 R
-/Resources 993 0 R
+/Contents 990 0 R
+/Resources 988 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
-/Annots [ 998 0 R ]
+/Parent 987 0 R
+/Annots [ 993 0 R 995 0 R ]
 >> endobj
-998 0 obj <<
+993 0 obj <<
+/Type /Annot
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [361.118 643.0167 409.8647 655.0763]
+/Subtype /Link
+/A << /S /GoTo /D (configuration_file_elements) >>
+>> endobj
+995 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [329.7108 477.6902 386.7943 489.7498]
+/Rect [347.1258 251.1389 404.2417 263.1986]
 /Subtype /Link
 /A << /S /GoTo /D (journal) >>
 >> endobj
-996 0 obj <<
-/D [994 0 R /XYZ 56.6929 794.5015 null]
+991 0 obj <<
+/D [989 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-382 0 obj <<
-/D [994 0 R /XYZ 56.6929 607.7231 null]
+378 0 obj <<
+/D [989 0 R /XYZ 56.6929 726.3067 null]
 >> endobj
-997 0 obj <<
-/D [994 0 R /XYZ 56.6929 584.5979 null]
+992 0 obj <<
+/D [989 0 R /XYZ 56.6929 699.4102 null]
 >> endobj
-386 0 obj <<
-/D [994 0 R /XYZ 56.6929 145.2693 null]
+382 0 obj <<
+/D [989 0 R /XYZ 56.6929 385.1287 null]
 >> endobj
-999 0 obj <<
-/D [994 0 R /XYZ 56.6929 119.4941 null]
+994 0 obj <<
+/D [989 0 R /XYZ 56.6929 360.7028 null]
 >> endobj
-993 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
+988 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1002 0 obj <<
-/Length 2505      
+998 0 obj <<
+/Length 3097      
 /Filter /FlateDecode
 >>
 stream
-xÚ­Y_sÛ8ϧð½)3•Ê¿’8}ÊvÓ^vnÓ»\îiw›Ž5•¥ÔRšfwî»@�2eËioÚé¤"AÈ@€æÿø¢Ô“F-
-£2͸^,·glqcïϸçISsýt{öú].&3¹È·ëHV™±²ä‹ÛÕoÉÛ¿_üóöòæ<š%yvžêœ%?]]ÿLCŸ·®ß]½ÿÏÍÅy¡’Û«×D¾¹|wysyýöò<å¥æ0_x	'&¼»úÇ%µÞß\üúëÅÍù·¿œ]ÞŽ¶Äör&Ñ�Og¿ýÁ+0û—3–ISêÅtXÆ�‹í™Ò2ÓJÊ@iÎþ}ö¯Q`4ê¦ÎíŸÒe¦…Ê©V™Ê>¿Ë,cv--´¤Rã.«Ù]\¸Ë[í†;[
iÝv÷¹j
çyžÉR–‹Xú‘#׌2R‚<“¹æS-n7ö<U¬LzPÁî°]$OuÓõÁîÖÝnKä?»Ö3o+Ô¹­Ú¥¥¡¡ê?ö4üD«‚œ×m[í>Ú‘«
>Ø*)‹L©€m¨Þª®šÇÏ[“OVèÒÀðÌh-ÿÓƶÖÙ!‹26u�-“Œ[ìèöËC½;çÐè
›¹Ñ´
8´²ë걨fçŒúÛº}Æ97¶ê»¶ºküTÿh{jW$ž¦ƒ
¤NG_NäUõŒ†�¥Þò¾ß¸«R°¤(tXˆ–•eAªº¡êK½}Üb'§Å‰ŽZ#I”Ô‡u<E+&Å	Ùyrµ&ÆÞÄ‚*#�½‚o)’¶#:A
Gb(L¬¡qh@ç6¶·ÔôxÀ&!
[Ýrù¸ÃÈ�ù¿w²¼YεyÙc®Óž8r¡Žëji_ðD	ìêeÓŒ
-?Ì!²-§:Щj3ú¡È÷»ÔeÕRkŒ­žºÝGâM ±¦îj¡3<Ïø™�b É½ŸÍoÁ�æ%ϸž¹÷)K§>ž>
-qÜhÈïDX',>Žq,—ú(È©Rú$�í“ŠxlQþä
�3Œ�œ…
- ‚ë,ªXh©¡” ›÷:B�ÎwŒp9J¡<
->@¾Ç“[ø_$—G;2¥€kQ–™B¹[ñi
8R6ÊqEmgì~áõÕV,~îÀ¤ElU�œÆ¢�Y¥Šq80%C
ÐÅŒ÷¬Î¥peò|.Xb}§Þ>4vk
ÿ+Ohé‹å�9:veŠ,—¹\Äû}g)l–(ãÒ}õõ}Hš?¸£|9*™CE—»]Âê”çpÛ3¸Ko]8î:ðƒç™ð
-€ï|áN6²F§9}ãUg
¢ÞïŽA½ÇÏÐvŸ¦ƒü
-·çMÔûû	"ç~Oá
-öLˆoûA’c´z±–üÿ­åpÆA&±ÿáŠec§J9¨ˆ
-^B*#LÆÿ!¥ÈTX>•
-–)~\!䦑à™2
-V`¶$ð¡„�
-��,:f
-žñÖjYfº{¶Hùÿ
#v`endstream
+xÚ­]sã6î=¿Â÷tÎÌZËO‰š}J·Ù^:mº—ËÝ=ôú Ør¢YYòZr²i§ÿý
+ÈPI%Y…B^Ê9ÈI=/:´UÍtù—ež¯òì§b~SÑxF�Wæï¨ûR´Omö% Ûb[ò2ÏEþÒà^¨d¸6/,çÙv[yØn³]Ö¢2$l'~>ÖŽŸ††óö–-A¸ðeªæ €I,'àWù:Û—-u@màûöƒMFÖmÀ‘MËá*ûÊ‹›¯ˆtäà/ê4S¢=ʬ;«Šê‘V �Gèè|™…CÅΖÎò–òýµïÖ›À‰ÉHmoÓJ€Q§z|èuå÷"à‹÷„`r±#ðþþ‡† Þ¨¢£ É‘(v2rÊ��V¢ÓÁ*¡„ír»(‹¦Í«Åç}¾ŸˆVi$‘ž]¾#:^«bóBÔP
+–Z×]„‘‡¼›·ÍšWGØÇ
hi×à,TšÌÿ…Ñ +÷>ØÀ`™7�RAš¢øìdaŠ2¯Úé »ËŠ%…‡¡í/”‰Rã­¯#£9ÂFÆ‘”�Òˆ­ó]Q¯Š%»ç¥DÉ›OÔ½©à¤ŸáüNy¨Mld\bλè�ê´�vT>º–Ç‹p䥱‚T¢ßY:ª	Æ~šÀh�…ðÎgtìo¸YÐê±K'„_„õ³'´ƒ ¶45×%“Ec$í.’´am¾g<w¸Ã_'NZ«4FJ¾	º½#—Ö.Ž¬ƒed7Ã}=Ø�bjj™„˜=§6‰àx”ˆA<J8ò@jOÌéS3è<£7Œ§+Ǽ³W�‘m¬0B«1_Àʈ•cYGºaàCómò–/ šZñ†ÚŠûÛ‘ñ‡}ãë‹Ü z¹„ãƒüïäEe•ŒlªÿÈ
TgÜ P¡&Oy¶kò¬=ãq¤�vçeè¨&„ùA"#[9–‚ü@ô¹°!#vã†Ð¿Öo2”¹Ê*oõ0ÔB\ihÌÇYÄe�	Îk·ÉvŸ¼ÿ
+.c¯ç"e\HhXÁºš¼1í¸Ö	Zg¾©¦­·ÑJ]FQs9<Ô›¢^ÆyÊSöÌáï‘b'®ðW
+,Ñ%°_ý’þÏ6&‰ ¥RÓ•šqäTš¡Pr+%·ÚEÖ©dBôÿàŠþêendstream
 endobj
-1001 0 obj <<
+997 0 obj <<
 /Type /Page
-/Contents 1002 0 R
-/Resources 1000 0 R
+/Contents 998 0 R
+/Resources 996 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
+/Parent 987 0 R
 >> endobj
-1003 0 obj <<
-/D [1001 0 R /XYZ 85.0394 794.5015 null]
+999 0 obj <<
+/D [997 0 R /XYZ 85.0394 794.5015 null]
+>> endobj
+386 0 obj <<
+/D [997 0 R /XYZ 85.0394 630.3935 null]
+>> endobj
+1000 0 obj <<
+/D [997 0 R /XYZ 85.0394 605.2917 null]
 >> endobj
 390 0 obj <<
-/D [1001 0 R /XYZ 85.0394 452.263 null]
+/D [997 0 R /XYZ 85.0394 242.2106 null]
 >> endobj
-1004 0 obj <<
-/D [1001 0 R /XYZ 85.0394 426.0265 null]
+1001 0 obj <<
+/D [997 0 R /XYZ 85.0394 218.2795 null]
 >> endobj
-1000 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F84 848 0 R /F57 624 0 R /F86 980 0 R >>
-/XObject << /Im2 936 0 R >>
+996 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F84 797 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1007 0 obj <<
-/Length 3047      
+1004 0 obj <<
+/Length 3112      
 /Filter /FlateDecode
 >>
 stream
-xÚµ]sã6î=¿Âo§Ì¬µü%jú´ÝfÛtÚ´ÍææÚ>(¶œhjK©%ov§sÿý
-N“û»
×Á‹èñ—áz!Çt‘�÷媫šš˜ñï#9âÉš8JŽx:z›=ÖSœQcñ£©<e-†VÛª—”WØ-iÎ6kÆkï›Ãvâû}Qßwè
-ŒX�…\îŠnu?åQƒMMlb¿�=Å'xÔp�I¦Ó1“'nRf±Nµôò®×t9U
N”�RÇVut‡`ijÙ5Þ`¯}(WjóÊùx2¹Î’h;Ö`0ªø¤RyÂÑ¢$yÆLuÍC³mî>ÍpŸè\Êœ—Úëƽ²T9�<ö¸‚E:¤àêEfžô¸Œ¿ÌyÜ)ݱÇƼÇUÇz­àæ º
·˜ñ¸Œõ'GÔ�«“$º(@m隶p¹[ÚDšÕgoL& G¹4Ï2R'qwh=ý®-·ÒšD
-�;�@ ž%B?•H€�ƒ|ca´ŠÁ~›/�H0ÅeHr.‘б̀L�ö™LÂÅD™/ÇdOñ	&Ñ)H-õ˜ÉÓ™„I”e�c¸èniΊXH¥ŸÞH¦á=Ö²¥_�v8»‘‰!û¬1ƲɬéÀ�“�'„žEÛVwµËöS2²Ð¬á”Õap°^á/�Œl8R«©e9}Ç0EqÑiWÕÕî°›Û³bÂøêýîÍiËaÄÈÌy•±9¢t‰·f-?7
-®£î”(Œ¤9w\m2¯“
-ß"~š|ýšf.ßá7\Á–»Ç%ÐI| �œ¦
¬·_!¥4 }óÝÅA›jï™ÝT „RÞx†Ò“ð }ãé;ž—�ãÈÄÜõ0£¡ö~5ÒÃÐ�[*e±ËóYÊžË\ÍIØxµ-Б#øv²~NØòs;¥vVÞ‡–/3–¯XÚ{P“¾~Ryþy¹©ÊM=[nê¹rSS¹É¿-7ù�ÉM¿PnúÙrÓÏ•›~Jnê%rS/“Ûdƒäx3Þ �‹åw„dr$Ãg~Ø“¯ «Vt½Ušó€žßYIÐäÌOCÆŸÕ POC#ˆ]Ž›©Ã¿‡
-:aœJ\Ì\—ÿ‰€ÕýÝ[Åß®é@ÐLT
+xÚµ]sÛ6òÝ¿BoGÏD¾	NžÒÄIÝi�ÖñÍ=´} %ÊæD"‘Šãéô¿ß. @Š²sçt2Àb±X,ö‹â3ÿøL›Ôä"Ÿe¹J5ãz¶Øœ°Ù
̽?ág�æ1ÖW'/ß1ËÓÜ3»ZE´lʬ峫åï‰IEz
+XòæÃÅ»ó÷ÿ¾|}š©äêüÃÅé\h–¼;ÿùŒ ÷—¯ùåõåéœ[Í“7?¾þõêì’¦Œ§ñÃùÅ[É©9BôòìÝÙåÙÅ›³Ó?¯~:9»êÏŸ—3‰ù|òûŸl¶„cÿtÂR™[=»‡Kyž‹ÙæDi™j%eYŸ|<ù­'ͺ¥“òã,du(@%§¨óÔH!�
+8uÆS#HÓ§iÑ:´<VIí­�¶ðÔ$ F�§¿†ÕÌÀ…gÜÌŒ‚1Éèõ\�(Ý3Ó0ƒˆðµÀ¹Ãø
+d'!”þBC”€/¦´œ|„Î0ÐAÀÛÒÜÂ=#
+1S’Ùø7ÅaXk�D=ÅyLò0ÄÖ¦­XÀB.7E™ÈˆG	FUYe¿�=Å'x”p�*“fÈä‘›äY*�äAÞ˜ïáåTFn½Uêü…UÝ!˜ššF6M0ØkïÊE…ê¼pNžl®…³(i‡*Vß”áG<-*
ø‰ÉðxÀ½’)ø”)7´—�{f�) Fº\Ñ¢BqiŠéu¹/˜r¹cºC—Œ—+õZÀÍÁ…Å[L¸\�õ'Ô"—+!]>+\�×ÐÜ°†Ë]“ÐFÒ¬½1!·ÌûDåqÓÁ¥
+ˆ›]èwm¹^‘Ö@„ŸJ¦ÌЋ¡-—™páäŽIùõn]-ªn‚£R¨�[ù‚¶�¨àvšqñìÚSœÇ$_(×�ßf:Ûï|ÔŒ€Á†#¸ïÆd ø“9K­°rÈä13b!Cî†ð®šº¤Ëºû†€’’Uô™&Óþ!"�-*E„f4óEœs‰×~%é…HÎ%-âZ@®FáÞÞ[ƒ•¸e:Çe®õVùø:Byýæg(ÓAÈ�ÚÈÆ˶£²ÓØq¬cè'›„<ØX`î'Õð
+Ï"ßéºt

+(ÃûpD�oÕã¡Ô$Ègâ"öÒÒùXZzðŒ÷¹Ž—FÖ5�xÆò~wåwyÒŠ3HÓA„6Ä„ûÌÌ3÷ÂœúÙÂè-£A¬{ƒXmýGýjX¿fƒŒµÕXb£/ü£X{ÿ1‘¾í#Sô#
 endobj
-1006 0 obj <<
+1003 0 obj <<
 /Type /Page
-/Contents 1007 0 R
-/Resources 1005 0 R
+/Contents 1004 0 R
+/Resources 1002 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
-/Annots [ 1010 0 R 1011 0 R ]
+/Parent 987 0 R
+/Annots [ 1007 0 R 1008 0 R ]
 >> endobj
-1010 0 obj <<
+1007 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [213.6732 702.2957 286.8984 714.3554]
+/Rect [213.6732 493.8452 286.8984 505.9049]
 /Subtype /Link
 /A << /S /GoTo /D (rrset_ordering) >>
 >> endobj
-1011 0 obj <<
+1008 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [209.702 621.4019 283.4678 633.4615]
+/Rect [209.702 415.6507 283.4678 427.7103]
 /Subtype /Link
 /A << /S /GoTo /D (topology) >>
 >> endobj
-1008 0 obj <<
-/D [1006 0 R /XYZ 56.6929 794.5015 null]
+1005 0 obj <<
+/D [1003 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 394 0 obj <<
-/D [1006 0 R /XYZ 56.6929 769.5949 null]
+/D [1003 0 R /XYZ 56.6929 561.8344 null]
 >> endobj
-1009 0 obj <<
-/D [1006 0 R /XYZ 56.6929 750.9506 null]
+1006 0 obj <<
+/D [1003 0 R /XYZ 56.6929 539.8007 null]
 >> endobj
-1005 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
+1002 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F57 624 0 R /F84 797 0 R /F86 977 0 R /F42 597 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1014 0 obj <<
-/Length 2676      
+1011 0 obj <<
+/Length 2384      
 /Filter /FlateDecode
 >>
 stream
-xÚÅZmoÇþ®_AøY„›}I>)¶ì*häVfQIPœÉ“tÈñŽá-«Eÿ{gwv�wä‘’›…
ßr_fgfgfŸ™›PøÇ&V*œœ'‰¢LM–ë:¹‡±w,Ι§Ióþ¬ï_¿Õ|âˆÓ\Ow=Z–PkÙd±úqúú�—^\ÝÎæ\Ñ©&³¹ÒtúÝõÍìqøyýþæíõ»¿Þ^ÎŒœ.®ßß`÷íÕÛ«Û«›×W³9³ŠÁz)œXðöúOWØzw{ù×·³Ÿß_\-:Yúò2*¼ ¿^üø3�¬@ìï/(ΪÉ#ü „9Ç'ë©QRˆÔS^|¸øKG°7–ŽéO	K”åfD�rT�Ê-¸
-ô23M˜P
-:¹mòe|¿]åÛ¢º÷B)Ñ#E's.‰“L"{È+X£Õt½+ÛbSæþ—žngÌNóe¾«§dØÛŸÑî¶U¾Âá¢Â‘,R̪æ1ßƱÇÖÙv|ŒdvM~·+±¯­ñ»¬«Ÿ(å÷»þ~íCŽ£‘'¤¬§õ]\üp‚uÐ�—š1â”âAêM™-×R
-ͦ®šÌJP;]À*³.L0•¶@ß“ÝnáæµWþˆæ%Êpç6mÖæë¼jqËM¾]mƒŒìåÏÚ¢®pF�¾—�üA‡uGSÆT
ÈåÎ$• ;†ÃÓÉðÓ³ø5¤ÓïÛ+‰Ñé‡<ÎÏʦÆV;®7kÀ7¤Jº¨·mY4íˆÒ„$”óC�}uè½BI¢�šF‰±4¸Žmï'ظíù]š>ïÏG·l~HÕ3ñ!_ÆC	q}P2$¹&B(;àèÈÿ»YÏ0rLÍsBð<…#t¢03Ä	ˆ&~ð²Ó»öqÄDuv†Úgœq?üD;N¬4ö%‘�g­�ƒóŽâ¼Oò8È1îà¬å~ãpä›|9bœIUò»¢ÁÓXåÞm0y+ŒÝwuYÖ�Í7HG™�¹¦D2n“îpÓe™5°VCP
ÍTÙ,›qèhŸ69ùV›~äÕª^gE_…CѬ5nèr¨ÿ°¢>°ÁX‰Õ
-Œ5ñk¯ÁÕ…rÓªö_›Xö]ÅŒMcÓk¯ð:ÉW_A��QÔ/Xåwøx\ÒŒ\NÚ$%_Þü}ü ´“É¢’CældÎ�¦€¥MÞíOòæú¼Ù¼A$ïÈ9ÞôyÞðÔö�¾!8	Ëôðʲ›B[4»È®ÿ‘lñ'ÎåãÔÂ!¾@¦þ0¶É„Œ<™èçŒ	"¨0C[]$.Êü>+±ù)+wygüÛ6¬
-JôÁ¸õAl1®»´"
-[I&ۥ
-�þ³®ò1 äW•99ºÝ
-xé_!X%¼;Y=ðv}³GjغÄOª=ÔMK"'dY¯_õ
-GÄtŠhÙ-dQ´ÈD†Ÿfwç¹
—§GY†ùš@De€, •@V>fO1||ÖûÏ„Ú�¿^–@Õp1nÇRß/‹61˜�ˆ,‡Fî‘é õ>†mÒA¶)_\nÐÞ÷Rç$Áf“g�—=š}®ª#®…s…(™$„4(,*NõX"mRyCNÕÚ|æ
-ˆÖ½¨ØÆ Étp…Ÿ~Æ­õ—
-ø˜Þ3ÆSS4ȧÓÎ(ôÜùv¤&ÇľÁä|ãÉÓÉÃ1½Û•åSœè�_ç­1tTøÅê±o9_
¦¦ßƒŸån;Ç€b$ZØaŒÞU¿
7à«u²ÆF'€F³Ûl|ÀõÐ{|(áj&€×UŒl0¯æË¢÷ÇHÂ�íÁö“¾�ý6³õ¢À¨/@ç�jè	ýôtqšsE$©ƒâ´ŠÅéÅŒq7ÝU1ËDJ¨?òEA*(iˆ“æýY§yéfy^J¸íçm[—ºÀ‚%hòìÎݬ‘­ÅÀu$îF÷þ�cQ—ÕnýÓ5+¶üfYW˜
-,ƒCç2[âîG)nÁÛO‰HQ­Še¨Çb5ÅþUÑdË<RõÔÀQØô>Îú‰*ºx("{£ea¡ÍºÐuó~1V ’T‘`&OŠ÷æu•¯ìÆð–}sP.9Æð“6mðj¬ºCu†Ñx�ծͿc¼ØÈ>ëݺW9·»qdG™Ùñí5‘”õvc»Ÿ2u陬xÆÔ{³Î˜zšåYgŸçU°›Qƒ–$wîüþݬ¯@Þß,fÌÚÛ”�6°Ú-sü]åíc½ýÅÿ
-~]üZˆïyxÓib_”U7žöŠúè%†pýUk‰‰ñ
˜Ž¥DÓ4�õ÷7Ûǃ—èÇ©îùfÔÛѶ«ƒ�:›à‚]÷\ÔKà5¸6êÝvïw‡î7•üË8Oþ½Ìª„
d­Ëa°™š¨¯˜ƒ˜`Á˜®ø§¯Ø�AÅô®—¬4E™ ‡ÓÛ™…K‚yÚm|G‹h{Õe;E̺7ß43–8)‘	aïdDP
w×3wooÒ™7ê8)©ùt4
-q–Û³{w“ÎoÎ Û
ˆÍÎï~xÆœçlgU˜±}J³wSß[¤Šú$t=>ˇAÄöî�é¸Yw•«®`[TÙ6žº7áMÝ>R…kk|;u1,Ük‹³O]ö˜ç¿ì·ê™Òø%•²3À3bôŠ “g«…/ý+‰=Æ”þÕÅò/±©à™òªPG�®ÝŸS³þ‹åL’endstream
+xÚÅYmo¹þî_±¸O«âDó�ÜÜ'_ÎÎùÐsZÅEQÜŠ�´²…JZE+ÅQ‹þ÷9䊻ZÅNÓCaÀœåËpÞ8|†b…?–YE¨(df
+Ie*›®.hö
+Rh®³ûyÂËj-Ëîg¿ä¯¼úÓýõd4æŠæšŒÆJÓüûÛ»°§ÀæõÛ»›Û7™\�ŒÌïoßÞa÷äúæzr}÷úz4fV1Xχ3nnÿx�Ô›ÉÕÏ?_MF¿Ýÿtq}ßê’ê˨pŠ|¸øå7šÍ@íŸ.(…UÙ|PŠ‚g«©QRˆØ³¼xwñç–a2ê—ÙO	K”åfÀ€Ê$d‚«)ËŒ*ˆ\xþk4Ö”æ¬à„iKÄ%—ß�=´…ÎËK¼ÿñú©}S!AÄ·HÔÛÐÁzßÜ'ã‚ÎcÆH¡Ú“áži?výû´uŒÇÒË©äÜÛ@žn º˜TÝÅ<¨ {*© óf[ͫй{,wH­«�—ŒF‘0D£¼ƒ–ÀÁË)G9†‚[?çþlεÎçõrY?-ÖøY}*W›e{Z,—H=,>†¾íˆÙ¼*›z]¾�óÞW�åÇ…Ó9b÷XÖÓ20z¬›Råzvìj�¬×ØθÍt·<`Ï´^¯á³š
YŒôToÿÑÀAýò[·ƒÒùÂqU&o«Å²Übç®­Nu„‡¯zÞ.g3”¥i°£©·;ä»XcOL
:—¤ Ÿ‚“ªÙÔ릊˪õ®+Á‡}µ]TAƹߤ^uÕCzY„(¢‰vt:I›ÏË�N
×Y®H8}\ÛòèšÖõMë?c*£S5Ü(ªá9Öضj¸�V�VŠ
}jƙۊÖ÷–£ï¡«Ä¦0!‘ÓMrâGˆT˜µÁeó¸Câ?okèÂ�x8e®§)WU‡+(/iׇ0*D_T2xâRej]ï�x_aëb¨š<¦�|Ú;¦nârÑìbrÛkEŒ²+DHN>BœQ¿K¾A§¦›çè`‚;3yÜÛ°—dxWz	·•x
¸»�i å1
+'“¦
+–x»��© ëf*I2dò×ÇÊg•¯öËÝ¢MN!<jßÎœRbo:c·ß®}ÌÀðbsO˜¾nž¼ïÜXÈK«ò€ï¸žæû%öù³-Ä⯔ò‡}º_Èw*2U!úœâ?ž}À%›e9õRK
Rûm¥ +„´N—o V]F?õŒ@²±Àß±ÝnÁãÚÀòŠexæ6»rW­0mÁ–›j»ZøÃ
+‚õ/wž`†×ÚVÊÖx½Àº“)C¦
+θ›A!-%ÒÙþˆ˜“ÂZ;Œ‡Ç-ÇqÊ•ìÇðµ<nì]¾©¦aÁ9LQñÜ-Â�0«Ü±Á|ä¢0t#k^
\�‰‰d`²Ží¦ËÒá—¥=ù÷µ¿Áwàñ°	xÚQé’nä›Y½*k?ø
bê‚XkŠÞMííðêÙ„
Á
+5€‚`�LÜÚ[‡<à	‡”�"»®Åˆå�tÖ[8›T3ÀÁ†,ê̪y	g<,iƒ0·6ÑÈWwv„.dŒ(‚ìP8„0s
+
+d\ÑÏ[Q)ˆF´VgÒ–ÄBr΄6„S�nq‘ò	ë©žE
ïy\‰�t0–¤	Æ’¬�±`Ø_Ó2LIÑöNu3#,êq¡ù?ëu5„¾ÝªeENn7 Ukž%–ù:c;·βÇC÷r–qÅyÿ‰b¦°Ï9‘z,4Œ_à?•š½ÅH­ÿmaVS¯âÜÈÓGg™Æê‰>_g£ß×ìÜ@i	ø³ˆƒivz˜.ÓßÍìe2¡Þ¯gc¤ÞÇñ—:
+’YF¨¤Ìíœ}ÈÜGQœ“Ð^Ó£|ÇåíŠe?Ô O–¨ùŽÆ^%+;õ·!ÔiRHB5¸%–^'«Ó
+®{;ðú%ÇšZnŽ88>•ÿù|¿Ä×t˜è’Œ[‡ïéÜŸ5×⯎*ÜÓ:5i6ÓývŒÉÄH"´°Ý\²®þ1ÜÀ9­}‚56
+"
+ˆ;Ø>Ãøb_±îl¨B_‚!ž=Oj=ôlE³gÁâK,=ž6éŠîîiKâ"ÞŠÈðü­NÞÜÚ_UìDôÿ
 endobj
-1013 0 obj <<
+1010 0 obj <<
 /Type /Page
-/Contents 1014 0 R
-/Resources 1012 0 R
+/Contents 1011 0 R
+/Resources 1009 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
-/Annots [ 1016 0 R ]
+/Parent 987 0 R
+/Annots [ 1013 0 R ]
 >> endobj
-1016 0 obj <<
+1013 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [353.6787 706.9749 427.332 719.0345]
+/Rect [353.6787 494.5292 427.332 506.5889]
 /Subtype /Link
 /A << /S /GoTo /D (the_sortlist_statement) >>
 >> endobj
-1015 0 obj <<
-/D [1013 0 R /XYZ 85.0394 794.5015 null]
+1012 0 obj <<
+/D [1010 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 398 0 obj <<
-/D [1013 0 R /XYZ 85.0394 769.5949 null]
+/D [1010 0 R /XYZ 85.0394 565.1194 null]
 >> endobj
 696 0 obj <<
-/D [1013 0 R /XYZ 85.0394 749.9737 null]
+/D [1010 0 R /XYZ 85.0394 537.528 null]
 >> endobj
-1017 0 obj <<
-/D [1013 0 R /XYZ 85.0394 600.3746 null]
->> endobj
-1018 0 obj <<
-/D [1013 0 R /XYZ 85.0394 588.4195 null]
->> endobj
-402 0 obj <<
-/D [1013 0 R /XYZ 85.0394 240.5427 null]
+1014 0 obj <<
+/D [1010 0 R /XYZ 85.0394 387.929 null]
 >> endobj
-1019 0 obj <<
-/D [1013 0 R /XYZ 85.0394 215.3468 null]
+1015 0 obj <<
+/D [1010 0 R /XYZ 85.0394 375.9738 null]
 >> endobj
-1012 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F84 848 0 R /F86 980 0 R >>
-/XObject << /Im2 936 0 R >>
+1009 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F42 597 0 R /F84 797 0 R /F86 977 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1022 0 obj <<
-/Length 3569      
+1018 0 obj <<
+/Length 3320      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥Z[sÛ¶~÷¯ÐÛ‘g*†¸Ó§4qRwN“Ç휙¶”DY<•(U$íª¿þìb
Š¤(¹�N<!.K,°Øýð-(6Iá›(�hÇÝÄ8™¨”©Éb{“Nž ïã
2³(4ëJ}óxóæƒæ—8ÍõäqÕË&©µlò¸üyªžÜÂéôÝçOî?þøðöÖÈéãýçO·3®Òé‡ûßQéãÃÛï¿ûp;cV±é»oßþðx÷@]:ŒñÍý§÷ÔâèqaЇ»wwŸÞÝÝþúøÝÍÝc»–îzY*p!¿ßüük:Y²¿»Iᬚ¼@%M˜s|²½‘J$J
-[67_nþÓØéõ¯ŽÙO*›(.5X’'V§rÜÊ,1Œ��‘,Ñ’±ÖÊrÔÊQ
-­¼-ÊÙa·««ázYšÂ›ZLºƒž©n¥Ft‹Žn–ªÄIcúÊ×9ZÝâ,Šm³ÅŠ›–Ívž¨c·¢çá–AeW“D•žóCE]õ:«©TTÔí…óß›‚
-Kê]í˜Y_*¯ê�@MÓr=­v uG"ó
7™q™iÑ",qJq¿¾l±È÷u¾,�¾ÏWY³©ÉÑ
-oñ7”í˜ÉºD0áÀ¶ø:'‰ž!ÁŒÆè �7ͲD9§&IHiÿŠ—
-ëƒÎŽ{i
-;ƒè¸8½—ÂX¡ßè5‹³›ÁZ£•îúJk7°‚I¸±|¢­J“ʯõSÇ
-<ˆ¼*Q‚Ë`�Ï·3ͦ�ð?Ÿž…¯Õ`8''Z‚ÃZ
-¤Éï–¤Ò9AB�²_ëɾáÍý–OÞï`E“î¢ÂÀ³îÈ~QVv€‹D˜½–&qÎZ”÷-®»Ýoòm^ÖÞ[±¡¤'â–;Ûg©]­³“®%ÿÙæ°ºv
-�,J�̣d
-�!Ôyx
-�õð±ë0A~Ö}á|ÎÇõ»�/êbWÒÜd‡³(…´º7›3Gh¥^™Ãùh8°£	¼›
Y&ÿcN"8¤ctìykÆ
_hÓƒ
•h¦M€8‘Ž	L
pAh’zWB> áÐd{N@ÚÓtºÍþ C+8Mh/*z²”žÇ<;„&Üd¡5tpç¼*\0.(V;pÏ;Ø%ž„´;P­‹í@YS.v%Ä1ˆÅ�òÚ¯$�+ Ú@g/8e™Sa½kTšçxŠ“^¬‡£<�.šµ—áü¥)øRôî^¨¨@J\!�nŠmAÐŒmÛ]G!~Ãov‹ß¨Xý–¿Ü:~~8G¤SB'Êju»R—á°•j¹\¾:äÕz†ËûŠ&û<Úì¥ëÃñ\66žE�ò–jy}	­ÔÈz¤±8aoàEls`\ï1UÀ=jâcjð[‹âe·À@§ÿª³Îâ!›çëì¹ð[+
-Û¬‚csª0îSñLë…Îj“=¹¸i~è嬿4ݹ¨À,õŽH7†a]ob@wýÁ‡"�GA_NRò
Q
²/Æ»®&´8¹šÐ2
¶Ó¹ŒmËÎtBߎžÞ^†êm2ãÛÊehmÑVŸùÜ@´uj�‘8´O^Àìp�RL÷¹i†ûŒ¡,eÛô\ùfEÞ(ùôi³›{ïb°IÞçl4Ø+§½‡Š'\T$?ƒBÜX”-—¤ ª›95ᤪ >tC˜l²í~Ý#d“kCáÌZ…Ëe·×[+âzÕövĪåiá]rð‹H-9ð#Øu¤îJ]FêVÊoݲ¬fÍr?«Š?ÏP–qàn†¹ëê[©Wô#ƒ°�%½2�
6k™—‹‰(x¸G
ãöq	áV•·$ÔbIO|ÿ5Í›nÍŠÂ\MQRð‚Ÿnb
-°oõ+ÛR–µ—ƒ/ëb±¦aý51C
-
-›
-«<ßôÒ3-sâáޞˢÊæ›ÞÈÄ	tš0aœ 2P¡-æ<P�2 Nä¨É<GòO|Yhãù2¶¯‰CtßkCzdÿሀ�±¯A
KRe¢—PÀ‘�¤t™ã™YÒ¹/1E gþÇ~S,üù
µøž"Ì�–Kn9ãZ%Æ:Õ'W�X`„Öø¡o	êÅ:²ìl³‰w E›j�±iHJ'¥¾Î¦»R—Ùt+åí¥ úÔÕ‹÷rêµAfDk×N%ˆf_+}¼2¶Uï+ulm£Ëë]³	ûÕûÝ!Üü?ƒÎ=ÈtÇ,³m>rN?H”Ã|’ç¥Á/±i¼.|�$2h9îÇŽL©!\D©Çÿ>Ž!Eñ«pùÈ�ÉA^„K‰=
ÑM¢y{0cÎêx EP8Ñp¨xî
Ï:ö¾·¡Z»eXiù
”}
-­Øf‡ ¿oû]z(ÜTdQP
-ñF•"<éÒIN�.”5àµFúÙ's
-I×~Ð[YU�eR§ß!hºdÀg¶¨›pYŒ5Ÿ·R@õHßG4;A„§	W¡ŒÃéo-o¦q˾?\Ó--<a˜fç¦Y-ÖÞnC怹�ÜÜ¿Šlqž¾†l©+È¥:\ïQ‹åÁЉcÀ¾¯j�B#ÚÅ�|;Ñ×°ÍLïßw‘ÈŒ¡›é › › ›9G7ó:º
³vRÇ„êþ}òåî᧻‡±ä@«b€m â|ñË`,Õ‡eø/]™r à� ôüè/Ã�Ì‚;ÖÁh=aB øŒ™ë`B`!ø¤¤…L
-œ°„þÿŠÌÔEÓGÓ¢ƒé¢ƒæ¯ CjxåtCÜ�?ØEˆ
-_ýIæ›ü¡M£‡åºÒÿ(ÇŒ|ßG:	ñ¹
Oœi£íã†Y DRêbàcáæÍD4èžË9à«´—~ºÖ^Ma®%Æ 4m#ö�{yº/“&
”¸ô;ð-ia�0)œ¸’ç‡Pšp˜‘©ÿc5Èhendstream
+xÚ¥ZÝsã6Ï_á·Sf*•¢DÎ=mw³ív®ÙÞnz/mdKŽu+K®%%›þõ¤>lÙé\'"A A
+§\ß=Ü|û>+™D$«‡íD–Ž˜Ö|õ�ÿ$‘ˆnAÞ~¼ÿáû_>½¹MãàáÃÇûÛP(¼ÿð¯;j}ÿéÍO?½ùtr­xðö‡7??Ü}¢¡ÄÉøîÃý;¢ú\úéîýݧ»û·w·¿?üxs÷0ìeº_Î$nä�›_g«¶ýã
‹¤ÑjõqcÄj+©XJO©n>ßü{8µSíÇY$$ØêÜ€ñ¢
•‰)ä`@žD\�]cÁÃ-&èë²~<Û�RΓUÊa~’È‹!¦pÊue-ž×Reû"ìºêT±3F_Wì™ˉb“‚óp>Wü¹èZ8ÙXÝ®À†ê~¿.ŽDl¶ôm‹MSç-1t
7Ù†æˆ £܆Ÿp|òBÊ:/7YW658›d:`DÏË6[W…“ŠÒÐô<p\¿1Åv¥[|Á6'¶”Ú\(°næþãƒcšî;Œ™ŠW!ç‘QŠÂçxËu
+SÉl¶ïzÊNÔÞ5µÞÝþ|÷–Ú°ñ:óŒNgÖwÍ>ëBÊI)‹´Àb`z;A¹Y!lÁ„ôXÔÅ‘0‹ä<ÈZ"gÔu’mÆB²];Ðó—:Û—"ö‡´4‚7Ú©é…Ñx±ƒ—2ÈIF'hS<>ºèúôýÔa8�p~çr	:lŠãÚâHœ®FB±
+TÄ<>©ŽH;c#®ÂŽ«®±Y¶ôź¿/Evt$Ü“Kfc&È2 ϼÓɬñ6¤Ó�.¡¸©2
+Ñœ™ëépÊu9\ž+¶Ç¢Ý…¸½oÜË
+gáä>–O´_l«ìÉñ
ŠÎÃùÖ¸wç²³tͱõa%©è©?ØP|òU3,¦<Ž\ò.#‚¸¶™bêj2‘£«É$ö‰
+K÷1K²mræs'¬ƒ£ÝGâéÑ%¬îH¯Ä‡ÂN
+ñœ1”ãx =•”�,Y‘7Æ"x¬šµõ.·§eg8;ãÙCÇ.j’ŸAÃ,òÒc Ú®_	Õ:õn¤Êö‡ÅìîS6¹64άe³p�OG»ã˘×Ûyb$¶NË'ï+íÅL-b(¤z¥òžr]ÎÔ—=º¼nÃ>?„mùgqþÜØ-åæºú�ëýˆ 4”J¯,àô)-�8@úáñÎ>ÊåãÎ1‡pëJz2…þÀSl%Á/ï~&Òº·Å[
+s *„
+àÿ¹5˜Û ÁYW‚YcªQÓT£Å…SÝÐ7f&¡,žÉT&ó´�iÚK“ŒMßµe^P§Û•Ž|Ä,M0 ¬¤¢ÎÚqŽ�|ØËòÿö�Øò
îHw¦(¦8Š^.øtNßö™Sè_Ìá>ZˆbR%x�M¤ß3gÇgÇm6Â×LêÖj
ï°¿Žú~�ÀS:MM $p{„r|úšk8d­§ì(÷�;ZSÿK±¸Œ<Úí3d<lÉýŽìæ0·Çìq(‰¡È6_È¥�üoéNåÓ9äw0>aÅó‰WAgþÒ*1Gd5
‘á엮XþÕA
+¨±Sí²Ðº¤‡úÓbŸŒ¸ô¿WÔ¤ÅÁ¥““&ÒSoxóñó‚@8TÀŽžî©1™JÅ
+‡
+mµ³ô­#@Œž7oHýà�ìp°…‹I=dÐca¡)zðNT2ø°%ÚKÓSc[Õ¬|Iƒš~½3îíÝhÿOSÉ„	HÉ2MæÉÇ#P™h¬y Ç.#Acÿ
 endobj
-1021 0 obj <<
+1017 0 obj <<
 /Type /Page
-/Contents 1022 0 R
-/Resources 1020 0 R
+/Contents 1018 0 R
+/Resources 1016 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 992 0 R
-/Annots [ 1024 0 R 1026 0 R ]
+/Parent 987 0 R
+/Annots [ 1021 0 R 1023 0 R ]
 >> endobj
-1024 0 obj <<
+1021 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [297.8955 586.6375 347.2449 598.6972]
+/Rect [297.8955 404.8929 347.2449 416.9525]
 /Subtype /Link
 /A << /S /GoTo /D (dynamic_update) >>
 >> endobj
-1026 0 obj <<
+1023 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [55.6967 306.9508 116.59 319.0104]
+/Rect [55.6967 109.336 116.59 121.3956]
 /Subtype /Link
 /A << /S /GoTo /D (view_statement_grammar) >>
 >> endobj
-1023 0 obj <<
-/D [1021 0 R /XYZ 56.6929 794.5015 null]
+1019 0 obj <<
+/D [1017 0 R /XYZ 56.6929 794.5015 null]
+>> endobj
+402 0 obj <<
+/D [1017 0 R /XYZ 56.6929 769.5949 null]
+>> endobj
+1020 0 obj <<
+/D [1017 0 R /XYZ 56.6929 748.9937 null]
 >> endobj
 406 0 obj <<
-/D [1021 0 R /XYZ 56.6929 374.8758 null]
+/D [1017 0 R /XYZ 56.6929 182.2755 null]
 >> endobj
-1025 0 obj <<
-/D [1021 0 R /XYZ 56.6929 352.4787 null]
+1022 0 obj <<
+/D [1017 0 R /XYZ 56.6929 156.8949 null]
 >> endobj
-1020 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F58 627 0 R /F84 848 0 R /F57 624 0 R >>
-/XObject << /Im2 936 0 R >>
+1016 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F58 627 0 R /F84 797 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1030 0 obj <<
-/Length 2589      
+1027 0 obj <<
+/Length 2858      
 /Filter /FlateDecode
 >>
 stream
-xÚÍZëoÛFÿî¿BåKÅã¾—×Onâä4Î�ã
-×Ëê*]Ry`ࢪ©ƒ¤
-»t$c8Ðà<ÛQÀªáÑÁÿ.úû#gkN¹ÓéðÛ{±"¼Þ9
-Ìöá¶è°eô¬ó.ìk½@ep��‘gÛ�˜0‘TFN42+ØAу�PÞìDlVØp-Mdylöï€æÅ@ËÃŒmR³Ž)« $b±�M˜‘BMt
�öo6óyÞ4#f�ŽQÒx+¢3à ;Æ ŒÈ*àLðD›%µÿ¼ñ Ž•Ušù©h2îK´T
-ß,ÇP¨tiý17™@qSÌoÆ`�©ÝÔlpaŒÃçüýéÅÅ{‚

-iP³®Ê&§nïý8¾¥ïN[_$àƾ²¹g÷â"ÚµU	±¤Ñžµúu–‚6) ®‡xRDÉ“Áó#’aÆ~ã“1¢ŽxÆø”¶$q]狼®
P2>Éxg|XFã“LôƆ�¤XWôZ€GCÀD¥¾Ç¯íhPËlô tjnžÐÏ€ñ¯æÿV?páÉsÚ
-Œ ¡¼¯ë&o„k{h€²ƒïtÖí`q[;Ø‚ÚÁÁÕFÜdèxú½ç¹{
-}³´MŸÐV'†o«+ù-u%Lò�«NNå}VáÑw˜º8Ä7ý�­(F†o§.¬xuaq[]bØ¥’ŠçÿzõþÝÉÙù³*Û¯–!Çb'’ÚFR'Ï�œ´2ŠáÇ"-–›:?Ћ”pj
Ù:G‚ªs$5€9¡:˜ÃöGRsØ“R•6n¤ê
-;gÅ0±“ÉÛþ‚ƒpuoð¼«<8蜴½‚;wž}¼.W\ŸYM³¬¤�ðbLº®;¢VvÖñô”
÷
-¹Ã›´†S‚¯ABqÑÒ¦©æEÿ–Õß3ÓaXµªÚ�þt¹h—«¤Î)Å
-aƒ�hkI++žfÎy
-ç\.nM-Ëü6_úñ‹­A_Pr×›:õz…Æî™gxòEÙ™§œŽ°%œ%J„‡8—ÁÌœLVÙG\a:Þ$Ó³Å~ú˜8ˆlŒ
ýÐÂ÷¯cb.ƌń'g>DÂfÇ)4¬ªþÍäÑe!Æcíåqˆ	w—oÜ)ŸÀ’t–Ûþ²e¦ézݵVÔä#s‹p¹¾=øAÕzF&„JTdY²
Q=ìĢϣ‹XN‹ëÒóšaÖÄNn
¸Å€{Š�J/6
gÔˆ|ŒÁ×Xu€|tbù˜|3Ä.²ÅÛîZLFÜJþGב]Ê\s3x½U	Û6:ÿªô8ÙÑEú*ŸŒüÎ î€ø«ÕÐÿäCÂIg-¿}t·¿)d@©Ý�w?x¼õÿŠÕ“™endstream
+xÚÍZÝsÛ6÷_¡Gy¡ >°}J;çLëÜ9îMgÚ>ÐmsŽ"U‘Šëþõ·‹ R¢$·ÍÍu<ËÅØ�vA%ÉÄjÆe¦&&SLóDOæË3>y€wïÏÏ3L³>×··g_]¦b’±,éäö¾'Ë2nm2¹]ü4}û�7ÿ¼½¸9Ÿ	ͧ);Ÿé”O¿½º~G”Œo?^_^½ÿáæ͹QÓÛ«�×D¾¹¸¼¸¹¸~{q>K¬N`¼ð¸¼úî‚ZïoÞ|ÿý››ó_n?œ]Üƽô÷›p‰ùõì§_ød
Ûþpƙ̬ž<A‡³$ËÄdy¦´dZI(ÕÙ§³E�½·nè˜þ”¶L•NfR1›‚ŒQ-sÆ5hmftÆR)dÔ²ÕràB-.ÖmÙÔ»»MË,=汉#×È̲7s"$3VšáÔ·�hÜظ×éµ-Öð·›Mµ öú<±ÓbÕ¬;?ºÌ©á¿nŠõ35›û™u¾,p«_]jÓ[Ÿ0‚i	ëã}�°»²^÷`7]™kÏüTv�~–ç•>P»ÒLÊ,ñì·?ÞŽˆL )ƒÄ×È
+?OS#»šÉÔ2
’‡ªZ”m~W-EõÊ­¿™m‹;šsx’{@]§,Z¶û>À,ÎJu"·LGbÐ3áB›¶Ž9ˆA‘1™È£³žýYîè!25œ–Â/M·ó»^È1þ°â/5ÃøƒwÐð�Ðt
+îË<6aʤ™7zXС
+ø	„‡¢Kú™kÿ	qÜoêy‡˜	òyæ}¬Öå2wî€�ÍzÕ´�p¾
Äv3$Š�>"—þ‰*Á—墨;@
¢>=–aÈÁ­ð¡yÑaõ›uÝœðÌëçyÞvÔ!½àtÜÒ´È1ï6yU=þö	ÖæpºÏÍfM­3‘�6ð-a…Þñq’ƒÈöÍØQç&‚
+"š³�Ì$ãŠï ÞÁ9ðX–}èú\‡‘.ráê¼Â
+gåbï4ÚŠãÓG®‘ù‡˜Ç™�™.Àƒž™^½ëC”ƒ=Óƒ½töÌì™}Ø3§a/Qi€�«wìÓÅÍ¿/nFA§òEõRЃœ#IxúGr·âCX7S\0#­:Û‹AO„<CdI€ºÅŸ<àÓcðn1Áç$øt˜€}Ä„ódJ°
+2¶×¡ùŸâëÓÄ­›ñÕ«Wã&xgŒ,è­P&³™ÊœÛŽšhoCR_Ç­©SbÑ¥ít•ÓÉWCà´,î¥æô
+Ç8Z’#©éïùŽ€0õšˆ¹ËÝ¡1:HBÚR<ƒ«°`
"ƸÅ&úmCQ¥â(¹•¿�½—¤ ’[�"ËCÕÜåÕpG2ƒÐ�mß7kjø›…þVFYÐÜ"H+§ß•à[´Z£ã-Œ¢[ ¸<4bâ&ŒòEÑøÄåç¢Þe±ÚZä8G,ç'êAW³,»94{?3�w0ØA©‡ab KxéaßD@#õ �œH>
+€ôôXÄ8èsÄkAuÒ"ªzÞ†È]XÌ`h Ó2Ö>�ØÕ.é›Í¿
bT/AÉŸ…0§`rËógq’‘eìðáì{½ˆàP°—>ŠÅ×{ÕdœJ5‘2ÃÀ¾ä†Y*¼fç†ùÏ�
+�]+Ã,d¤‡W@ã8ÈòÍ0b(j7…I8³6KÆ‹E̾¬„j24&UBþ
+Üú
Qúsa?Ô„ÐtñÏE�‰Oí
+æ[Û7~n'ƒ(³1Û��Û#êíü¯iók ¥O­>e ü|”p¶þ¶^·E÷Bt°½³ÉZ•šõÐÀÚ`l탗ÈmÔÛd7û¯}ý±È»üˆ½zŠø²öR_Ô^8ñð„½¤Æ«�ÌÛkÑàù÷2ƒ	­£Á°Mw˜ºw!�pßÍ¡Á„NCú�Íëß}üþÍÕõX
ŒvÄ0½ÿ�)É ~Wæ$Ò�ŒÍéîó²Ú¬‹–`P®‹%èºXÒ=¬“:bÒwbI_[J*…_@HAõÏçÒÝcè¼­&¼ÏïšÏÅa“öuõw6©LBFr¤‰5x›ã�º˜oâwý[šlƒ-õ×£iÿö:!ØR9· Þ.Ø^œÓ=¾\ù›®1KBŠ¿$;‘¹ÃŠ©\òφ.¢™›íåQ½Ø©�Mg{Êg\½xÐ
zšýR°ý1Çÿ#wOÒŒI#äd–*&aýO({ŸR$O!Ëð’›ãuwbÇ?¥Ä�Ö†	“ÒYw‘»ðNãï-dšCPB/襻uMC
˜fÛ¯�@ô·½Ð
+·½À
 endobj
-1029 0 obj <<
+1026 0 obj <<
 /Type /Page
-/Contents 1030 0 R
-/Resources 1028 0 R
+/Contents 1027 0 R
+/Resources 1025 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
+/Parent 1031 0 R
 >> endobj
-1031 0 obj <<
-/D [1029 0 R /XYZ 85.0394 794.5015 null]
+1028 0 obj <<
+/D [1026 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 410 0 obj <<
-/D [1029 0 R /XYZ 85.0394 769.5949 null]
+/D [1026 0 R /XYZ 85.0394 562.9775 null]
 >> endobj
-929 0 obj <<
-/D [1029 0 R /XYZ 85.0394 752.4444 null]
+930 0 obj <<
+/D [1026 0 R /XYZ 85.0394 539.9988 null]
 >> endobj
-1032 0 obj <<
-/D [1029 0 R /XYZ 85.0394 624.285 null]
+1029 0 obj <<
+/D [1026 0 R /XYZ 85.0394 352.0635 null]
+>> endobj
+1030 0 obj <<
+/D [1026 0 R /XYZ 85.0394 340.1083 null]
+>> endobj
+1025 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
+/ProcSet [ /PDF /Text ]
 >> endobj
+1034 0 obj <<
+/Length 3403      
+/Filter /FlateDecode
+>>
+stream
+xÚ­ÙrãÆñ]_ÁG*e˜3(?ɶv#W¼v´r%)Ûå‚HˆB-	Ð
+	ùõìÇŸãÅÈþæ,ŽTêÌâ:q$ÒT.ögÚ¨Èh¥dwöþìï݆ƒQ¿t–"Ž¤^�2PË…QjŒqФQ¢¤ê8(,p%Žãe“×yMD¾o³6ßçeË쫳ý>«‘âÏß;¸˜x±’:JµÐ~ðGû‡_²Í†;ÿÁµ™FÎY¸í1Xs[m�
ÍzÊ›_ªú—²¢î~Q¦Ó­êê¡Øä«â·»ú5«è�:ÿõ˜7í'®Ê7å'`ÖÖYÙÜå5/)�ûÛÀ‹ÙÝÃüÕ]Uï³–fþ›˜ZU™¯`ÂcØãwúì³ò‰áM·D„cüçç¹Ó>äOM¸ÿiÚº(·ÝB!Oaø‰¢ˆ¼‚ôUSëuÞ“Rô@
+~÷kEb#e¥†-"«•ñ;üÅ™(µ6Yà=q‡ªn;Éê;„ÏJXÁ’yV«‡dˆXrŠ˜3‘‚óþ¯ˆI)@ÇâdŒÚ_�2�•¸ªAOmÜ8á^VϯóŸâX–E[T%A²rC�šl›óQêy½½¹Ï;|úI"�à®R˜<ÐíÓ½X¯$1aÚ·
á–7Ô]ßgu¶nóºhÚbÍÀ¶¢ïmÎØ7Mµ.`&â±hïy„>õ¹pË|_µ¼ ÌöÜb$ÁbGÄ~�FJi”5¥JÚ�“vV¿‚\•Z1C®UËuVR£Z¯�553kïI@­­ÙåùŽçß�&ÁNU‰œÛëŒï€Ùñ„Š·/Êì!íœÍ�¥„‰„QŽ~(òǪ@œq'T�î+›.¯îžß¥˜õØ걄?Ž�ÁýÌ‹EšÛ¬(½X84€ö”`_ÑÅÏÝ�Ž#gÍk.Ojqr|óž�‘»':«½¯>>;:hE º%
+þ$©“süQÂmxȈ¶éYBGÒiù¿ž5Ã�cƒ¶Àƒâ¦2hïS1öC›ü.;îÚ&꜔×zç=µY>UGjlŠf]y£Š½öUéÄó
+j…�	 Ô¯±Ý2Ž´îÄ{#žžf€°Ä„Óֻ숪Žvn“ƒkÍÚ¤—
+]ss€c+´!þPïñü%1æQŒL]{Q®YHAH<>q²ü··›Ø
+ñöR2üž'€ôØHØ¡?¢J‰”ÀwÙCŽ Ü°¬õ"§­es…Û´|æœUR.Žl`@Œ='¦¨0‡OžN&
¬•2�MÉYÛ¥•l
+a@.Øqœ
+Súa|°ŽBzlmÂñUû´t0ß0Ô]/÷Q®žÅ´‚ˆ%MÍG媛5òÍ}uÜ!–„f»Ç«@Ø~¬ê¨9IÂñ!ÀÇú@iO’’‚$ésæÜÉH+e^mε•!HD®ÍJ£;%zYãlšŽì$ÓUð×ß´¼?x‚œ�º=•ìÑ»y=@š:3qŒ�"d4Õ…ÛƒFg•Éåu2­œ™Soá¬ÛÊ×/
+ØÞ¾fà�cWÞƒž‡�ˆu
á&Ú=
±ÖXp2-’¡b�eõXÐc¯9ý�þ±Ü
+¼ïR3¡F·j\Ìôq*&�Î'Ê3�æ7ñ§fe»®bìoqJ±'BÏ1“|ã‹úB]Š–÷Oœ<8ˆP@)BæÏÃ÷¨XëQN0[?³‘J;þ
+âx„÷>\܈#•ØI
(¼˜tu‚ÄĽöÉØ)l&VJ:i»ÔÂ
+®@Ä+ï} eƒ·²ýS'Σ¼
+Cƒr}dÛWò‚¢¼­Ž^› rD1ÎãQŽ88dÄ\6ö‰T#''ˤŒX5_Ó%»'ŸØ£T즙ù ¨âÈ›ž
gçÈÖÁ$Sv>(àΖ”ñ öíp^Xœg¥ÌêHêNñ‚¢r%]Dqê+é¯)³
+#¿ü“òl$fâDN#1
±ùD�xÔdîAÉ©H÷¸Â!ÓZÈî5]
+P· d¯ø¯…ŒRçÜü?-VÝŽ«á–áoCúÁ„»$éOöʲ™¨däúk
+Ï "Û›ý\n®Å)3aÀ”É1Ú¦³�&�Ë…þf<¿Ÿ@‹|�‚ƒ5!,U  ÉA_ñY©}ₘ�3R9)ˆáãùÍû«·ŸMoŹ(1±X|6Àcà �ÕÛ5®ÿ\	ÓWÃùÄñ!�'»"ïó€·³àTÍ¡’Èâ“ôpï“ÿÎt³^@át·þýà€ß%Ë6Ûñ#(+þRpkÇ%v—Œí—•ñò¼‘õŽ¼[Á8ÅUKZZ¶?_Z
Khþf\¬U“¿$à™&�œ	€¦Ø–Y{ìžãL—0ønó2¯éŻdžØ`“	,B9¦
GŽ
+иk¶ÛU�
µ½ÁÆ2Ïâ°ã)¸'&[
+ßîwp_O÷I£L¦R½�2±]ð#¯H ©¼™Ó•Šs‘³O‚æþ•§–«æì@ÜýçOÿc¯ÿ;£†¨Î¹gŠ´ßT@
+‰2É	æá¯}§¨ÿU	¾Ñendstream
+endobj
 1033 0 obj <<
-/D [1029 0 R /XYZ 85.0394 612.3298 null]
+/Type /Page
+/Contents 1034 0 R
+/Resources 1032 0 R
+/MediaBox [0 0 595.2756 841.8898]
+/Parent 1031 0 R
+/Annots [ 1037 0 R ]
+>> endobj
+1037 0 obj <<
+/Type /Annot
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [87.6538 115.3135 137.7628 127.3732]
+/Subtype /Link
+/A << /S /GoTo /D (tsig) >>
+>> endobj
+1035 0 obj <<
+/D [1033 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 414 0 obj <<
-/D [1029 0 R /XYZ 85.0394 362.0579 null]
+/D [1033 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-1034 0 obj <<
-/D [1029 0 R /XYZ 85.0394 336.0649 null]
+1036 0 obj <<
+/D [1033 0 R /XYZ 56.6929 752.4085 null]
 >> endobj
 418 0 obj <<
-/D [1029 0 R /XYZ 85.0394 167.8903 null]
+/D [1033 0 R /XYZ 56.6929 588.3944 null]
 >> endobj
-951 0 obj <<
-/D [1029 0 R /XYZ 85.0394 136.123 null]
+948 0 obj <<
+/D [1033 0 R /XYZ 56.6929 558.2805 null]
 >> endobj
-1028 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R >>
+1032 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F57 624 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1038 0 obj <<
-/Length 3695      
+1040 0 obj <<
+/Length 2900      
 /Filter /FlateDecode
 >>
 stream
-xÚ­]sã¶ñÝ¿Â�òÌ	%¾H`òäÜùÒË´—ôìLÛIò@I´Í9‰TDÊŽÛéï.vÁ/Ñg_Óу€°Ø]ì'@yžÀOžÛT¤^ùóÌaiÏ×»³äüƾ;“<g'-‡³¾½9ûÓûT�{áS•žßÜp9‘8'Ïo6?/R¡Ä`HoøøþÃw?}º¼ÈÌâæÃ/–Ê&‹÷þrE­ï>]þõ¯—Ÿ.–ÒY¹xûçËo®>ÑPÊ8¾ýðñA<ý=ƒôÓÕû«OWß^]üzóýÙÕMÇË�_™hdä·³ŸMÎ7Àö÷g‰ÐÞÙóGè$Bz¯ÎwgÆja�Ö²=»>û[‡p0–ÎÊO&Bi�Õ©
-Êâ‘	8Ðÿݶ^¡5XXÚPgfû™Ñ0LÃ’Ñ<™7cÉäìTó‘�~Ñ3I/ŒÓŠ99�¹<˶¾×‰è™”Sä™Ø-)'{·„ƒ,ÝÂF¬|ï–p^à
-&å<—�Z9•Ç©¡yÓªY«ƒc5‰·c©‘RY:Öc»¸%kÛñ i³�ŽacŶ>˜f˜×{T´L—²e¦¬­aeûf(‹Ú
-£õmOÃŒg4ªZ/›K퉶ö’Ý·‘Z€tõÄ7ÅÀÌ:Œ¡ø@ÿ�#¬ÓaèDÆ
-°™ll¡P"ä4ÕÅÓƒFç•)äu:­‚™Óœoá¬U�ÙÂØi…6é4‚÷¥™ÀI¹ãÍjí4:%Å_¹¸­Kñ{¾ÃÔ1ÒX2E䀱qÛ?c*½–Êêxw÷Äž¤bײ>äÍ},1¢—ZׇÅ[÷-`ÅC-fZ,œ‰Ãúºꌌ¾¸ØTsꯌÈL§�]R/Ý(tj™
2z¤\ 1£XWèA›ót˜�·m±Û·¼¬¦Þ$[\½ûxÍ+(ÏغÞíŽ8½x)@Õ꬟
eû¡t‹
a¡ßGÁ/Öt³å—L3‘(i¾"ÍŽ˜*Ó@îä� âö9§îÕEì V<ÖæbÄéa1‚†
-æ÷Ë4X¶1£š`öþ,ÚwòoÚ¼
åm¢_n$B§™›Ùª˜Ô	“ðÚc§tð™Z¹¡Mf]i‘I¾�H WÞ…D*‹Ñ
-Õq·¢ËÉu¦ÕúȾ¯âeµª�Áš kD9®“Q�8Ød$\6Ž‰0ƒT‚,³2RÎj²L93ÑŠgÄ£u⦕ù ©+â(šG™
gÈ×Ñ%Su>¸À�W,¥’AîÛѼܳ:ÏjYf„2�áEC%ͲR$ÞËW^³J«¢¼>OÏdb6IÕ43�›o@HF
Aò9KÕÂô´Â&Ó§•À¹z°#ÁBñ9à�JxçÜüÓòø¢¤w…1ÿàÂ]šö;cÙÌ%TJ¸þ˜6r]×aØu˜çj+-NÛ‰
-¤
-läÄéÌö/!%çúc?£4J2Ž­žâ~ÊGJ¹˜-Œ/·�ÿï •%$"±qwÈw»ü@Œ¼qt.ÔyÐb›¾à»­HäÉ4bÍ·Ûú±¡vp"ØØAåYî·<qb±¥¦åp^OE£N¦R£�²|±Me,H …¢ÞÉIš9H+¶,E®>¿öVA*¥æ2B,�ÖÅ\…È¢¼{éKK™=�wù�Π†Œ
-õìäJžcQ L¼3è‡�¸@	 ”—‹?œ²ÙpUÈ8©DJ¹D²ƒwé!TjiÆ™&Å�ÄtÏ‹vô¼hb¡�pz^4“7E;}StÝÓ'ºó‡bõi „½¯ùÝ2”F€�øEȯ9Ŋ¹ZÇB0qéWù²[5VÂ@–¢wDüx5üÄBe‹kÈú¶ù�ÙBÒ›ΧõšÏ!#¶Ôä×>ÖJS‘ô–ý5çûŒÿÁ‘ìbΘ@¾ä&©Á €Sm^n›7Ñ}»)šõ¡Œo%Ï~…`-Ô=Ö|µ™fÝšçÍÔfúš’:¢¦ç�aê¡}&�
-
-6«’ô…4¨›¿.8MBNñŽ!ú´G�Ù”$“jHE¥‘t’
u³^ ä[wa$Ü)¾H$@tæ<¤äVw2I±”	«Ã±
¿½ñ(°qÝ—Àá[&q
¿ÍÆÅ­J…vÚñ1¥€ûßAY•†H�L®\›ö
-¸ºÄ§c
ìä­e'oêÑ£«–ºJwï@0À�Ÿr±?®¶åšÚ!Ľhiºr†?üd%?BÖû嘘o�tÒíî}ë°åëa
-£ÓR¡^AÀ¢]bžEì…¤
 Mo¨U”ñýó§u|iJé»>É_Êø¡­¥F/2ìq.­zãÙçý=Úx]ÜéXQq!æû¡Z‡‚)¡OÆR,Y܇ïÓ,Ê(”žáI¯Âó»;v¥Œæp^NÝ6¼ú5mŽµK¸~`9p�„«Z•·ctIx­Ä	qÁ}ør2Ðå‘$ñ«�r3X\ñ¤øéVQ�¹–ü²�{údßG¶]AÇo{ì!;¿A_IâÞ}’�ävÛMž>}–U¬JV›z:Õt	ÎðëŒ�ó²½óÏ}h«->¸ÏÙÒƒ?ünÿ…²ÉÀÃ;5ïHTæð«&‰ByÛô„òøµî)éÿÊ[¨-endstream
+xÚµËrÛ8òî¯Ðm誋
5§<œYÏî$YÇsØšL¥(‰¶X‘H�HÙãÝšßn4@‘;�-4�îF?A‰	‡Ÿ˜X͸ré$s)Ó\èÉ|}Æ'·ðî§3p¦iÚÇzq}ö·×FNsFšÉõM�–eÜZ1¹^ü–¼üûów×WçS©ybØùTž¼¸|óŠ Ž/ß¾y}ùÓ¯WÏϳ4¹¾|û†ÀW¯/®.Þ¼¼8Ÿ
+«¬—�‰¯/ÿyA£Ÿ®žÿòËó«ó߯>»¸îdéË+¸BAþ8ûíw>Y€Ø?Ÿq¦œÕ“{˜p&œ““õYªÓ©R²:{ö¯Ž`ï­_:¦?­,ÓVf#
+LÕ˜µcFIåx½,P@íëZ8&¤”@qÚm^57Åö\ØdÚÔ»í<®é“Ï€EélX“W‹qºJsšîôÎŒ�¶ M“EÒóU¾kŠ"ÕI³)æåÍNLÒ‚0zùî.%òA&,��pËyP?/š@³­éÅ,PƒÝ¼0“©p’9%ÀV…`Nk麩·çSÅÓä?uUàHïEóðû²]ø² í¸®Û° )¶w€æö
+‹¢ÍËUóŒfMÀd¿þ}3ß–›¶¬+Ô7cÞ¤5SF§_ì¦Y·æ´›êL}…Ò¤P‘tYFÇTjÁÊN2©XfŒÅ8E/··\õ[‡?í/8lÇtqÿ÷è9QÚ…aÙKàÐRX5`é(ÂvX�1rD
a�†;'
×IyÆDfLƲÌ8�ëù„¬%8sØXL?
‰ñ¾ÍÛb]TmÈBÛ|½Î·D_g=Nød*
ÄÃö) ý_o¬À¦Ã<5pߦݖÕ-¡U»õ£ØçÆ}ü=YÍHô=©úcŒ\L:fmæ†ö×�czæxz,S²S¯äOUï«]¼*÷fDÙ¿6ùí˜wuz$»¦ût6`ã˜"$k)!óó Å=‡ã„çÐ'C˜¾zóþýÅK7Å|·-Ûšyç­ë¶ÁÂÅ
+Ç”
+WWMÑZÿ^¥Ñ܃
{lޗѼ)ŠÂ`–#{6ê>_p­ÝÓ•&Œ©
”£æD*‹
+5A×»U[nVÍB6q(ݶ,|ã‘B ÉçËnmç<Ä‹s17y
+?4„K¾Kà*_ÏHÕYÆl&õÐ!dªü66:!0µõ¼^=‹ñâ3Ùrýì Âêz¡9¤^“öCÔ&85H“z¤áJ’:„ v¢:¤êÛîËCÊû²¸ÿÚª›ª?¢`­�¨+¯*¥™5Zmr¾Ê›Am~¶×y;_Nç«’”ðüï/ T|ôW>š ü¯~I>J
*>8r¯Âo!)z$·¼(K¦äÛˆþP4ëíǪ~¬Gðjª}Û{PòóãÀö±óƒÃö ̦J|e{ ;ÿÿc[`2ó†ßþ˜´º/ ŽB�âTj*NåL7õ}±½Ù­X¡8¾�‚c#+¾AÇÁtoŠG€Öç­ŠvHÛ³„«Í«æžÆ"•x0ÿcWlÂ
A9Ï÷DÊ_@Ñ<…‹�	ÍG™’æ¦É§¨t|Þ/k„ª
+™ÅƒësxÊÊ
+üžÐ75üê ]r‰<)EÝz&ðÎA§É¬nÇRÀ¤&O›»Á/pûžvô«�„ƒ±zHñÑ.é’Ó¢¸É!%’$˜0ñéé`¥�+F³Tz3ì)0\:¸¾C˜C”2ÉeÕ½ëJ6ò1tOËbþ)diGYà�Θ¨�y3(ažª=ÅRÅåcß\ÒTë/ÑžÅ%R÷?RyæWM®Í?�šSåÀ²Ñ½ÁîDó	¢�Fó»_–Ø3ú’*\3•t£è³¼Xóe^•ÍzP\©à9
 endobj
-1037 0 obj <<
+1039 0 obj <<
 /Type /Page
-/Contents 1038 0 R
-/Resources 1036 0 R
+/Contents 1040 0 R
+/Resources 1038 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
-/Annots [ 1040 0 R 1041 0 R 1044 0 R ]
->> endobj
-1040 0 obj <<
-/Type /Annot
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [87.6538 396.2754 137.7628 408.335]
-/Subtype /Link
-/A << /S /GoTo /D (tsig) >>
+/Parent 1031 0 R
+/Annots [ 1042 0 R 1045 0 R ]
 >> endobj
-1041 0 obj <<
+1042 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [396.1961 286.7149 464.8681 298.7746]
+/Rect [424.5425 719.9611 493.2145 732.0207]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1044 0 obj <<
+1045 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [432.8521 109.336 481.8988 121.3956]
+/Rect [461.1985 544.3622 510.2452 556.4218]
 /Subtype /Link
 /A << /S /GoTo /D (DNSSEC) >>
 >> endobj
-1039 0 obj <<
-/D [1037 0 R /XYZ 56.6929 794.5015 null]
+1041 0 obj <<
+/D [1039 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 422 0 obj <<
-/D [1037 0 R /XYZ 56.6929 270.2232 null]
+/D [1039 0 R /XYZ 85.0394 703.9029 null]
 >> endobj
-1042 0 obj <<
-/D [1037 0 R /XYZ 56.6929 241.4762 null]
+1043 0 obj <<
+/D [1039 0 R /XYZ 85.0394 675.4275 null]
 >> endobj
 426 0 obj <<
-/D [1037 0 R /XYZ 56.6929 160.4328 null]
+/D [1039 0 R /XYZ 85.0394 595.0025 null]
 >> endobj
-1043 0 obj <<
-/D [1037 0 R /XYZ 56.6929 128.8764 null]
+1044 0 obj <<
+/D [1039 0 R /XYZ 85.0394 563.7177 null]
 >> endobj
-1036 0 obj <<
+430 0 obj <<
+/D [1039 0 R /XYZ 85.0394 407.1582 null]
+>> endobj
+1024 0 obj <<
+/D [1039 0 R /XYZ 85.0394 381.6476 null]
+>> endobj
+434 0 obj <<
+/D [1039 0 R /XYZ 85.0394 250.4371 null]
+>> endobj
+1046 0 obj <<
+/D [1039 0 R /XYZ 85.0394 219.1523 null]
+>> endobj
+1038 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1047 0 obj <<
-/Length 3050      
+1049 0 obj <<
+/Length 2026      
 /Filter /FlateDecode
 >>
 stream
-xÚ­Z[oë6~ϯ0úR8Ö‘x‘Hô)msÚÛ´{šîÛŠLÇ‘%×’“fýï;ÃÊ’#×)ZøAˆÃá77ÊÉ,†_23:Š¥U³ÌªHljž›‹xö
-º�i$�V^Z„§H
-l�Q¥ƒ…ÿ
-„£‹”@,˜cà ��Y9Œ$R¦ó›ºë7ËQŠ¨µ+>r¬¶ŽùLmâo‰Ìkµ'#%cñ‡Ú`*¥õŸÑžÁWDï‰ò°ÑªåÍuùÇ©ts!- 
l”Áœ¨Aa«©V
~OëKGŸXQQ÷X.Ñ R9Ï9?Û¸b�×e»¥X’-zB
-IJ’D·/Ž°�
-ð�å}Åmoåz€YßI¥ƒî1K�S0Y‰$>‡3ˆé2
‰N#‘óÏCé	‰›±*«�ŒJ4aý=uxøû8Ôúú»êžò°£Ë7A	‚¿
ƒ0ö¢Æ¥)a믪¨�9÷<ô
-é£{
ìû8>¸Äm¸áj–Êf_‚5#U¸P6Õ·ÆKõm^û»:É·x2˜tlù~
-A@–õaâÀU%ZL&òxÈ¥˜À8òæ`*û`*é4à	Ù×’¨`k~Þ”(Ú@–�‰óî@÷‰X/‡?Âï¶9P
-é„8ºDÉ·[Y¬
1¨§µWPWHP‡.¼–)}}‹3a/H™à� o ”Îæÿî™á…^˜°èmÁ�yµwD–ÌÜÞ›Á…Âñ¼z
-°'Î
-@•ÚóÇcâ²LXÅb©p’Öçô¤'¢¸o%æW
-–æ”J2
Ⱦ*vÄÖš‰è
¼¹Ì
-¨yCÀ@|LÞNÅ‘ÒýÕÛŸÜjˆp”/âëk7Ô@ÔR�Rãñgev¹Ýó­ýL’Ë|ÃÇ$Çiô¾å+¬ãºêgÈ­þÂ>�.8a×2Š�Òãøxø"ýIHö?~sžü2ýö-M¹óƇT»nöÕ’h®Ù�Ä/*ž¼©U»î©Ù}l£?÷Y;‰#ÿ{køûîïýggØ›w8’îû_Aacw¸PIùeYp£k¦„I€asRZæ‹.�?l¿^¦œj�;ü1€×\±xkbF^û`G0¸c¡Âjö«=}&|Ãwí˜ÿxÛ�µuíÉOì•�$C´Lý-
-ð—,îJgÇ’÷ÿíy)úÿ
Ó
+xÚ­YÝsÛ6÷_¡É“<ÁøŽŸœÔNݹ¨=Çw7sMÇC“�Í	Eª$%ǽæ¿]ìB"%æ¬\:~Àb
-öã·» ,'üÉI‰(QÉ$Nz2œdËoò
+¼éÛŸçW×ïþqsqÓÛëŸç§3zÓ«ë¿]õîæâýû‹›Ó™Ô¡œ¾ýñâ—ÛËZŠXÆ›ëùÄIhøŠÐ›Ë«Ë›ËùÛËÓßn:¹¼ÝÚÒ·Wz>òûɯ¿y“ÌþéÄ~¢ÃÉL<!“DM–'Aè‹0ð}Ç)O>œü}+°·j:ê?é	僯øcùÊ·üw]™ötæƒKróÑóTerš>ÝcQ�¢¡ ®éiá^
+µÜ×Æ'p�°ÖVd?ŠDà+éÂK55]­0	U’p:"õôh�᤭Ë
AX¿¯MS`±;Á¤4g%ò¬Â‰ÂD
+Âxú¯­°ªÞm˜µ+“˜D3Órmˆ,X¸
äKÉáÝÛW�
ö+ñ�DDÉËá…‚Œ7	X­ÀE¨”9)
¹Y¤�Éhw ¦
+Áè×RhåÃ2òÏÓ0œb¹
 N)©L“¬L[æïLèôpz½ ‹èáÞ‚G^%ƒþòõ|¸
ÖK“³ÜyÝñéœN^¥¤t‡U3÷óÍNéåºíX‹ºêÒý¤à4'CÝá‹�äRÞ»øP	à`Xâzîj7Ù€RR&²z¹*J“Ï\wðåÃÚÑêmÝ*<dëqìþ»‰Bׂ!ò!ÆÞ•1’} ´$—Tuà5íÍ�ä&§Èkªo•¢CYBÊ<{1|
+4¢Ø:^÷‘ï:†Ykn–úkHÆ
+*PrTïð’D�t�M×_¤\ËÅëÝÁ=5O
\4ï÷RÏ£ÄA0ŸáÚ”ÁÅi¤À¥b›ÄÃJðm=€½—™ÛÂÞºÛ†gKԈߠçFRú/
+¨Dh'M
+¸HôR`Tþ)`ûË–½ÀÃDønîåUùp=óœcm{úÐýð¦ïšt¹„«Âa{Á�‡"ñ¥¿ç(¤îèAŒÐdo·=qZ\1î/�ÇÑÐ8ÈÀúi†/ÏÃÜ Zwg³ç®,ZNÉ/4œ�E—duMZµø~öÿ‹“=qëUžºÚþº‘˜ÙªÜ-¥•;Z¹kÖDBˆcLnëÔ«b1Z¬îPKΖºé¶ìÝj�TÇïÝêdôeÔeP-³O3Dcä£zOiSý¹H‹òÏ⡪<Ù3iìÁò
 endobj
-1046 0 obj <<
+1048 0 obj <<
 /Type /Page
-/Contents 1047 0 R
-/Resources 1045 0 R
+/Contents 1049 0 R
+/Resources 1047 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
->> endobj
-1048 0 obj <<
-/D [1046 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-430 0 obj <<
-/D [1046 0 R /XYZ 85.0394 728.7887 null]
+/Parent 1031 0 R
 >> endobj
-1027 0 obj <<
-/D [1046 0 R /XYZ 85.0394 703.8893 null]
+1050 0 obj <<
+/D [1048 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-434 0 obj <<
-/D [1046 0 R /XYZ 85.0394 574.0702 null]
+438 0 obj <<
+/D [1048 0 R /XYZ 56.6929 195.5375 null]
 >> endobj
-1049 0 obj <<
-/D [1046 0 R /XYZ 85.0394 543.3965 null]
+962 0 obj <<
+/D [1048 0 R /XYZ 56.6929 167.3986 null]
 >> endobj
-1045 0 obj <<
+1047 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1052 0 obj <<
-/Length 1252      
+1053 0 obj <<
+/Length 1020      
 /Filter /FlateDecode
 >>
 stream
-xÚ­XKoÛ8¾ûW9Ùˆ)Qô”f�lŠMÚu½§naÈ’œÕÃ)'nœÿ¾”H=-%jø`’ÎÌ÷qfø€ŠÆPÁ&0ä(–c
-}­ÔÏ—¨c½CTÞZÅn”ÑäRÚâKJOÍ×֚̉öAFoè–�,GîHÌÚ",[·6Izï¦~kÌÂàÖe<ŽÕ:F¸e(Z‚\Ë2ÛÔòüOîUžïd³o§¦ïóȦ«"yW!¡Ò«§¦ÆÎúe?³ }/],ucº)I{•º&Îlëóhx³oB�ºMx
-¶‘Š/+ñe•fe>
-ymÕQ@¹×“bËR;ÆÆð,ê#}êcQ¥�T8Œ�îÁ¾Óh®ÒøÌ�Ü
8LnUJ~IÐq­ËÚ5ÀÖCUâTâGƧ¢�©IÆ^3—‘h”Y80u¼Ùf	êÄá< myá$ì%üàS-VÓâPûň­ÐÐ$K½Æ¦M¶F#‚Å\hZ@·�ÁU
-×÷®Áo0ùcDÏ+„VÝ^ÞüæQ?ñ+�nÛ¨zÎ0ôÆ�Y60l®D:•ãÃö‘çåãȱëÿQví}endstream
+xÚÝXÝrÚ8¾ç)|vFZK²lkz•fI6�mÚeÙ«n‡q° šÛ•Dúî+,cLbÀ¶³ÓaýXßùÓ‘ôIÈqÍ9!….až0RQg4í¸ÎÄ|»ê rX
õQo�_/}ì0È|ì;ƒqMVÝ0DÎ þtvñûùÇA¯ß˜ºg>ìê»go¯o~³=Ìn.¯¯þîŸwïlpýáÆv÷{—½~ïæ¢×(¤Èàq)aàòú�ž­]õÏß¿?ïw?ÞuzƒÊ—º¿È%KG¾v>}v�ظý®ãBÂBê<˜†cØ™v<J õYõ$�¿:Vk_hSü(	!
qÐ@Ôˆ�ˆP}‚IÁXDÉ,ïßuËú0˵ÈRÛõfé¢Ñ‚ŒR\`Æ"áö³ÒR¤“]C3ùÉØŽøÇ¥n–&óÅXH¥M5"QÉ¥²ƒžÌ,aSŠ|ű´�y&µ­™îuã�- „%è{£qâq,Ám¤Ú:SŒ×Ó´
+€uc‰T›?x¦lÎÕ0“Ã4Û¡o=ZX’M€ßJh:›Þr¹§e”ª1—@Ä	ÙLïÅ¢—X-¦í°Voši1ž7ú·°Ì1z‡�|vû…Ï_jÜVß;Ö* ²™ñu"ŠÜ«%Ò¢@"J¡‡lÀÀ#´ÀÿR|¢��ïÔú×ù»5—@€|d¯6Ū´
+ÜûuÃü—†�±Ó0Hp@7
û–¥(i¡´©6Ùjã¬ÄÜG‰ˆ…ž“ô\šVË̉#°§f=I>–\Ý9z@n«kÓr~¨ÐÕd
4‰b!ùHg²\y¤ï†i4åå¤aÃ0`›ÊÖÛ&�-OžÕLZ!ËZ!Ä6GI¤ª]u	\¡6„êy¾š�$º/õ—Ù¶10J’ì
Ôÿ“-–YÌ•N#=º&&¡lÿ÷!°Â¾Î¸<FVÝ°Õnv"q³Ü$+åñTåéQ.«¬)|-OºSŸŠ£;>ú–Ù¢Ö›’ñ5]Œ#‘,Ä$Í$ßzxãW°
+ô#XþïYú
¬Á*V» Ò•ÿ[\}Z‡ÖÖJP-£í“´:Ï«J}–ÖAÝ·
 endobj
-1051 0 obj <<
+1052 0 obj <<
 /Type /Page
-/Contents 1052 0 R
-/Resources 1050 0 R
+/Contents 1053 0 R
+/Resources 1051 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
->> endobj
-1053 0 obj <<
-/D [1051 0 R /XYZ 56.6929 794.5015 null]
+/Parent 1031 0 R
 >> endobj
-438 0 obj <<
-/D [1051 0 R /XYZ 56.6929 516.9892 null]
->> endobj
-965 0 obj <<
-/D [1051 0 R /XYZ 56.6929 489.6463 null]
+1054 0 obj <<
+/D [1052 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
-1050 0 obj <<
-/Font << /F62 634 0 R /F57 624 0 R /F42 597 0 R /F43 600 0 R >>
+1051 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1056 0 obj <<
-/Length 2937      
+1057 0 obj <<
+/Length 1196      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥ÙrÛ8òÝ_¡GºjÅ€
-’ð|n¼½º~Ϙœ‡w?__^}øõæÍywW?_3úæâòâæâúÝÅù<ÊlüZ$¼Àpyõ�†>ܼùøñÍÍùw?�]Ü
gŸ7RòŸ³ßþP³ŽýÓ™
-MžÙÙ>T幞­ÏbkBã1õÙíÙ?�£Yb�ÒŸ5Yh3�N(Ц#FQæ:5³Ôæab´!
®w÷®+Ïç‰RA×o«æ�á×x:XbEan­&òuÕÌ·år[v«y_­…­Ù­ïËí—ØÜçïc‹F«õÛ§ï_ë{™vu_Í×®ë=ÙSÙ}j·Ÿšöûû³|šÕ¶\ôíö‰é6®_}jܺd†¹ÎÃ,Ks
-~íÜC9,t0XGƒ)ÄQ<Z'Œd¥
+Ý�ç †MÙ�š9Y’Mã™M@j
-r¾ÁÐMnÂT¥'†þÿqù�(¯Ö/¸ó)�% ç855·q·E/¸‘ŽBcŒ…ÃGa¢t.FG–ÃÊ6#ò4jpIEdw+Ômlƒ®Ü>¢¥é8	V®c¤ãÁ[!‹vóÄTí’1½�žËSËv{2'æ‚2É€h_Õ5£îýÔ}]NùBßòýo¶çQ´�U!ávýªÝV`€Õ£G5ݾÜvüÁû
-ëÃÂxð4î‡ð¸Vû0¹Þ>1AQ.$­¿¡è8è·à‰Ë�Á
*'QäÀ€^²G¯¿i·=ã­‘õ›©,GÚ0CÐê^ãF ÉZ!´Ð‘�DB¬\óPŒ¤¨€€Ã
-"
-Ð^ÌJo˜†wÀqøç ä¿ŸÌ<{H.=ŠÑÅ(
¥Vì1~#ïa¹’S(ҒæCâ”g[$?Ñ’
Í{«[ð�‚Y瘼Kå‡=hE†‚8ÇŸCN”\tï¶=ú­ÂjÌs-�¸�€¢E
-“9çTÄW
):aý&• ¼€¼><q‚(Á’3ŽðêäPédï¾ñË<µ_•’ož¯
-ucz´èW¥‘Y™4ø÷ŽÌ
- Vˆásn,
-…³�Ò“Â

-Bïß“­Æ¸†ÿ±¾`Ôj$&T‘I¿G¦gy±ÙHÀm¥×0Z‡qžK¯Ñïî¿¥ÕÐPº-@ÆÀqª�9üŠéƒR®6œšâ!„
-s2K³L<hÀı/4�”—1f¸‚1œóâCÍ è•PbÑÀ(ÉõqðPï„
-o1Ç7ÍsÕd%ã8ðoDOMš*¨²8d0PèÒ>o Z�oŠ�0®ÄøãwH&ìˆ8…u(ÊÁ4Ij£’b`‰ËC¥U¤ÉóS¾ÎNOÛ]dàãž:»MÂØÝ7
-+BH†Ë	_·y˜¦6R¬Ýµ†ÞŸKônÌ=ÈN*Y�—S¦F•ÄÇG:);±Ä”öMGx¯{ÆÀvÐv[2ªŽâB$Å$ÌËû;°äŒèvlã:Fríj}T@ÌK¯“(@+ëi3ð±w÷ÙŠ®FËŠ
-�¿oòBá
ÉEâ|õ…‡虇–àq[½ô-x.ì‰�<?‚7dB¹wDæ<HKHkTŸAH)]zßÂWÓ�úÁëùI¡ÑÍA( º�Ïe9ŽA‡æ
@êV(UR³ŽLÊA|“cfÿT�wÕzµÅ¢áDÀŸOÿ¶!ɺT_|8ŽŒ9œ
-uà|2/úVTûß#𤮈l5Ê$CâóÅÁRÐÙ›mõÈoµÚ4?Û?yf×
¢n.ßEy6Ùá�2.‘Ç_BŸÀ+ÃñÔË¡!ö�XºªŽ‘Ò°Ÿv›¾›ät©°j渉ºMIrÛ�›j©s�D]¦Iä2MêŸgøò¤DÔ7å¶q5cEÏfôàJÌòÆ#ÕñpåàAí›áÖeó²Ÿ#
?÷H€™àË?þŒ�lžbmB­èÈtEšƒ<ým\
?¯þð/ñ‡ÿ¦C‹•ezhÖŽ<QI˜é<�¢,Ô“ÍŸéÃÿd/T£­ÿX�‡™endstream
+xÚÍX_s›8÷§àѾ)’�š{JS§—Î5½sÝ—ëu<Ø`[S᤾&ßý$˜œ8IïÏø�eÙ]íþ´Ú];Hÿ°Ã<è	".(d3g± g¥¿½àJÔB -õj:89÷ˆ# ðˆçL—-[>D¾��iøièAGÚž½¿<¿xóqr:ât8½x9„¡áùůcK½™œ¾{w:
ì3<<ûåô·éxb?y•�W—¯-GØÇ
£“ñùx2¾<�>OßÆÓ&–v¼¹&�¯ƒOŸ‘ê°ßt…Ïœký‚ ‚8›
e.dÔukN<ø0ø½1ØúZªöâ‡$®Æê>€Œ·
+bÊb§Ï™.úíÈÓE0Ô±]{#=Ï,u÷Y7ÑàÖôµöjO�žž6ráÿýÈUõ¨ÃcÂsÚþ·Úßñýÿ?
·ã^íIßÔf=99§Äil-�c”Cä1¿¹1ªA•oöJóAërÚ´¯¯õ¤…H"íìd8AZâ£
+VQ³Ðþza
 endobj
-1055 0 obj <<
+1056 0 obj <<
 /Type /Page
-/Contents 1056 0 R
-/Resources 1054 0 R
+/Contents 1057 0 R
+/Resources 1055 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
+/Parent 1031 0 R
 >> endobj
-1057 0 obj <<
-/D [1055 0 R /XYZ 85.0394 794.5015 null]
+1058 0 obj <<
+/D [1056 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 442 0 obj <<
-/D [1055 0 R /XYZ 85.0394 636.8504 null]
+/D [1056 0 R /XYZ 56.6929 158.6437 null]
 >> endobj
-1058 0 obj <<
-/D [1055 0 R /XYZ 85.0394 606.7365 null]
+1059 0 obj <<
+/D [1056 0 R /XYZ 56.6929 128.5298 null]
 >> endobj
 446 0 obj <<
-/D [1055 0 R /XYZ 85.0394 606.7365 null]
->> endobj
-1059 0 obj <<
-/D [1055 0 R /XYZ 85.0394 582.3251 null]
+/D [1056 0 R /XYZ 56.6929 128.5298 null]
 >> endobj
 1060 0 obj <<
-/D [1055 0 R /XYZ 85.0394 582.3251 null]
+/D [1056 0 R /XYZ 56.6929 104.1184 null]
 >> endobj
 1061 0 obj <<
-/D [1055 0 R /XYZ 85.0394 570.37 null]
+/D [1056 0 R /XYZ 56.6929 104.1184 null]
 >> endobj
-1054 0 obj <<
+1062 0 obj <<
+/D [1056 0 R /XYZ 56.6929 92.1632 null]
+>> endobj
+1055 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F42 597 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1064 0 obj <<
-/Length 3269      
+1065 0 obj <<
+/Length 3595      
 /Filter /FlateDecode
 >>
 stream
-xÚ­ZKsã6¾ûWèºj„àE�¨=93ž§2vÖvj·6É�–(‹Y‰TDÊŽòë·
R|IrvR.ÁFh4¾~�bf¬´“ÈjrNfë>y†¾OÂóLk¦i›ë»Ç‹o?9±Ìi&�‹Ö\1ãq,&�óŸÃ$»„xðþîöãͧŸî¯.#<ÞÜÝ^Neȃ�7?\SëÓýÕ—/W÷—S‡"xÿùêÇÇë{ê2~Žïnn?ÅÒãȤ÷ׯï¯oß__þúøýÅõc³—ö~W¸‘ß/~þ•Oæ°íï/8S6'¯ð™°VNÖ:T,ÔJÕ”ÕÅÃÅ?›	[½nè˜þ´TÌÈPM¦BÆCyb]ZƒÃº¾)„ea(¢ÞºÓv"8ŠÑ1Ó8ëC	£Ö¡XÉlM¢Ð2£`a<“E±}M¶sÔÍ·µjqGS
-Η;¾+Pfă_¤Ô4äRÄÁœˆyŠô–•ôLèñšì©Qôœù/œËç�›"%bkÎ,&Z‘w&Ú¤®:/ÖI–£À ÚTfÃP:Ÿ’2+
Ö*�—vÔ%(<RBù¡Ô#Û–†)kÏTVI•®Ó¼ºœê(Š>£ ÚoÒ‘â�ck•W­Lº“E¶Y’Óä ˜
-wæVHF¦7ãÚÚ³ÓO%rZ!ºêIòù·Åvd^z‰bÕ�7Ý–#S‡š)!e_;ïÀ$¹^—Ùl	ò‡ÐÌV+l‰ ÙlV{""ðùû.Ýf—"HËš¹Zú#�Z
¢ó°�<Gµœ(þð]û9{I]ÓO{"5|îp]+OÖ)`ÂpÜ,<©Q‚°`D±�ߤÅ@ÅÑ#8{VÒF¤†
avaC¨/»Œ
R[|Â�çôž®7Õžš«¬ôL‹ÑsR3)¢7I,™‰l}ÄÎDaZ§A8;i�ê¼yAõlÒmJD†ÅÖ¨î¦è°•àÁj]8'§á,›t6®Ž�VVÒ 
ÌÒ•3ûÒ®½HgUIÑú°#É÷Íܵ„~Û—@ÀA¬H
-PeW¦µD™圉£¢zý0§wv¡£«öÙ2ÉŸQYJz­)'°L^2§t ;•
ÕwËàyU<%«10
¨c!Î:eYfÝÑMýyµL*Z1+ñxC5„#a04=…qaë06]8Ñ©ã�@F °¹"_íîˆl
-x_²YJ”ÀGâ{Ÿv~:è7
-¢ÐéÔŽ)%¸�1`•éç¤#ñÏ2­¨AZ™x(ˆâ!Áƒ<MçÔ"Hð€<´ܤ³l±÷}nýf&jwáÎúùŒŽà”„�&í,à+3ç¤ �ƒ|O`ðüSú
ÇR•<I$âÓ©ŠÑÒGnœÊ!DTgó”ÇèYžUj:é`ö HçEá©#¨Õ+2e¥'âÉ 6ñä�°+1z9‡o‰‡?àωèÆÖ9KTþåЬ¤ðv)ë…‰fë|Ðw4#eƒ¬¢N€¨ïòc;›�7”¡æ(ˆ„²çs¢%ccò“(#1} Æ³S¦©0*X¥'–gá�B¶œækZØ4š‡9¼æ1TƒÙÝxnŒEø¬Ï¾¯Iï)a_ΛJÕ=,ìp
³UR–Ô¼¹}GÜdg-ýc›TŒÝ‰Y¬7Ù*�O]8
Â<]$»UUÍ9sÛÞ0¾ü$©î¨`ÇZ™à=JçÖ®äÚOH[ºä
-²±ù˜º\Tapûïw_®nnQ
Âø£ÅŽy‘úVî̾XA>ž…?Ulx_]É&ýg³qk¶‡Ïw?ýðaL�Û»G
-àO>¨ã*Y?
X¥É‚Zîœa´ƒìžÊσÚjàVu¹¶D�„œÐiàó�aÓ;ªŸÏ\»tC¨ !—¶¦~oS_¾ù»õÁ[²––M�—88žÃ=̹‹ñ¨w±óÿ�ªPÊÆ&íÒb�!ÚBƒ‹!AÒ£æ´QLðX7ÞM�ݬi(^´nîÕ°¼œ
-e®‹$#`àx1À¸ê�)	Kpû¦¤6Åcl­ñÞ”âc6KïOžaQ¬VÅ+bÂQ}oBk™)Æò~5³zU4?l´‚7º0^í¡)(:lÑCãpÃ*Õ.]fSGwæ³\ÖuôM^¥Û<K5uÄbɣÄâ¡
-"	w¯ÖÏšò Ü­Ó9£¢Õ{Œ�7ý³bë�¬jý^ð’”¾o�üV{Hx+¼Ë˜%¥wÎIÄ€ï$ëÊ·»ehò°VÍ2-³âH±Ç­ªdrJjJ�á‰x™S“
-}h$¹çÁø¸öî	˜û¸ŠÌ±7Nß¾Ü<~ã§ü‘:~sÚ@Â	ÞúB–}Su °Œ-Jv!Ä.“V�†1³ÖêÞÉ´Es�牢Ä™—d›®¢G@îK¨õKê™'Uò„ŠÆ”œCž¾ÃÛ.7Üs€4[ê…Ê�ö±ÛÔì›m†Ðò3»tÇ”=‹Üe‚‚)ÿM÷¯Å¡j>hKŸÆ,@ƒ�ãöµOHªX­îó"߯{�#,0_¦ûñD]åuzªÜÁa‚iú’®Š
݃a�[
žï?_Ý=€=¡A«Ø-Ô®ni]ˆU1+VÔ5k…uš)'V² ¬³9¸‹ˆ£‡Q�Iý‡"3ôà3mGWDÀ{Ö±Kcoaݺ
˜ò¬p¨ðý!¯Uë69f@’©(6mb#—/S!CÇÆ@ôÂ;äXµ»òŽÝo$º;\Uu¾h@".À'J-!–@�ý‚㙦m®ãq¦ár)ºü)œ?^Tôàn…ïxrõ†kdùr
qxÑÜYþ!M{~qž–³mæ/¡¼Cª×FŒK]ŸUý«Rpªù
-ñ¸þ>
-%D°,ÊÊS“æC8¾ÔE2¹«
 –»§µKc ýa9w6#†·D¥M–D¥Ô¨k¨Rßö—
-`覮	 n�ª6ŽeÿZ¡¾Ü4¶ùšïD�÷yšûïù‡%�|ÈæÝ{wSd·KwIeƒÛ¢J‰ê±x¥þ@?Ì]˜hω^ÿ€Ì¤0ðÑe…[�tð�uóãèMÐ|î?»ö*¯,/Ó™¿qûGý
gˆˆÌ‘ŒÑI
Ì°è<m°
ÿ´=`5ƒyAò×1ÊÅxÕ‘fèÏk®32@†Ìl„–Ó–¡©æi•d«ò¨íÚF‹3Á¢ÅtÜrk&\ž€0Ý«l6’J@<‹B{rí†i¸¸ê}A�ÂHuVïší¡^ÂÏ9x¡éƒÇCzÿÉIíï^|!DàKÿ‡!¶”-Å�n¶ä<jöÓûÌ:	`óÃH
+xÚ¥Ërã6òî¯Ð‘®Š8x|TN“‰gÖ©'ëqjI´HYÜP¤V¤¬x¿~û’’©™IM¹\h6@£ÑO@z¡àO/R*›E‹$‹B§´[¬¶Wjñ}®´Ð,=ÑrJõÃÃÕ›÷±Yda›xñ°žÌ•†*Mõâ¡ø-x÷�·¿<ÜÜ_/�SA^/]¬‚nï~dLÆÍ»ŸïÞß~øõþíu·?ß1úþæýÍýÍÝ»›ë¥N�†ñFf¸0àýí?oúpÿöãÇ·÷×<ütuó0ìeº_­,nä¿W¿ý¡lû§+Ú,u‹#|¨Pg™Yl¯"gCYë1õÕ§«
Nzièœü"cÃØ8»XšH‡qf“Ëëò
+ÖÐh€=[v©uf.�Cq΄©JÒáP\29mth­u‹Äeal�¥Séêü¹DÙ¼yÙ	u’
+ƒ@l 5gh
+ÀªÝ½ ”0€áé
ðB5Qð¹ºÖÁ^F±`*ër[6ÃlyÃ@^w-C�%Oßä[‘ÝÀ›3­›Àú°0n<I‡ó!<®Õ
63Á/LP”ëüP÷ßáÔQÐïó¦[òAä4UQ2zMèvËø]»ïשּׁßÌ	�¤a#çã{dÄš´5ŠyËHðX
+b“7OeÁÈ5*y]s÷p¨4æE�¨^ë—ªyjnˆÉ¦šÃö‘T_[Xv=è˜Õ‘0¢¼
+)ØÝe »�`ØV³àЕä‚?JG
*Z3œ¿ø6Xbµ��Á0JdFx¢È=
˜"$¼§
+Â+,`Ä3{Ð�ÚÆq2ìáÍÙ6 ÕIÁá�êÆÅm˜Ìøm7¥œ×«Z&'‹~q6R,›ÿ9�b
ı¼Ïý€%µ .{NðƒtÙ¦~Lâ…h9áÀPÖ‹6õ±í8–.Z§“³Ì
L
+#HY0ýáñkŠ
É+Ñd½_
èß�Þ˜>(èŽ
+ÆpØ‹Æ´AСļ�Qî£à©>ž4bNOšûªfNà9{þ�È©éÏc%c
…:í¯$òM.ÚmÎþÙÇ�Ñ„Í㤰¹9èÆ<iFl”Ô‚,qyˆ¤´Š”y¾ËgÚÉyÁ‹x»çÆîb°ñ¡þÆÉŠ¢ázÆÖx�Ä¥BŠÙ»1Pýs’žÀ‰åOÂI%K¢òrìÃبâètKg‰'&™RÀ�çzd°ƒªøtØ“Ruä´ä“Ð/7Q0$cDwØa!×1’³Wç½b.¼‰u€ZÖ3ðqÌÅñ³Ý6Œ–
ŠÞ¤ÈNyß
+�?o²BáÆà"Ž~~þD‡Ê|(jõXŸ ¼öEx&ì‰O,_Î;Ê29wDfÜHQHkTÁ$¥Ôé}[Ü”ŸI¶Ñꋼw399p
¤7ð¹.§>h¬
+|äÜœ(s2
Ô·›¼c”?ºdÈ„Î÷§ÍŕΊ¯o°ÿUדÛÏ¥QÙäÖNù’C‰{6�žð¨¼ÓEHîÌ
+rû(…!&'ÕêÀŸ_ãå'Р|ÞW˜/<—ž†Î“
+OíÏòÀål\ôÕ¨qrT¸ÓŽˆtU§!ñcÔ4¶†Ûœ›Ý¾zæÛZ�ú
+‘JW-sÑaÚXÓòaÚXOŠ@D@~Sf¬ÈÙN®\ipÇHÉŽ‡#Nݧ.Ì?'fÓvþ‚‡J4RÁðbI6­t¾±|k2­³Ða=ûõ“C.Öd:Q¡‰Lô…šÌ¤:ŒŒs^ Ç|_|UY–¨àwŸ<ÄW€D=ÃþâkLÅî]±#A€oG_ù1FNæ”ø —•ãDþ2X\ÆŒùÐ7˜|–Yà÷õ{R‡‰Õ^ÛÇk¤s5¶Q	”J=Õ"øNÅ	s”€«zÙÍ=X¥.ŒãÌ'—EÑeŠ�‘wÆÉé9¨jx…|fú8	¤_œT(3­Ïì¶)Þx7p2¯¹$©=�wþ©ÍE!HÐœK|§S&8nªz!gäâ<r�³îv˜b!U
+f}"3ž/l}-å=RB
+x2X� Æ.>óPÃݱ‰ð5
G¢vF©×N@¿Ž@QBUÜ@�°M
ísEÏO€Á´ —Þǃ¬ §IêùlÅ;ÄPÂ>W©é	¤¹´œÜ
+çJ óÛ³ñoÏÆŒ—
+€¤GÏŽñ‡’ÍøU:|g¼Ñ›“ÍÀòà)ZF!ïx×…¸|nLóY=Çò^ž¢ «äþÒÛ¶”\*É…ƒñ¿h�K¬�‚ŽÉÇvR³Å`x·BÝ´Üú³¿ðìûªº³‹g24èऀU�ÓÛ0€·wß�\G�òG˜E<Ün|bÛUuY,) 
+¢9d<ëBœ%¿~‘³ …ÔTÖÿAjž]endstream
 endobj
+1064 0 obj <<
+/Type /Page
+/Contents 1065 0 R
+/Resources 1063 0 R
+/MediaBox [0 0 595.2756 841.8898]
+/Parent 1067 0 R
+>> endobj
+1066 0 obj <<
+/D [1064 0 R /XYZ 85.0394 794.5015 null]
+>> endobj
 1063 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F42 597 0 R >>
+/ProcSet [ /PDF /Text ]
+>> endobj
+1070 0 obj <<
+/Length 3284      
+/Filter /FlateDecode
+>>
+stream
+xÚ­Ûrë6î=_á·*35Ë›Dqö)íINÓéIºI:³»m[ŽÕÚ’kÉÉÉ~ý%ëfù̶“ɘA q#(1ãð'faÄ"+íÌXÍB.ÂÙb{Ág/0öñBxœy�4oc}ûtñÍM$g–ÙHF³§Uk­˜ñ8³§å/AÄ$»„xðÝýÝÍíÇŸ®.�žnïï.ç2äÁÍí�×ÔúøpõéÓÕÃå\Ä¡¾ûþꧧëŠüßÞÞ} ˆ¥Ÿ‹>\ß\?\ß}w}ùÛÓ×O�,myW(ÈŸ¿üÆgKû‡Δ�ÃÙt8ÖÊÙöB‡Š…Z©²¹x¼øg³`kÔMÛ?-‹d¨fs!`‘8ŠOÓ%èúfsã¨Ovƒ ‚ÙD±fJhÓœIhZgb%³±™™Ð²HIåŽd™nÒ—¤ÊŠ|^ä›wÜ¢on´jÍ2†)ÇÌþÓ:+/皇
ýêàP¦K‚Tý¦ùªØ_Š8X¤~`�î‘
8’®UVIuð++ÂÎòÕ>)«ýeÕÁ-™"‡Àì³a(Sÿ-òæÊ(~å!OÙ¨ˆŠ4hħ¯	~wý„Zá{÷
Q0ê]åïÔHòò-ÝS»Z'µ2·´	€¾
úÄÊ^Qf|˪uqð˜ÉséçÝ&[dˆbyPàòVÙ¶
mïö³œ°ÜÆ! 9
+$Âàî_î?]ÝÞá6ˆÈ-,‹Ô·ò¢¢F²ÛáQ!3‚ˆ9hàöÓP²K?ãj6n­öøýýÏ?~Ûš»û'2QÇ8ü"•Ìm-tøݤɊZîœéhG³{ëžWj°x*é•z�;*
âÒoºÂ
\Á.S·IA<2mr­¡âÁÊ�Š-�{#˜;Éç5ÅÎI¼%e	k²¾wÒØÖÌÚFý×ü„²Š)ðƳùÑA�óx8ÇpÓóxÿ߬ša‹
x ¹Œ™–V·=åÀcJH1n]†Ð"�éÜ›9‘Œk.›�#5“H8‡±IÊrD@�dÈB©cïå@!…%�ûª¤vžl=t›¼S£Ø¡’%›�ï?{„U±Ùo¨êGúY Œ,õv5¢fVSEÄF¹KÙ¯œËt‰^ŒK�=´e@ÅÀ½vßÞ�,‹µ©½:zMT×áZÂ0Ë¥©—Ê«tŸ§ÕÈ‚Ú°Xrs\P|MŠ¯ÁÏj+î‰:ç€_–‡mºD-xí4BÞŒ/Š½·³Š
+ÌuíRåOÓ×tSì¶i^ш£¿�×Þ?‚=¡A«Øè�Ww4oGÛT‹bCC‹Vd§•rB%k
+V›Üýë#ƒÕ¦5NÇLâ�vZãZXWcOê°ƒŒ%º78Téiê
Öù®¾	¬‰™.ýÇ&ßÁ<�ÇÁÛ:sé,7Áº(+­siêÔ7>Dr¥
+	5þц뎆Ø€aH°1ÓǦ÷¸Á:ÇÈ`µÉ� #G'͵jaM¨U�Õ	sÐò·d¿DÿÓW0#X̹šf¤Áᤣ`&‚Sh‹õ׳ÛÉFFIÁC‹“y‰ædØzB	ü3â×ýâ¼DG.lÂNŸCƒuŽ‘ÁjÓJ¨¸P�QÂÖ„ÖXtfeqê†ÏCf5$“ĬêÝ#çl@ýÞ=–Iiƒmšä +«Ã†úÙ˜ºAŒjÝÕO^é%4CcÛe0X1�3~M©M1Ebø¯‡1'qõ%å+r
+ÃíEvûl›Ðżµç¾S¨¥$+í0CK/4h
­j1
+£ã«c}#u}ŸÇ’ul‚+Ï^±¯¨åžV°ñœöx¹�΄`,X(DïI�Š’¸»)hÞ»:bÊÈð‹¸
%S2ª¹íä¡HÁÔÝ¡æK¡ƒ‹kK#­!=ëLre^wÂ$4Ç
+¯×„x¨	ñ1­w¨+
Õh­¢u„ïmÝ,zZRpˆ:Ô½:8=üâ›JÛ×´‹áeuxî<Ëúœ&&Ö—‘VÚÞDÌt»«ŸiÐZNºr†pÑ
Ï?éÊÛX§]yƒåÊÍëtñÇ­³&©!&Ôgˆ7X#Ô»I*\դꑧ‡.¥­B„¶ß&„ù‡ÿŽ¯}Õ>s/?õVâÐb�ìÁ];r× Šàîå{^%ŸiÔ©NJ÷p?ðd—Å–ÚšüUé¹Éçc¤î9Úú†ªT unÜ,è
+?àn¹Øðì¬ñº¯çi½zA�äƒFžVoÅþ÷ÑOLú…à£U@ߥÿ0äî§n­âÔW#^-ßw©×ß›ú´£BQÄ8¤auô ÙG_4,øD�V•ÒÍ»V1¶±#êdo—¸±”B¢-_zšu‰ý¨:ð•›ä5ËàB«”ú9‡|6#¤àÒ"�œŸ²{.ðÛ¨ðŒÝ·°&ì¾Ær5ÿNÙ'l#*¥§	×H#„;§Ã1<A¨ëPv÷Rtm½Ê:Õ#™&?rHãAŸ=–w
Ú;bDÁZ
+©z³°æuì‡q\Ð…[^[Î9N¡�:+Œ½Âá×(a¿âÔÚÍ~¸WLðæ
°ý\;WÒø7jøÅg_zçL)i’±{2ÆÁ„~0BPËí‘tõ¸
+ÜI²HçËt“m3?Õ5ŒG!¤$1 “Ú×ëôxY¦y•ùïtj¾;r6åkêo²Lë òkŠÍþùÚP®…�òð\bÙ˽ÿÚ—¯©C@g—”T@Ã�ÂË
_�k6Šivüðs:öØ`ש¦Ö©—¼%ï½×ßE÷»¬£k8Rnœé‰O-8®ñgø÷þ—?Ã<~£ª
•IÇ+hô]‘ª™r¯Êrè‘8“
+œú�õÿ
xFo‰endstream
+endobj
+1069 0 obj <<
 /Type /Page
-/Contents 1064 0 R
-/Resources 1062 0 R
+/Contents 1070 0 R
+/Resources 1068 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1035 0 R
-/Annots [ 1068 0 R 1069 0 R 1070 0 R 1071 0 R 1072 0 R 1073 0 R ]
+/Parent 1067 0 R
+/Annots [ 1074 0 R 1075 0 R 1076 0 R 1077 0 R 1078 0 R 1079 0 R ]
 >> endobj
-1068 0 obj <<
+1074 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [284.2769 238.6772 352.9489 250.7369]
+/Rect [284.2769 435.3027 352.9489 447.3624]
 /Subtype /Link
 /A << /S /GoTo /D (access_control) >>
 >> endobj
-1069 0 obj <<
+1075 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [282.0654 208.0269 350.7374 220.0865]
+/Rect [282.0654 405.0176 350.7374 417.0773]
 /Subtype /Link
 /A << /S /GoTo /D (access_control) >>
 >> endobj
-1070 0 obj <<
+1076 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [299.7586 177.3766 368.4306 189.4362]
+/Rect [299.7586 374.7326 368.4306 386.7922]
 /Subtype /Link
 /A << /S /GoTo /D (access_control) >>
 >> endobj
-1071 0 obj <<
+1077 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [184.7318 124.0912 233.4785 134.8756]
+/Rect [184.7318 321.8124 233.4785 332.5968]
 /Subtype /Link
 /A << /S /GoTo /D (dynamic_update_security) >>
 >> endobj
-1072 0 obj <<
+1078 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [330.7921 92.1656 399.4641 104.2252]
+/Rect [330.7921 290.2521 399.4641 302.3117]
 /Subtype /Link
 /A << /S /GoTo /D (dynamic_update_policies) >>
 >> endobj
-1073 0 obj <<
+1079 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [401.5962 61.5153 470.2682 73.5749]
+/Rect [401.5962 259.967 470.2682 272.0267]
 /Subtype /Link
 /A << /S /GoTo /D (access_control) >>
 >> endobj
-1065 0 obj <<
-/D [1063 0 R /XYZ 56.6929 794.5015 null]
+1071 0 obj <<
+/D [1069 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 450 0 obj <<
-/D [1063 0 R /XYZ 56.6929 446.1352 null]
+/D [1069 0 R /XYZ 56.6929 639.3701 null]
 >> endobj
-1066 0 obj <<
-/D [1063 0 R /XYZ 56.6929 419.8946 null]
+1072 0 obj <<
+/D [1069 0 R /XYZ 56.6929 613.6661 null]
 >> endobj
 454 0 obj <<
-/D [1063 0 R /XYZ 56.6929 296.3851 null]
+/D [1069 0 R /XYZ 56.6929 492.1088 null]
 >> endobj
-1067 0 obj <<
-/D [1063 0 R /XYZ 56.6929 270.5629 null]
+1073 0 obj <<
+/D [1069 0 R /XYZ 56.6929 466.8231 null]
 >> endobj
-1062 0 obj <<
+1068 0 obj <<
 /Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F42 597 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1076 0 obj <<
-/Length 3397      
+1082 0 obj <<
+/Length 3040      
 /Filter /FlateDecode
 >>
 stream
-xÚµ]oã6ò=¿"èË9@ÍŠ%R¸§ínÒKqÍö’w‡¶Š-'jdɵäÍú~ýÍpHZ_–Z´E˜93ä|Kü2€?~©#„‰¼T‰dQÀ£ËÕö"¸|†¹o.¸ÅY:¤eëëÇ‹¯nbq™°$ñå㦵—f�Öüòqýãâý?Þ}ÿx}µQ°ˆÙÕ2ŠƒÅ×·w’ÐÏû�w7·ßüpÿîJÉÅãíÇ;ß_ß\ß_ß½¿¾ZrqX/ìgÜÜþóšFßÜ¿ûî»w÷W??~{qýèeiË˃ùõâÇŸƒË5ˆýíEÀÂDG—oð0ž$âr{!£�E2¤¸x¸ø—ß°5k–Ž�ŸŒ4‹„Œ/—€,%ÆO9`A§¶T’3‘ÈП²=e‡…§œuµ,«&ßûóP"¿lo; î±F¨‡-ê<L˜PQ�üDz8±‹d±ÍÒ2/Ÿ7‡‚žó
ò3!	ᬳøÄv�–€a¤‹–×´cºjòO�7՞͋›þ_Uf #a._,Z�54¨6–Ëtõ’—Yí§vþ-/,ßû+®Ù*ó¤Rb0RmãˆI¥…åðÃÝ"Á}ó€©
-ÀyË›—±`"Šµ=Õž}ôn@‚NGRY\ô0Z-ÞYöª}C£mjÙ{Êz¼\ñ°CÇ
Çqð�ö<È	&Íéf y#ìʘ…JD¿‰ÛH°PÄŽÛÖ…¦r—Z®-„.N;K#­!=ë,�±7LBÀk‚j‚^¬³Mz(ê†fÁÇ�H¸„ £ûì(ÊŒ¤œ)	¾¦å
-¥r	’&ÐMíÝ>=^ÖYÙäK›[Z¾;ÎÂ$Dh‰²6
ƒÓE0\ä— �ïE˜I¸pPžêì×�¡gÏ¥Å#ùéa—ÖæŽÍDáù°…Õ4;vú)s~ƒSäñÍoJ?o©�Ò>
[Y§Põ�ɲw§Ž¨fa¨mÜCÉ[¾œ/‰tÛáBÆç&¾Ø?5_Œ—/ZûòåKÜ/t•/ìœü
¢aMã2µ5
R,—Ûl[í�ôH‡°^>)d
=:N­`¦ÞQ6r‹Ž�´*st u2Z”¨eu/koÒW{F�ûì–"oñÑæ…¡„ðV(¼…'MÁ‰]U×ùS‘ÑT¾!($¬9æiAð¶?‘‹õ>·¥L½`80à§,+	Väå+Åd‰jRÔú+iKl
-˜�ÌÕvTÅêt»+œ‚8¢'Ù3§s«â°vHi|W·rtUOÊ”c—§–ÙÈ–N€¶J?;aìlà‘ªš�Ïž6ÖùÀ㱌£Ìáwƒ°Ã%8U%¦éz¬Â�°.Zc‹¤Cù!˱¼^íóÝéD«±B¢X ¤³®ÿä'Œ}«�’ƶˆ" „OTGDšÜ?_Òà¾%¬ÇŸv¸/	»:‰…Í,3Þg	\>ãQ2sêk†‘án“©�„š+	µžÑ°Ö„†9,sCY‘=§(ý²ÂnQ_Õ¢2Ádš¾C¡ßQ´f±®é0ðèÚ*ÂôÙvJLãÊT¾»]AYz�øú%/›VÌD<ª-äjK©ÕâÖv\L§Éî0Œàša,]ÒqÌê±°ÁY$.M«è·_\HÛv•aêhÙ€
-9wÈ’D÷šP6~¤>¨¦Öë¡w6¿½²˜6n…Ýþ=ú˜z*¸Ï+W�°8	¢åjaM(—Ã2…Hµ‡Œ~=L›9‹¨ü$a�5B¹›6Ç,Š é�¦ÖgF�v„‰N‚ÛØù”WB`«	”ÒñoR.ü¤m>@“FuGj§»Œ¾ä¬jXÒh®\Ýcb5Ñ\¥[îÊ‹EU½š."ò]Ѥ«òÀù%œq,¢º=œ�©µ…=ØMž.·þ\áp’RP˜|ΚÆ/)+¦eýFA³&c>]Œ
g±Ö®2t9ôÈ)˜î¼¯þªCaé§X[XžRVû-æ&rÇad«æL(Á,ÏÖg
 Œ 4Ös…cë¼
x¬–
àùŽ´ÿ507IÚ!��î7ÿ5âÚ?P9ÀmR�]Ȧö9v¥
ôŨN‘éÃc†YTOæ¬
ÖU†åAbü*Næv¡qK\Û 
-cÛÍ{£IrÖp8‹ ~&
§�uÞp<VÇpšíni�sð
+xÚµ[[sÛ6~÷¯Ðôeå™
+%îÀìSš8Yw¶É®ãÎîLÓZ¢lÖ©•(»î¯ßƒÅ+˜L“étq.øpp¨àEÿá…â(¡š-¤fˆ'˜/Ö»‹dqcï.°Ç¬hÕFýx{ñÃ[AiAÄâvÛšK¡D)¼¸Ýüº|ý�Wÿº½º¹\ž,º\q‘,¼~ÿÆõh÷çõ‡÷o¯ßýróêR²åíõ‡÷®ûæêíÕÍÕû×W—+¬8†÷‰Ÿaâ…·×ÿ¼r­w7¯~þùÕÍåo·?]\Ý6¶´íÅ	5†üïâ×ß’ÅÌþé"AT+¾x†‡a­ÉbwÁ8EœQzŠ‹�ÿn&l�ÚWÇüÇ©B\9â@F[Ä	´™XH®‘ „ZÞ>d`ÃËM¶MOEíò£±ì‡·\µÞQœHj^üîpWçP)D#¥¤ö¨ïÍ|4¬̬ÿv‰—G×.Ó:òâórµËvÕáÅ=.±Zf›Õ]‘®Wµ{š¦uz—3X+šH° ·ó%Í€‡UY�SÕFÑÅJð±‹ÆHsN¬Šuú˜¹EM­˜ûÓ.+ë#²¯$€Uˆhî¼õ¡~È –²åSZœŒ
+<=<hÕF9ò�E�e¼±Éa÷}±3¤±$q¹
jDpg×aØfëv$̲¾K³ãú�ïÏ­¶~wµÍÐ%„…ÝuÖ¿'”ÂV ÓÁÀß=‰H“ZvLtƒ‡û…kÜ´Œmð3ÆçuÆ®Ïf™ ‹Â}•(�7¸žñzƒšQd8›Qdša\ M¸˜aXaX@ÙÊŠì>5Ö¯ª²xPÍ`•ŽË ù¢	Øç2é)`ã;MôòS’ÐôÞµ­*ÐRËt¿/rÆ Û†øû
+:m]¿?›xX8zH�®+uœþfi6þðcpNk{†1KÝaw#™ˆ�†„]Õ§E
+KìAö¬v2×éé˜yY�ŠEU=BuzWnp›æ…ãÑaŠq—Sé¶6©
+V**:€FDwv
+3-åsÍ£¥ÓöÅ=XŸ›Ñ2Ýe®Ë�¨5�«Ôgu[T÷näS“߫Ó

+hâЙ�ÂÏj×Ûtn^@@¾öÊî¡ ò!fI¹ì…[:¡²¹þïÛäš`“o܃vò{ˆd–G×á($m\g3ÛˆÙ�ZžÖuÿg¿é²›è<„—ÞB‡Ö™
[Ò
û}VzÚÃã'B˜ÏŒdk!H˜€’œÓS³«|o'Äþ^#ÛK¤)	©•ã6NÕÛ@ÞWW÷›k9K&7êg2“%·QÓ§Au6N½Û¯¼;ûÛ‡™û2£DƒÑ¢ã6Æ¡* =5šíc‹¯WNå¦ZÛ+��<V­"-”²ç+'e®%p²¼nˆ¸™‚êiOSHcÁoqGŸA?{�±o—þ±²;w›ywç»l5¬±TP@U£

õèxZÁ`"UG‘¿Vý¶ÇÌéi¡¢RÊÉz˜*…˜V¤mq¤nàqÛ³Nò¯㆟ plP\‹Á\ÑJ˜%	=uSÛP¯…Šp/ FW+ßã䃜‚פA�¨Ò¥ŸÉÝÍ´uù:·/1‹úüá‰"þˆôštŒŽÐãgÌÎûùdæ–X‰ø:4¨E†³EYH%EŒÍ-Ð4h:`T§zÀAÅ\Dõh@CEºÔ0Lmkò�ضgpù¹zš‚Z#.oÛc`€Ç­Ìúùü02³
ס?SœyŒBB�ÌÄ¿6*½€šŽ£äƒê^‹UÔˆ.]ú	$¤ì)ó�à¶Iý¨¡R5¦éÇÀi’w¬ŽòÏãgìÎûL�„+º
4£Æ`®8	1„í™úôŒ‰Ða\Q^›
+o𩃀ZœÆ$6˜�Èîgiø(Ú2¿ËΚ÷—r}!ÄôG.P"¹jûÄÐQ3ûs~Áç
ð"�{ºÁDUèÏe�@(=ÎÚ¨i65(#qº{ÌFø¯%ŠÇå6¨ÁÝK†”Òª+ùÚxZ²PGAK™ûReÊs{½=M‰íçÔwæP•äþÞ	ºý凿ŽeîB”s;aÚ¾B†·ŒÍ¶«yý);Ø›¸uziKl@óû2]ù[
‹EUïÃÄé|WAÜE�ùûæýÇ�W¯]ÛÌau&N}¶_HL6׋k�‘I7á=W]W;÷´É��öÛ9>„NíǪ ÀÝ¥gàöå¬LzVºó�ûûxÿ½ćB:À�«™vXpË5Mb¢'JÎ�¸…Š�8 Œ²ÆŸ«c
+w¬óõð’VbÒö¨
jDƒ›9CØ�¸£Âõvä‹äÊ„Æ¿—u/~¾w?…pÕ"üÀ¶Ýç2Óz̲½6§~(/·æ€§0t8~CÃo*ho}ï?Á=äë×»Nýw^öæ´ÛgGz‰‘J’Þýpûnjäã†DL‰ðéú¼8­{¡ž+8$ؼyc“`Ù¿ui¸Ö¸æ|“<I<“<™ÊDy×MÓ.€¬Mùýê)-òM^¿¬LP:ÀÓ°æH*`UL‡4T¢›Bò!€ym-¾Îá<iË°
+gáQÿ7 ¸ƒ¹¢G6¶)™9²Û¨íÊ}¤k¥êÇêtXoY9¤„Í(Ñ F´èF<R	ï©ñuˆ7aLO™ Èý#UˆiÊ;öÆxð3–çýüª#¡æj:¾
4£Æ`®8ñGŠÌ\:·@ÚyÐÄB­žÄ€xP£KAâJ4 ¡Ý£#ÉhW�oÆ:oLOÅÁ4B<óÝÁ†ä³%1ÞxÜòÁ¬ŸÏ:(¦ÓQ÷L\‡þLQÊin~ƒ2êZ iÊ�ýVXÔ«Ï	vB"eò®ˆ
3T¢Ë8‚Õ´£Å×a\Ä–>å8¢‰¦ÊÁá#0mÛ¥œ‡ÇMÌú”£(a‰Œú¿
ŵÌ5ók?8…ç~MÚ`b¿ô³˜È2�E:wqS"@JŒ\ìѶß”rã�ÎÝëѹ{=Ú²wþV�ÆMïÏù…7zBÆœß`¢*ôgç[¸†ãÈü„Düü/ÎÿŒ‚IDMQ0î»D@XÖ2(e´¯yóO
+†ªÿJ_“Åendstream
 endobj
-1075 0 obj <<
+1081 0 obj <<
 /Type /Page
-/Contents 1076 0 R
-/Resources 1074 0 R
+/Contents 1082 0 R
+/Resources 1080 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
-/Annots [ 1078 0 R 1079 0 R 1080 0 R 1081 0 R 1082 0 R 1083 0 R ]
+/Parent 1067 0 R
+/Annots [ 1084 0 R 1085 0 R 1086 0 R 1087 0 R 1088 0 R 1089 0 R 1090 0 R 1091 0 R 1092 0 R 1093 0 R 1094 0 R ]
 >> endobj
-1078 0 obj <<
+1084 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [259.4835 478.4263 328.1555 490.4859]
+/Rect [259.4835 683.3704 328.1555 695.4301]
 /Subtype /Link
 /A << /S /GoTo /D (boolean_options) >>
 >> endobj
-1079 0 obj <<
+1085 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [387.5019 224.9363 456.1739 236.9959]
+/Rect [387.5019 430.1364 456.1739 442.196]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1080 0 obj <<
+1086 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [381.9629 194.6431 450.6349 206.7028]
+/Rect [381.9629 399.8859 450.6349 411.9455]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1081 0 obj <<
+1087 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [398.5803 164.35 467.2523 176.4096]
+/Rect [398.5803 369.6354 467.2523 381.695]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1082 0 obj <<
+1088 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [393.0412 134.0568 461.7132 146.1164]
+/Rect [393.0412 339.3849 461.7132 351.4445]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1083 0 obj <<
+1089 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [255.0796 103.7636 323.7516 115.8233]
+/Rect [255.0796 309.1343 323.7516 321.194]
 /Subtype /Link
 /A << /S /GoTo /D (boolean_options) >>
 >> endobj
-1077 0 obj <<
-/D [1075 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-1074 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F58 627 0 R >>
-/ProcSet [ /PDF /Text ]
->> endobj
-1087 0 obj <<
-/Length 2798      
-/Filter /FlateDecode
->>
-stream
-xÚµZK“Û6¾Ï¯ÐQS"x`öä8cï¤6N2žÔ’	Ò°,‘
-IÍX©ýñÛ`ƒ)¾”ʸ\c’à§F?>4Ø‚Â?¶P!	#-t$‰¢L-VûºØ»÷7Ìc‚´Qß>Þ|ý.䋈D!�›–,C¨1lñ¸þuNnA]¾ýñûû÷¿<¼¹Õrùxÿã‡Û€+º|wÿŸ;¼{ÿðæ‡Þ<ÜÌ(¶|ûï7?=Þ=à«ÐËøöþÃwØáeDèÃÝ»»‡»oïnüþæî±±¥m/£Âòçͯ¿ÓÅÌþþ†µx�JXñÅþF*A”¢nÙÝ|¼ù¹Øz[ýtÐŒ.ÀW}JÑr aDE‘Zh‘PpQ90KѤ]¯ñ.NýM²M³ü–™¥-°¡|²x“Ê$KIÏzF4cáBsC”alD[m*;íå”ý+KmP”q™e²*.ûgœ2=­@ƒРí.Æ1ÐÒÑà~ã:ýú�2-$¸“Òâd„t…i	^c¾º
ÕÞŸQ¸,lþls¼Iv;¼ûdíÁ¿¯MŽý«$Ýdù>vQÀxÄ›ò))ðÎ9«êÈ,_ž’Õ¶®bÿ‹?|ßëãþ`×Nep#†Rç#F"¥x¥l™�£�†µãÄ5‘&TÞ°sl‚ß(å;;à
-`ŸTÍ/ÖÖ
S[s.½ Z㚆vÅ(ïB£ˆÒÒLó®�ç]ƒªÌJ¶Ás¼KÖIy
-’´� —ì“à
-	¼šT£A
èÑ!ŒâDÂíèñÑÚ÷¬m±Ê“ƒ'‚óÑf H‘&”˨Ò˜5*DÒJ$ý¯ 2ÈMFKÚ–àË|»À›‡–é
~Æô¾\´}u¶Ò¥}¦.u’0h•˜¡B
šÑ£'Ë©1N>¹ÒðùZ¨	òÕ¨jüåqZll•‰ƒ";æ+ÛO|€×zF‰5 E7ñED©-þõêÄ7bË…&;­&ˆG
�qÄ:æN¯ÆÏÞ—;F<ÝSIKb8dµÉÀ¤Kƒ�F¨b|†,
-5÷8k`©Á¤éØ<É�Ÿ±¾/÷o°FBAÚdT‘áúÊD£B—Δâ
jÂÉCɦs!aÝÑî¥Oœ5 L·.2D@¢îjóE‰3œq¢ÈÍÜ	¸­­èwjüŒúr¯çŽàîb:ÂP*s5wÌÖÌD3Ü©QNÙcaƒk³Ž7wÖ¶º �G
hÓ!O$£œwÕy�©jƨKM`3fÂqúh3Ì.çèSãg\З{=}$ÐÎd(Dì�Üvå|%añPÏ,Æ”Ó5ÍÊdsã,´)nËíÓŃzïÖÁ°
-Ž´èvÿ:©¦gÄEß!'†	=J‹3ê>:´M˜ GƒŸ±¹/÷úö�\Ä´ïÕàTvmv‘¡�Â.œY/5¨žk‹_J¬.Ú¢ê
(Сˆ+ÿ`½ÚÕàPdxÒ`¿bã,�œŠLÇÖ©$RãgÌî˽ž%FÃÔ‰i÷7¨9EzÒ&×èRhPJÉεPœ«Q®Ç}’¹Ýä¶x
-Êdï¾»9'ìãσͺÌO}lÝد&¤ÕPN›Ð lèÖ!�^w�¨hË"O[wÓ¡­kèSLB—,d¦£ØÅüŒŠ}¹Š9eF?)¨s¸›™§ã]£f4éK›æ
Ý_Ìp¬…šàX�ª†÷ç
›<Ûëdã Ð°éÊö?…Àjøå¤:
j@ŸnÑ
™I©°«ÐëÔM³f]ÖÝš˜É²[@]N»†O–Ý?ゾÜÑ�’ýo’Læ.[NÅ¢AÍ(Ò—6IGWïÑPÌ”amÔ8”ëñ“=A´rp@–Ÿ†Ê0¥åtï5h ÷nƉR0ÇvºòõŒ¸,Ã`½ ™™(àŒŒ¶	“e˜ÇÏØÜ—;¶¡oòBj1íyAažêÚ"LH	õ2›Yâ5¨jB<îÊ$ØÇE	+¡9èÈå¢-w€5Ð}—°áP*wúz\ZqÉæRg‡‰H¨CÕ1tŠ5~Æä¾Ü«s‘€hÁß´ëkÐŒ=YM"ºp*ÐvdÚJ£óÞ=—DÂlN)]~wJã}²Bý9¬ãÒGî§l—¬’ÁÉ€‚lWSܪôû÷2¬öïáR‡,/ÝŽ¨TËò%ÃfX§Û<�ËäÙbÃÞ–OÙºÀ FuÝÂJ¾LnÙ2ÝbÃj—Ø´ô($ÜäÉö©ômvt°¹ÛŸÅÆuc<+»Š6Ô©v_i½ízÞëö¥á*KÝ&éöˆ»ñ~«ô�ÓÔ¾,s³CHMóik—½ØûÈr“ÊzVu'
-r¬›Ì×¥•Åƒû¤áçlPŒûb¯爤<ºbY�a€kj_|ƒÓKðz„CK„<­ânüÏöþÜ
->á
ƒ
-­n4$NQ»®FIj@æ±�€µquˆã,Ã7'¬_Ôäª:ÌñýÚ¦‰õmgêø†M�‚0wÖøp 79¾8
F!ùŒÄã$ðŒ>[ûÆ6¢pw“ã‹V€ 5
ˤ-Áw’Iwʦ‚!
qΡMˆ@1mQâKP¬ˆ·þmâ•,’-F–.Ä»0‚IáSTRÖÃaµ;®ëóOgOÃØÁËãÇû÷~PùÐຠð‚®ý«‹AæpêÏó§¾�çw\úoêšÒ5uÄëÓOµP7®Z|s
!°P�Í&L@5yþÖ=?°µduaô†„Ÿ§
ÍüÈí*“oº;aóÞÆi’n7Ç>#UݬÇ*¸“íX#B¶üï“Mqx2m`>SQ?�˜õƒ¦êzË"¡ÚÇ�ìbç¨zºézv(à…³5Rȧ"ÆÇóÄ^å‚F›cbÊñÍ6c‘á’’¦�ŸÝ'²AÝqkG«Ê…Â@
ïŽû–aÎçZ�LÊNÙß(t¤£
½4¯ù ÅÒ~ŽÍlÇÁ
ÍÍàpà
¶ÅøèsÁ¿ÚÉÄý"ÃBje¯×Þ®
‰ï#ÍJÏ'.`^‹x—Oø£�}Ž�;†¦ÈÄ'Žúú”½t²G+�Óú$\r.âwYö©øÆ8Ôݲ·^¸¹Ž\¾¹
B¨¡«ü�·ÿÃd–ÞaBrwçtãž\2/O{~ºug$!ÿ@c1vÂUÀÜ-¿dÀŸwÒ?>ýz>,5Æð‘õwi@ˆWªZ\ðþL¶¯úÿ
à Žendstream
-endobj
-1086 0 obj <<
-/Type /Page
-/Contents 1087 0 R
-/Resources 1085 0 R
-/MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
-/Annots [ 1089 0 R 1090 0 R 1091 0 R 1092 0 R 1093 0 R 1094 0 R 1095 0 R 1096 0 R 1097 0 R 1098 0 R 1099 0 R 1100 0 R ]
->> endobj
-1089 0 obj <<
+1090 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [352.879 681.7691 426.5323 693.8287]
+/Rect [381.2254 182.5173 454.8788 194.5769]
 /Subtype /Link
 /A << /S /GoTo /D (tuning) >>
 >> endobj
-1090 0 obj <<
+1091 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [307.1508 650.7179 375.8228 662.7776]
+/Rect [335.4973 152.2668 404.1693 164.3264]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1091 0 obj <<
+1092 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [334.8268 619.6668 403.4988 631.7264]
+/Rect [363.1733 122.0163 431.8453 134.0759]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1092 0 obj <<
+1093 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [337.0185 588.6156 405.6905 600.6752]
+/Rect [365.365 91.7658 434.037 103.8254]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1093 0 obj <<
+1094 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [364.6945 557.5644 433.3665 569.6241]
+/Rect [393.041 61.5153 461.713 73.5749]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1094 0 obj <<
+1083 0 obj <<
+/D [1081 0 R /XYZ 85.0394 794.5015 null]
+>> endobj
+1080 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F58 627 0 R /F42 597 0 R /F57 624 0 R >>
+/ProcSet [ /PDF /Text ]
+>> endobj
+1097 0 obj <<
+/Length 3167      
+/Filter /FlateDecode
+>>
+stream
+xÚµZ[“Û¶~ß_¡GíŒÅâFlŸœdíºmœt½™N'ÉMQ»¬%j#R»V¦?¾çà
+fÝmFª	idGžÈH2!úâ|(
+rCóàë¢ÎåcSî+šØoP°�n©Ž˜PDx�RCI8”›Ä=\VCÅ¥Ž£Dʸ§8-î4¸í˜ Ð_0Á˜/™ o•ÅàI¤‡")%"Éå¼+<Ñ1F¼PŠh2øÌ#±C5ƒDO…;Vû¦ÜœÎa�ƒƒ/íî‰&vïù[ð(MµìoÿeÈKxFJöN Š¹Ôg¡&R	ì¤é):µ@Aç1ßCMÆi¤™”ó¶—LƒQ¹F‘"ct:��Ä€b�jdÚÕS2‚ˆd‘‰Õ¢ËzG4!@"2ŽŒŒe_‚ÿDœƒí5èóó(�üŠ‘jzºÎ%$OAí1ß—£ÄèHêTΛ?P]dÄm6'%P™ŒÍÌu¨f0ç©pÇ]Y­ÅæPÔ«¦Ü¯È»ìóä´¥n§1­Ÿ™-�œË5¯B šÐ¡g¶$‰b£u_	[ž:Øâ [œCLÁ–<á¦'ØÄýÇ|{CaÄx<r·‘À*?ïoOuA’1·yŒ	�JéKëPÍ`ÌSÙðþ¼¡esØïVërƒ7дU^ÔãdՠǬ8�jBž^š‹!3ÅqÒèëô`ÕÈO-Χ<h¹b}ÅçRž§¿`‚1ßs)��B+Çl9ç‹@uA�1·Y8Æ) 7N/”Ù.Õy8*ÜñSqoÀ
+ð˜„M$2–xoßü)ècËïNU¶+sþ§ÇuÖ8Ÿý¸ß–y9YNðVQª¸²ÝÛ•Ø·?p©���ûCSã]¼lž÷4�mÁ•UÖ”OMìŠæa¿®é a¯÷‡¬jÊk¾¬îi"ß–EÕ8*‚åýCãæö´ÑcqØì;š\½àæhõª»ä j†ºÀÑ+�c2äïûÊ7—ù¾ú…1q´¥¶XÓìÇS‹í±Í9×'Ìc8Ûn÷Ï+ÚýÌ�•)_—³j=Å1gC6q/_,«Õ#úf2÷ÆPÂxo#ΩCZÔ�Ö§b{ºæœnÀ›�³L
+Àƒê’JA'‚»i
áÀ*ãêg+�rÄù6;Öà=8Í.Ÿ÷‡O5
­GqPg;¿š�h�9o¸&ËGRâ©ÜÝÊSq¨AGw‡Â+"2¢á»†®VŽìPÑЃ˚Á@˜Ø“@!‰
¼ve]‡H·8‚ë±4YuêZ;ßÛë:$½>Qe5ÆQY
2&â0
+
+,_V…£† j,Í~KŒ÷àAZz~ȵáŠüKò$.ÆxßCV‚b�rù
/ë™ÅÊY]�GÌò¸µ\aÙ*
+³%
+Z¬mœ$ äž"è
´E–?ôx¸é¼u �.»á�Ö×EUn®ÅŽ›Øx*ðsÿ±`É섀A&&ôµüXÐ=Ùlí&O4IÌqp …Žƒ`¶›²
)Áv�Í—ï6DF0Š6‹†-ˆ‚Øüv,ê†A°:»w«¥².ïÉó0þ…ŬA÷ô¢šTÖ.I•��‡|{\“õXÇÒ<t¹ûðî­‹*·
+ˆ�Ë”tYÓ˜Rª=]7ǃ«ðD§ä#m[úR�il”HlÓ
+žÍIñîSÖ¢IÀÛ7†Ä{BpÙ¶º[`R1üˆêÞkyIÇÅ@ÁPißµ1
+meèßB2ŸTLòжŠac”¹$­èò”m!oLµ>†GR†·U6Õ�wÂ~
ÀED¯&ب(5á�€¬µÊè"t§F\bå÷rˆ\O…ŠŽŒ`:proaÖ,¸EOZÛÍE%G¯ö9¿ÀŸ—<Ò2Õ/ù9›T&ÒL~Îö¿=åÁ~щzVzŽ
/7ôOôY­‚R0Bs¦*¼�î?(0 vîRs>Í00½‡o>gy³²Íq �;|œcx'†¹®WBÒÀ›Ð~à
õgR»SNù͇ÅçcQÚWÌáÞºd D‘gÛþë¾Ð³`"p/¦/¦r�D{Œ?<IÔ~Òè6B½/£±ŽPuýðe¾EIgõ5áb� �KšF
+ßš_J	}ÀøS^·ˆÀM§å¾_‡‘óo]y‹
+endobj
+1096 0 obj <<
+/Type /Page
+/Contents 1097 0 R
+/Resources 1095 0 R
+/MediaBox [0 0 595.2756 841.8898]
+/Parent 1067 0 R
+/Annots [ 1099 0 R 1100 0 R 1101 0 R 1102 0 R 1103 0 R 1104 0 R 1105 0 R ]
+>> endobj
+1099 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [374.6372 526.5133 443.3092 538.5729]
+/Rect [374.6372 737.8938 443.3092 749.9535]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1095 0 obj <<
+1100 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [292.0276 495.4621 360.6996 507.5217]
+/Rect [292.0276 708.0059 360.6996 720.0656]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1096 0 obj <<
+1101 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [319.7036 464.4109 388.3756 476.4706]
+/Rect [319.7036 678.118 388.3756 690.1776]
 /Subtype /Link
 /A << /S /GoTo /D (zone_transfers) >>
 >> endobj
-1097 0 obj <<
+1102 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [460.1655 433.3598 533.2211 445.4194]
+/Rect [460.1655 648.2301 533.2211 660.2897]
 /Subtype /Link
 /A << /S /GoTo /D (tuning) >>
 >> endobj
-1098 0 obj <<
+1103 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [362.144 402.3086 430.816 414.3682]
+/Rect [362.144 618.3422 430.816 630.4018]
 /Subtype /Link
 /A << /S /GoTo /D (boolean_options) >>
 >> endobj
-1099 0 obj <<
+1104 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [293.1435 371.2574 354.3435 383.3171]
+/Rect [293.1435 588.4542 354.3435 600.5139]
 /Subtype /Link
 /A << /S /GoTo /D (options) >>
 >> endobj
-1100 0 obj <<
+1105 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [288.6803 340.2063 357.3523 352.2659]
+/Rect [288.6803 558.5663 357.3523 570.626]
 /Subtype /Link
 /A << /S /GoTo /D (boolean_options) >>
 >> endobj
-1088 0 obj <<
-/D [1086 0 R /XYZ 56.6929 794.5015 null]
+1098 0 obj <<
+/D [1096 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 458 0 obj <<
-/D [1086 0 R /XYZ 56.6929 323.2894 null]
+/D [1096 0 R /XYZ 56.6929 544.3772 null]
 >> endobj
 774 0 obj <<
-/D [1086 0 R /XYZ 56.6929 296.7987 null]
+/D [1096 0 R /XYZ 56.6929 519.5953 null]
 >> endobj
-1085 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F58 627 0 R /F57 624 0 R >>
+1106 0 obj <<
+/D [1096 0 R /XYZ 56.6929 144.0934 null]
+>> endobj
+1107 0 obj <<
+/D [1096 0 R /XYZ 56.6929 132.1382 null]
+>> endobj
+1095 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F77 703 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1103 0 obj <<
-/Length 3157      
+1110 0 obj <<
+/Length 3026      
 /Filter /FlateDecode
 >>
 stream
-xÚÅÙr#·ñ]_ÁG*%ŽqÎá·õZ»V’Ò&]‰¯‡á'&9\ÎpåÍקݘƒ.×^W¥T¥
�ÐhôI9ð''©�„ÎÌ$ÉLd…´“bs%&Ï0ööJ2Î, ÍúXß̯¾z«Ie±Š'ó§­4i*'óåOÓ×ß½úÇüöáz¦¬˜ÆÑõÌÆbúÍÝý·ÉèóúÝý›»·ß?¼ºNÌt~÷îžÀ·onnï_ß^Ϥ6V

Í$~|wKHoîþ~{ýËü¯W·óvËýcI¡q¿ï¯~úEL–pº¿^‰Hg©�¼@GD2ËÔdse¬Ž¬Ñ:@ÖW�Wÿl	öFýÔ16Y�F6UÉŸŒã“Í¢X+íùt›+8OO÷×éô°vÔyÞçÛ¦¦vµÇo2]ºmé¶Û—ʵ{v5ðEÛtún[ðÔœ>W×ù³£©«œçÕ‡¢€�§Ãzý‘ñò¦X¹å`.oåz‰˜6+¦\íÜ>oÊjKDËÙ<˜IeÖ* r³qË2oœ_ Íè(~�4¥³
-†AöM—Bªkjå»Yå/•gmë¦ÜlfNI†ÌX¯N9
-›‹2¥“Ë,µ"2*•',õ+×
m¸¨¶Mîn“>­MTÓ÷Ø.€åt
�NëÁвÚàDÏ›H[™ßiž3šïôd2‹dœd¼ßV™�LK©Oú–Ì;4}>äkÐ_Û_-•‘ÖFõVYI
¯Ñ{"¤›2&ÊR䄬ãÊñ¦un¡ºD*¬Å¹{*I”*‘´”üAÙ¾‘Tp-:
¨µ[?]<dtìIJ�DÆ&fKÁºÉçø’Ú¤Q"’#_ò�Í
-
!¢­šó; yhq3nHjÖjf3©,Ñ­§:` 4:Jµ¶“XXhdòSÒ’|™áŠoË‹fæ½	xÏ	è1·ÉQÙâûŽSP±ÞòâH«5°ÓúØ!MCL@š@añcͼpåö™„�¬gðNøE�¦(ò5û(Õ‘Ó‚šÀ‘«mÉŒ„á1%$#xóé…×GFéŸñ2$1„Qý‹ø²ËE1ÒyѪ¼Ä‚¥Éq± ^2p·/ª…¡Ì�H(Û7$Ð鹤2øìÐâ«“ÁQƒV+²/rÈæôñ;š�;ùÁ›­žXµxoL€n¾@‚d
-!²QæO• îjþ,
ÒðêckÉ0ã¼
-F¼wpJV™íÆO%Ù7úGý„8ö.úË„§“ÇTGq
-´?Ÿd˜qV�‰Aâì%h•Š¤øžÄ˜2“pñí…Ê,î.GèB±å™‹ãt]âE`{¡P`õr¬Ç:]¤•¡ H™3º(Î"0hŸãQC`2}¬�àI«3/$ݤF_|yRg'/ö[òþ!@®8dñHf¢)dxqð¯ÓBˆYèùZŒ}á<¤
-KÂ÷ŒŽ6 À6µŸÅƒœ?fLlMǘ¡³ξh�ý3ò4SuI%ãáÝvyÐjÓ 56UÝ]a†Lßz]½°†@œVYT[¦Ä‘²šîÆ`¬HRCÊ/Õ,– Þ@»âR!'çqVÜ ²€MÙˆþßDª{´ûH#jŠm½ŽÛHšv
-•h4_¶h½ÌG{Y@XÉc˜ÎÇzøÀ�¥/‹!”vv‡Åû>ŠÁ¿cøÒ‘¡Ž¬ ²ƒ§¸ÇÀá[÷B$x©Uþ�É/\Ø9
¬^F^n{ßåf·v·mÎ–Ë „ŒZ
²ÐÕ7½)ª«0–[v²>�
"*¹ðî嵕ØqѼ(l¯P뤭�Á6»j"é󠦱œQª¥óµ*Íeí
-F÷õ
…s�Ãë¬
-û÷ÿ‘Cv¢.\Ž
åRðÐw é€j0½–ÔÕžMGof¯ôPÏ+Å<A
+xÚÍZ[wÛ6~÷¯Ð#½ÇFq'¸onb§îéqº²zöÒö�’`‹[ITEÊnö×ï (Y²ÒuzºÉI·¹|˜J8ügW…ä…f†3˜,Îøàú>œ‰Ès™˜.û\_�ξº±rP°ÂJ;=ôærŒ;'£é�Ù»o®¾]Ï/¥á™eç—ÆòìëÛ»÷D)èñîãÝÍ퇆Wç¹ÎF·ïˆ<¼¾¹^ß½»>¿J	¨8Å¿>Þ]ÓÍíw×ç?�¾=»u[îKp…ûýõìÇŸù`
+§ûöŒ3U83x†ÎDQÈÁâLÅŒV*Qæg÷gë&ìõ†¡‡Ä¤¹`B5¸´’)²9º,-ÁaÙØT†9kÌÞªpêœi“£è•dBÕ‰Þä=Ñ­˜SÊrS0«¤
+²®æÓI¹ž¢t¾ºÑª7 ç¬�
+·€Œ£™'ž¼?©„ýj‘Gže¹ð&’93¹‰<?q.ý|z~©¬Ëª†žÍfüo?iñ%ÏÚšˆïïî©÷x.\ÇùßV岩êå¼yV.Ã
@¾9+„ÍA*‚ÆÈ°d;ëh™­Ï]¶™{|QÙ¢l'3{žg~I­væ©N8ǾZ>q³š–­ŸîrH:p–a|wý§r^MÉ»�Óký@Ï°&6úGeû«Áds´™¾¢ßf<J;¦ÀÁ�³ÎŠß1%��ÇíÑÂäZò”=J…ÇrAV�Ÿ?|†-¢¼(¾S¨(ìV¡ØC
+ÅV.ö“º�ŠÄN¡Hß™¡%‹ß×æ¤^¶~٢¥Äg{Ð=lÁ¤èÜ£šÂ¸ªýtà|F0®µë#cJñ<°tí´:éyB/<ö[ÅýW�Ë:˜›Ÿ^�	ÀC‡3ïœz¼	Þi²fVoÈ}
ˆŸ:ºv’C@«lèyX.BsfŒ3Ÿ%�{ØŒ5z+˜»ÒÀyž}Äž.¥F 6�Rtbl?­‚S‹,¡Æ¢nZ¢lÿ°™ï"†ÈÊù¼~Ž�<XÔË8Ó/þQV~}Ȧ"�8MàçT4K€7@W\Štyf±AÓ÷,ˆ»ß5
}Û¹ûLG7!•ÍÚs‘ÕÔGÒf´à) |Åí«B½ÎÝg(PÄ&Ïx&›
+Â:qÍfå'UPyèFõRß…eŽ[T$˵Òa¾¿T9Ü{Üh
+êŪnÒiýÆÃȲ�¼`„˜b�$G‡#âèe~M÷‰°ˆÆ
RyªàIÖmžË:H³‚2ᆊ$º‡‘Éûé;ɹÈVQ^~ýx]´�7Z
+"ô®›Êç’„ç=Z�ößÎöÓ2g'b)'ð‘<]4Ü%Ò7€t0kºz!/iêu¼:z#›y[­æqx�•Œ2Ad@‹ª%�…Wº‘ps«¶ZTÿ‰V87kTaë8ýo%úýÅ!�%Üß	öâm¾
ûúæÂ;_®Ç‘™ÄIíqtév]%„A%®›–‘6î½ßO ˃Ä’p"ˆ¦](ÒPçúq@�a?žNü—ý
/ãé—óâyïý¤íªI–!dü/’¡ f—zgO/k“‰ëÄN4¬
0-vw/��e•�+ž›ÏEÇj/æ=*
+½¿'Ãs¦0ŸxU׉�¼œ
w3
4?Ýnª0JWS@¨%U’ú�NÙ�wLvK/.‹×Ø_÷�Øà¤+0WùÓËžo~~²œF­*Ê<gðïˆFºª¢tœ9Él
+<‹LÉ3凳õ�)”o;ªºÍ²
+˜¨(hÅgš[NC$ S¾ä*²­ÖÕ¢\W¡”¯›ÆG†q¤ìDED
+ùÏ�X΋ƒ,d^{jR¤ˆÜQ"qb£—Óáë¬~ÆÏæuˆŒlZi’4ï’‡ëaÙi
+@ê>U©–‹ðý eZ5éË‘ÍÀ{¦ó6süCá2-f•=aà¢È™Ès‚£Éò0q¥5á‘R=<Ršðˆd’ÐHx}Xò&H‚—½äK©`Ôð €¼nëI='Ö‡r�vwÔ˜SÁòî¶\&4Ú»ëûÓ×\O$_
+šˆAQÅ™œåÒœÔ\®˜´9AÓð=}ÔÇÿ®°î�¾)in䌚üQ‚Kæ¹#—De‘4
+%ŒÏvÖ@$D�Юla
%MŽÜ&�`™¾ ¥Q½¥K6Bv÷ŠòzbùRÚû¿ùl�3žïþàá•ÏBq&µ³¯6ÀIJ˜½˜ù¡î>µõ9ôQÈö§Á-»ôu´M…íýÏŠ)ÒWÈ䔽Ïõ€ûÇÃkÄ#ÝŸ]ÿ
î‹n©¥>á½6æ´Le,ðcK¥	÷},ÌœN£ïR™Å…Ï?½ŸX¨ìöŽÁ¡°Zamï×ÛU„‡’—„ÜÐuûý�5Ð}s}À}ßÇ+z¯JÊ•Ø
+8¾`Zd“îdVd5&òª+øø§ŠóÉF—ÚQÖ8N
+Ï9ûÊçÒí¶ÞvRÍ9}m„E™3ZJÜùà¤d?÷×\Û_´Aø£œ“GÊ2	×À‚p®P6/ªÊ1ãdÇÕÛú
Ý%h8endstream
 endobj
-1102 0 obj <<
+1109 0 obj <<
 /Type /Page
-/Contents 1103 0 R
-/Resources 1101 0 R
+/Contents 1110 0 R
+/Resources 1108 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
-/Annots [ 1109 0 R 1110 0 R ]
+/Parent 1067 0 R
+/Annots [ 1114 0 R 1115 0 R ]
 >> endobj
-1109 0 obj <<
+1114 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [341.1654 116.9088 414.8187 128.9684]
+/Rect [341.1654 318.5226 414.8187 330.5822]
 /Subtype /Link
 /A << /S /GoTo /D (the_sortlist_statement) >>
 >> endobj
-1110 0 obj <<
+1115 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[1 0 0]
-/Rect [434.6742 116.9088 508.3275 128.9684]
+/Rect [434.6742 318.5226 508.3275 330.5822]
 /Subtype /Link
 /A << /S /GoTo /D (rrset_ordering) >>
 >> endobj
-1104 0 obj <<
-/D [1102 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-1105 0 obj <<
-/D [1102 0 R /XYZ 85.0394 626.5613 null]
->> endobj
-1106 0 obj <<
-/D [1102 0 R /XYZ 85.0394 614.6062 null]
+1111 0 obj <<
+/D [1109 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 462 0 obj <<
-/D [1102 0 R /XYZ 85.0394 327.2191 null]
+/D [1109 0 R /XYZ 85.0394 528.8329 null]
 >> endobj
-1107 0 obj <<
-/D [1102 0 R /XYZ 85.0394 295.1135 null]
+1112 0 obj <<
+/D [1109 0 R /XYZ 85.0394 496.7273 null]
 >> endobj
 466 0 obj <<
-/D [1102 0 R /XYZ 85.0394 295.1135 null]
+/D [1109 0 R /XYZ 85.0394 496.7273 null]
 >> endobj
 643 0 obj <<
-/D [1102 0 R /XYZ 85.0394 265.2577 null]
+/D [1109 0 R /XYZ 85.0394 466.8716 null]
 >> endobj
 470 0 obj <<
-/D [1102 0 R /XYZ 85.0394 208.5998 null]
+/D [1109 0 R /XYZ 85.0394 410.2137 null]
 >> endobj
-1108 0 obj <<
-/D [1102 0 R /XYZ 85.0394 186.2886 null]
+1113 0 obj <<
+/D [1109 0 R /XYZ 85.0394 387.9025 null]
 >> endobj
-1111 0 obj <<
-/D [1102 0 R /XYZ 85.0394 99.9723 null]
+1116 0 obj <<
+/D [1109 0 R /XYZ 85.0394 301.5861 null]
 >> endobj
-1112 0 obj <<
-/D [1102 0 R /XYZ 85.0394 88.0171 null]
+1117 0 obj <<
+/D [1109 0 R /XYZ 85.0394 289.631 null]
 >> endobj
-1101 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F77 703 0 R /F57 624 0 R /F42 597 0 R >>
+1118 0 obj <<
+/D [1109 0 R /XYZ 85.0394 109.5064 null]
+>> endobj
+1119 0 obj <<
+/D [1109 0 R /XYZ 85.0394 97.5513 null]
+>> endobj
+1108 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F43 600 0 R /F77 703 0 R /F42 597 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1115 0 obj <<
-/Length 3081      
+1122 0 obj <<
+/Length 2983      
 /Filter /FlateDecode
 >>
 stream
-xÚÍ[_sÛ6÷§Ð#=S±øðÞ\ÇNݦŽOVgr×ö�é˜YÔ‰´�ܧ¿],HQ¶I&µ2çvZ
-'ƒŠñdÊæ‹~®ÂkŒáªLp	Úsµþ²–et”÷¤PQ¾Z”YžaCGÜñª¨©rŸ.ïrê«oÒ@¬Öù¢ø“1‘WDðŒöcüüH*¯u‘`¦Èô‰“Ä­V×pmUyçÇ,‚ÐèƒEéË!iuØð2Ön¥
-à³ß0eóE¯´ŒÕq¢ÌØ€~ƒ82Ÿ¿aé$h2,-ª‹[_K¢º$ʲ¸}žåØÓžÍbªÌoPó±ÏKm™™ˆ.J©O
-j’ð±Uçñb/œ¶^ÑÝ­Š�–´~XV ¹UVý
-I¿*—÷ù&|§›ÖÐ)²ø°_üÈðh‘.ü‘‡êlVá敀͒g'V²¼ZlŠ+Ô^lÞ”XaѲ\}$RÚLÒÌ»¢ÊU¾»
-Œf–…ËÞS;�­h�
-rvN¢À½KƒGÖC	 RIÖ
-)¦dº¡ëìâ™ßÀókÕ3ç÷MðÑYcŒƒxO�©Ñýg·Ë’}�Ýrì1.Ò’ÇÆ�ÅEv*lˆ‹Žà0�Š#CïM8U;b“œ�³Ï93À¾Îºö
-Ýk[†¡Zwƒ¯8}'­‰…IÆ”J+‚
bÐNE³|½L^˜Å%õR€z›È†z
Ô¶ÖŒE}C5�Z}ãSã;_
-Û¯a&‰º9„­N	2"Þëi#Š
-¥¯€ò!VŒÚnâ¤íŽn²$�-¿bÁh	¬gcoò’˜	âß/áÃ;|VG*Å¢¦„ø­*W5£×@(®|^]5>X5)\Å:>˜5wËçåÙûÏÞã3˜Ëêìÿe,íŠ-Dý°R3eåsKÁ&£øôkÿrcû×+`p¥ëáÃó:‰ñÌþxE=ùÃÎb!�h‡uÿ?³Y¦tendstream
+xÚÍ[_sÛ8ϧð£2ÓpÅÿä½eÓ¤›Ým’³½w½ÛÝÅVM]Ëg)I{Ÿþ
+d—£€­#¿/¬G¯]΋I2t)Ž ¼
Œ^úÙ¬ÈBdôfCìð¨ˆCРwºXŸîÐCk�ûr%Ê2'Ró>IoØ=pÁ´“}F®ƒÕ’?õ �J†ùb–M‚¼Mj°Ò  §å—,ˆè¨ ªE>!µM‰ñXÔwD�ÚjŒô[o
+A‚ªn@f
A%ÇÄã†Úë¢&"Æ›ªëí6ý|NÚ&Ùì>’XÇ›•�„§mv´×y]çËX½ƒþM9ÃQÓøôµ<Û€ˆj{ŒxqÐ3¸š¤€æÓHá…Öæ­z·m€�Ø£­Ä}Õ¿Ç^V€3ïIâLÁzKŽõâøj<ëHeÚ«#÷õìèú[©‹9èëÿ¡,â¹><âI‡T[ÓÝoÝi¿R•À³á=R•†9%,Iut|BµÎ4…¦y^?–ËÏÑ]æˇbÒÈz2Y—þPÐ;D¢}â5mj:ÄÛš÷Î`PRéÀ¬„b‚D/¢
Ó™Œ_l†Åb5…¦ nÞCpPÐ�ˆÀ¯ß^9I	ßÜ(=¥/C=Þ£µÂý–žì>KOÒp
+‚,º¶¬ ZƯ”5ù×¢ª·¿÷L0úo9]†òe$ÖkÃÞcXRÃ!µõ·Eˆë˜\¬OÔLÒJÿˆAa=|šÚ0©£çJ_+Ö`Û„Ãmû*-}7"¥ˆªz܈Ԓq
�e"Ÿ6ÒXeì*Î…N8
5­:(:<�%v(Aš`�hŠŽ8,–KEGЃÁ¼#?Ú�êõàãNÓ^ûÎû$—̦ª
+Ká™P†Ìù
+ó>°Ï¸'Ê€Ä+�ô·X€µÇ ÍÇ<ç˜.Š
¸NâP
8Ÿ8°ÈÛ¬žìô-½Û‡›ŽRI{Ño¸l‰6€BÕãüeª™”š ãð*èF„<où¥©T©4iZHäªr^Q'Êz
Œâ:Ô×U‹USÊb‹Ó挹#!yö tç&ê¬iµ%°/E}‡|6ó™nE	Ç™ðGŠŠg OüiÝ×ùQ}é[¬UÌ!`…øašÜL̪0†hÊ“šža´Ä6DË08#ø YqçÝ\ß=�à
+®øv8Q1&bôV-
+w/ï—Ô�׳xêð�ÍŠ-Y]ø
„ø·]w
 endobj
-1114 0 obj <<
+1121 0 obj <<
 /Type /Page
-/Contents 1115 0 R
-/Resources 1113 0 R
+/Contents 1122 0 R
+/Resources 1120 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
->> endobj
-1116 0 obj <<
-/D [1114 0 R /XYZ 56.6929 794.5015 null]
+/Parent 1067 0 R
 >> endobj
-1117 0 obj <<
-/D [1114 0 R /XYZ 56.6929 579.9063 null]
+1123 0 obj <<
+/D [1121 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-1118 0 obj <<
-/D [1114 0 R /XYZ 56.6929 567.9511 null]
+1124 0 obj <<
+/D [1121 0 R /XYZ 56.6929 75.7394 null]
 >> endobj
-1113 0 obj <<
+1120 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1121 0 obj <<
-/Length 3408      
+1127 0 obj <<
+/Length 3273      
 /Filter /FlateDecode
 >>
 stream
-xÚÍZYsã6~÷¯Ð[èªC
-6ÃTžR•–
- ­µ/ES
-e¤ Þ±Ÿg<wÎÛ|0kÞ¥¬÷Nʳ|iÀ¾"@X³¥cƒN±µ¢¡›.A_TN¼^£ÿ Í&$ñ
%äŽ{CCtóŒ-b  @òwüL
-òâÂþô
Ûe·LƒÁ*«? x@9œ�Žœ\ò€ø¶ˆFÇ c㪅ƒ Ø’/
Bë®ByR�°·ßÓÕ
-E9þ@ürKM§«ÃÈÎ¥8çØj[¸ NX_ádE6/«Ýïö4Gµÿå.½¢o“‘Cƒ„N�q,ÅÏãD¯J‹À†S
¥¼b•‘8ßÆ=¤Ùz’÷¼;XIE>4Þì&õq3jm[s°pU›US—ù¨ý¾îsô¼¹·Î¹h9}ZÏ8÷Ú
-2Ôñ]ÓË}ˆˆ7lqm‡ï
-
-�˜÷wÁÄNoˆœÝ7¥ã
-�Âb‹ªÙÃ'àl-Ch4Q<fä
é5Tè„‹Í�Hlwg/Ð)Êö7Lñ¸­J\©p8‹_Ýì*ÞBo�
zëÁaØÓ$CÜ­z°ÈÛÀBc„`~ïØq=þ†$õ8 x¨`»Þ(û¬¤è3Ón±¨‡’\wpW
+xÚÍZ_sÛ6÷§ÐÛÉ3K
+åýýìç_ÃI«ûî,”ÎâÉ*a ´–“õY« Ž”ò”êìíÙ?{†ƒV7tLMQ(!c5™©(ÈàñÓª(Ò0=šö¿å%	'3!Ç�€Æ…À‹‹~Ä!+Ð{DqŠÆ�Ò ISÑ?Rã‹H™Rñ$�E •:ë_ƒ!'Ó»UAÖº®Ûb[mpl²l–&àPÃy>OvÔ’OÓ¤A&ÃôXú'Õ‘hdq=§¥Q†˜78¯ÎîŠ×oA/ .’©9ŸE‰œ~qƒ5ÝlÏE6mÚfÑTDY8JaÚ"'‚iiÌ×wD(kú¶¨i,¬Ë|†J…¢vÄÞ)P¡ÓÐÂ^RÀãÖ÷êl”¤ÓÎâ,Xºo¶T([K…UiÛf[.LEõM·Ý4¶€…ÈTNç]KdbxÈeé]“¢‚¿
gåÆ–U;Ãe¨TMm±}(¶ÔRÖ0|mÚ²©‰ð¾©SF¡šÁ2x�¼¿ºŠÓ�¤P�€ýSâLÀÌÂxçv“Yßx “yYçÄéÀ–RZ„žÑiÇzÄçyÙÞqU‘$Ž?�¥qÚqX�õ3Ž›hDYš¹Eûö±
+¿„¡üÃEè½*LŽ£†8l7NàÒie¬åòÝÝ÷Ð*¨ßnUºÝQlAÒ¢©-$½¢n©NJ� h/žçEŠ@ñ¨†3¯Š±ÜG~�{…»}EØÿ]°<±ó´¾S([ë©Œ¦ê¢È™†ÎuÐÆ–lȤ¦ÎÒ*²Â.¶å¼Èƒ^¼4ÐJfƒýÒ¬C–PiL.œ²C 
´G”¯¨rª¸í­†{—kî^•ë²%"%sðÂfÇm
ÍB‰)hw¬/÷�3›wņ¹”õÁL³Xà_	€¬»•ƒfñµ¼)\
ŽéÂ&Þlpÿ Íå$uí
+0Oéã¡ &LT"
BÂ$ÿ
+Ÿ÷$nÓOCâ«rN
+ª—L7ôaÌš†ý¥Rþz˜Taìw'’BЦ!¼—´Gæ–j¬„‡2?žôöê%�¡Š^ŒGŒž!ïö±*¸Qª2[ª¸àöÁ?ô©
ilÀwm Šq^N.¬ì
+¶y<7ÌýTóÈÎOÊ"A¨DÈËÜ\Ò€/8 ‚÷$qú¡
¥3 ·1lÊxºn0£I˜š<Xè�§À篩èö… ÛaD‘ª RUÖ.K@# ²n¹¢”µ¬;’`vµTLfk`ëÍ+ž¶³q±�»Õ.ÑÚÓˆX&
+,GЊû”wåfÆ’œ.
,Ú£V>{ŽŽt‡A,\s‹!>ž£‚¼ˆ‰YîÊv5è�•©ß¡zÀ8œ�NÌ\2@|¢Ñ1èØøÓÂQ´´—¡uByráÝþ@·+å*|�ÒRÑÛê8²óQœslÕå>¨Ó
¬?á˜ÜÌKÀ]�.ÖŽZîjŸ^qo““C�”›ã˜N¦;¦W¥C`î€R^0‰Ž‘ØßÅ=¤¹ó$ó¼?I‡|(¼Üwê"3*u¶8¸®‹uS—;f¡¼À}_÷9zÞ<¸Í‘øhœx›„}Z7œ{ݹÚø¾éõ>D$–øl‡ëˆ…FÌûû`âº7D6M饤°ìÐ4ø6›e�.ŠÓŒDZ†Š¼r±¸W‰«îý*yiÃ�lUæ�
+ǽxéîÀ®Òý$´j,Ъ“a-&"·jç�3–A0„Æ*Œ88@?|òØK}r]à¾dŸÙ
œ`Û~PöY{HÑg¦1ÜâP%¹öè®
+Áû9çHàÐŽœs÷€¼¡k€¤ ™žVË`¿°Zâ0È@Úg#Ž‚HFÉ¡gøÝ¡Në`Ïý©àž(ÿ™N¤q "­Ý5$	ñ‘O”€ƒ”:úð¥†NñÁ‹œn1`ã×!,¬Œ{wÀgëš›q’zœ…~ÇÂ"_z2+ºþ�è
+WMEBÕ¹{²€BÝ­çtUñ­$]¾ò“€õ—snœ
+?|•gòœ¡˜=BCîÜ3@@p¸®sBƒ‘®ßœàAw‡wyx`Ž@Är:Í–í
+çe:"úŸ±Žùendstream
 endobj
-1120 0 obj <<
+1126 0 obj <<
 /Type /Page
-/Contents 1121 0 R
-/Resources 1119 0 R
+/Contents 1127 0 R
+/Resources 1125 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
+/Parent 1133 0 R
 >> endobj
-1122 0 obj <<
-/D [1120 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-1123 0 obj <<
-/D [1120 0 R /XYZ 85.0394 552.4093 null]
+1128 0 obj <<
+/D [1126 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
-1124 0 obj <<
-/D [1120 0 R /XYZ 85.0394 540.4542 null]
+1129 0 obj <<
+/D [1126 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
 474 0 obj <<
-/D [1120 0 R /XYZ 85.0394 225.1659 null]
+/D [1126 0 R /XYZ 85.0394 445.1692 null]
 >> endobj
-1125 0 obj <<
-/D [1120 0 R /XYZ 85.0394 200.3885 null]
+1130 0 obj <<
+/D [1126 0 R /XYZ 85.0394 420.4669 null]
 >> endobj
-1119 0 obj <<
-/Font << /F62 634 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R /F42 597 0 R >>
+1131 0 obj <<
+/D [1126 0 R /XYZ 85.0394 234.9227 null]
+>> endobj
+1132 0 obj <<
+/D [1126 0 R /XYZ 85.0394 222.9676 null]
+>> endobj
+1125 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F57 624 0 R /F42 597 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1128 0 obj <<
-/Length 2798      
+1136 0 obj <<
+/Length 2992      
 /Filter /FlateDecode
 >>
 stream
-xÚÍZ[sÛ¶~÷¯Ð£<ãà~é››8­:�“ã¸g2§éMÑ6§©CRqüï»À%Q¶“8s2ž1@\‹o‹€Ø„›(M´ãnbœ$Š25É—Gtru¿±Øæ$5:¶úùòè_¯5Ÿ8â4דËë�,K¨µlr9ÿsª‰ Ç �Nÿûöüìø„+:}=ûrLHŧ/=}wyv�:6ýyvþ
-K&/ßž¿žýòÇÅ鱑ÓËÙÛs,¾8{}vqvþòìø¯ËߎÎ.{•‡ÓbTx}ÿwôç_t2‡ÙývD‰pVMîàƒæŸ,�¤DI!RÉâèýÑ¿{�ƒÚÐu&F	
-[3”íß·øZ,ÍQú¼
z°ð°7îü#Á+îŒÞè‚;@²Êš®Ì×°}Äï²<�
ðAº5…Ðõª^{{	š¤¤;Èö[äý–…¹�TÑHI‚Ȩĺ]gØ·ÄMï1BM¯P4t®c&[Üe÷0ß­)áUž‘‰émÝv0ƒ0#�‰<
-ÊÛÒ¯…Ö3ˆE ‹=UðÝmYý�E
<Æ“@1å?½žþ;Kiìx¿
->
%«¬l°Eˆp�ä�ÃmjÞû
-Ô"$>ˆæ (›FIHp”ë¡ùŧ,¬.àÖK�šT@çXØ»_üŽ4Ä×ÔÁ�ƒPzk†ë2)Ât°fÛÔPX¤·ÅbÅÜ·]±l£
-ð¨eYÅîw·Eê3™ÄE¼UMÑj8©Qê˜0øÀŽócam(‚+“@.˜W -êVÌ‹øis�_Á^�`œ…¿åU"zŽo.7}®]�‰Š¼üH)O#cú‘Rómõb£¤%&«¦¬›²‹ƒ{aíL½ÃH©uØ>Q;(È’z8Ïë»Ô0*ø<|¢LÝ (̳x|ÛÛf˜{ÕsïÓ†%7ŽâÏ°ÈF&’\Ø©°iÁÌ'@�¦³\\Ü— :Î)Cÿ½¹†¼G…æ­_>+dŒa6Æ_lPÆî9ÄIvÚ
-Ÿ
+EÅ·ŸYžbb(­1Mkn»aX{*Ûç®Ò°¸1–G�f]äizÀ]„“„ú;<$^ËuÛ�0 7À×ulï`˜q
-wp
-
‡š|Ûä<ŒÌþìx,$1ܪwØòVI8ÁZ"X\O»è¸„Žèð'ÀÃÜd8òóâÞ͉1B>†�†Ó³rî
+xÚÍZKsã6¾ûWè°º*ÆâI‚¹Mf<‰·2ž¬Ç©šÚ$Z¢-V$R+Rãxýv£$%SÏŽS›Ò
 
àëºR3	?5s©Hs�ϲÜ
+'•›Í×'rv}ߟ(s��G}w}ò÷·©žå"Ou:»¾ÑòBz¯f׋_’Tq
+dò¯÷—ç§gÚÉäíÅ�PSÆ:�¼þáÕO×çWÔ‘òÐï..ßPKNÅë÷—o/¾ÿùêÕif“ë‹÷—Ô|uþöüêüòõùéo×ÿ89¿î·<>–’÷ûï“_~“³œî'R˜Ü»Ù=|H¡ò\ÏÖ'Öá¬1±euòáäŸ=ÁQo˜:	“’B€ä1NÖLáär‘mNªuµ*¶«:Ù}I庺[vTmËòÛÃsÒ©�]eÖ
+DŸsP“²©vûýßfÅ}ÈÙ™6"WÒß
Í“@‹«4Ã�:‹g:Ë´Îyߣ貊J:!eng™I�Ç2
0~ü(~|ýA¼»¸ço~ˆnN)‘;§Ã�‹ËЪT.ŒÌfã®W§gÞ(•
+¦>0ÈC·^åÈ_'”b�Å+B£Ô�x½©Úù®m«¦Þ_òÝG¶øå¼Ù.Ú‰½£	²"·Ê’*0`‹“EÙηÕM¹ÀO“7ͧfrس.ªšÚÛrû©Üòœ¶kèHÔWÕ€îºè¦°¿àqE?·*¹	÷‹mÌŸf*ó’z©uNÔm؇b€Ç³ï—4MØ®ySw°gdºQ�PlŠmWÍwp{ðwUâ‚X
ðA¹w„0õ¦Ù!¿ŒŒTîªO%wF`°^k¦õ«t’6F$y»vW¬àÚR`7QbŒKnˆ4Ln¸R¬î‹8ïÞ‘ÈA@•I–MÛÁ
+
+ÌŒÍ3І’ÚÛ
+u¡íðK'@…š»†ºeUÿNM
<¥#Á«+úÄ}âwKžø°	2
-›¢ÚR#‘0É¢è
+dŽöqx/+ÐK�`
�ÃF
1ú¾¯ºe\e‚{ÄþUù©ºb-.´[#jÖ%E½ Æ^üø›¨†ž&0j`*äf±ÂoŽC=û¬†„
+Ëe¹Ú0™‡¶+×-o¡ìÊíºªyúý²Œóàd‡¸b_-Z«ñ¡†û6¹ÑY˜€ªk@„Ÿ‹^Ñ‚(–@-°då=ŒhVÔ±(W §Ûú
+ü‚²æ¬Ðwt†%‡©Ön€Eå¼úUJWÌÄ•âðýíñ ¸K*6ÛªÙV/øE½0õc³ 0|}Òî mD˦ãs¶ÔßÅ�¼¡rKŸD3ešÂé©:‚Ƕ4¶è€Ý›®\ Lg*Šéx•Us�J6¡Ÿõn}SËâpۛόL“‹`\r¾— ›ÏŒ!~÷ÌÅ�°oQ}ÈVX¶aží/
¨xúl™$Ÿl
ífÍffo}V†	GÖ¢·nù€ü׆ûÞ†ošzQÕw¸ß\ó1¼Mt×Áæ`Ô¶£Ï⎮B�š»â1·ÕlrSÌçy
—‘d]þÁ4V´‘»`ø°«ß4Ÿß*™üÔ‹N!>µ4|ÑL�ŽÌ1µeñ	—Ô9ñ57m³Úu%}­Ë¢†3Ó˜_µÎ¨v‡÷@Á€»ÝM½â�ÄrÞUqÑppô¶T
÷{Ojd$°�^?°ƱzMÉ++›Ö¬lÎÊu¶ÞPc™ÀjÐgYrw¾61´6TF�ÛtÏEfcí&.KÚH¶œ÷tѱŸ–Ž|ñ¢´Yt¼Ö»¶›ðpÀ½
=åAÄC\¦ @& îv©?é¶mæUÑ…Ûìõ«±Ù̶1£1Þ¾|õî|ßΓð GºnÚ‚yU>2ú>¬ú6°,%ýKýƒ*1Õ)ƒÛù–ƒ$°DÁgXÊ›&\}iéÄ�¥þñ	pµº¯PäêÑ`^œïè¨ñVÈðâw¹%C½ÅTD d²¢Èê®&J–Õ]Ýò`A�/j¸‹‹`™áz`S�GëSÙ+j"S’óü\öë›ÑÝvQó¬¸Z8>!жiªº­3aWn8iAô¢øˆÃ01…à0óÙÌb”èÔó²2:.SÙ—uÓ³FÉŠ‹µã™À‘Ç .UÓ±v¡¶³Ž.…öìqœ'æÍ�ƒ
Ÿëâ½NI�ŠO”<…8ž
�Ø›r…ç…;•ÏÆ[ùºÓ!Ž*À6Šõæ­Èì¼
+Ÿ*½ïŸTœD¬ËŠ#ŽQf±Ã(3z¶óy¢ä�Þpuòl)ˆŒQù¶ÁÊN¡¦…r Drì:ví0³yu$š*LÐÚÇùSÃùÓe×QàÔ®¯|F¦ôš¼à,éªu¬5T®(dƒZ@+͢˜QÊàW®ì#·#§?KŒ¦ò¦ê¢Ý•w�
ðAÎæ†Ä’�ÌÞÓÎ’]]uíþò-8§uHœêL
Þ~uª^åu±­Bø‰40¥tÌeåiWœ9ÉWŠTLw¡6/ætpÌ+¶xwX�3ˆ3Ub²™)-›{ª¬šÀ’Ô2†ÑCº¼ÔM9ZhÛn›!(2	¡hðI`·êÇL‹ª�¬'hÅ™'z*X­šû^Hº%­Á½˜Hl÷5„Ž‡ÒÙïÓü»mÌûÇGKÊß… ±Þ{)øOSó,PÿËÃT2Ÿ©®l§í³Þ{r#2™™/|5
+
,6-¿ä	+Î8¸¹â™Î”†šQGƒÀ$äpa«4ÒŠž?¼‡›Ö‚e‰\³Éª© ðå�s†�¶1ô24UsJºH¡.ï
+ÎÁ84–� À‚ÅW(s�’Ä>g¶Ô‘í)‹¸s}VªCFÎ¥½µs½6AµnÎÀê.Ïú'hC³ùñÍûw¯..ÑÈSë��ÃG¯	¡¿¥Ý®IКÝäëo¯ëâ�j½ãÑlúø!�/‹
.9†kH‰*@·mo'Í’Þ1}£x®ràôH¾NÂP–�ô>>¾›¯�„VB  •}Zh•`…ÿ¿;a1I‰7¸˜©
|0Iœ\ LÃÓJG%åÒ4^;j	y}ÓÓÐ@kd@¨ÑÉ=b $<ØŠé§6>è•áEy[ìVÝ�Õë%¢¼�ø‚™tzHŒ]Ÿn™jËî	©áý•(8�
+û‚R
n­WêI™È­€¨Âï½G®ìÌ$çôš¬ujÇw TbVÚ$¡ ä𻥒l™vìP}°‡ðQÕ#¯®‚�Ø?˜`[ô‘ÝÞûÒQ± kŽmœlœÛ8Éga{QdŪ'Ø?
 endobj
-1127 0 obj <<
+1135 0 obj <<
 /Type /Page
-/Contents 1128 0 R
-/Resources 1126 0 R
+/Contents 1136 0 R
+/Resources 1134 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1084 0 R
+/Parent 1133 0 R
 >> endobj
-1129 0 obj <<
-/D [1127 0 R /XYZ 56.6929 794.5015 null]
+1137 0 obj <<
+/D [1135 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-1130 0 obj <<
-/D [1127 0 R /XYZ 56.6929 726.9349 null]
+1138 0 obj <<
+/D [1135 0 R /XYZ 56.6929 756.8229 null]
 >> endobj
-1131 0 obj <<
-/D [1127 0 R /XYZ 56.6929 714.9798 null]
+1139 0 obj <<
+/D [1135 0 R /XYZ 56.6929 744.8677 null]
 >> endobj
-1132 0 obj <<
-/D [1127 0 R /XYZ 56.6929 546.8104 null]
+478 0 obj <<
+/D [1135 0 R /XYZ 56.6929 645.1992 null]
 >> endobj
-1133 0 obj <<
-/D [1127 0 R /XYZ 56.6929 534.8553 null]
+1140 0 obj <<
+/D [1135 0 R /XYZ 56.6929 620.8596 null]
 >> endobj
-478 0 obj <<
-/D [1127 0 R /XYZ 56.6929 435.1867 null]
+1141 0 obj <<
+/D [1135 0 R /XYZ 56.6929 421.005 null]
 >> endobj
-1134 0 obj <<
-/D [1127 0 R /XYZ 56.6929 410.8471 null]
+1142 0 obj <<
+/D [1135 0 R /XYZ 56.6929 409.0498 null]
 >> endobj
-1135 0 obj <<
-/D [1127 0 R /XYZ 56.6929 210.9925 null]
+482 0 obj <<
+/D [1135 0 R /XYZ 56.6929 255.583 null]
 >> endobj
-1136 0 obj <<
-/D [1127 0 R /XYZ 56.6929 199.0374 null]
+1143 0 obj <<
+/D [1135 0 R /XYZ 56.6929 228.2785 null]
 >> endobj
-1126 0 obj <<
+1144 0 obj <<
+/D [1135 0 R /XYZ 56.6929 186.806 null]
+>> endobj
+1145 0 obj <<
+/D [1135 0 R /XYZ 56.6929 174.8508 null]
+>> endobj
+1134 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F57 624 0 R /F42 597 0 R /F56 618 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1139 0 obj <<
-/Length 2707      
+1148 0 obj <<
+/Length 2593      
 /Filter /FlateDecode
 >>
 stream
-xÚÍY_sÛ6÷§ÐÃ=P3!
-	ö-Mìœ:­�SÔ¹›æò@‹°ÅŠTD*ŽûéoP¤LÅé%7½ñŒ
-`±~Š‡?1ÓŠq™Å³4‹™âBÍÖÛ>»‡±7Âñ„ž)rý´ºøá*‰fË’(™­î²4ãZ‹Ùªx¼úûË·«Ëå<Œ6UƒŸׯ‰’Qóêæújñæ·åËy«ÅÍ5‘——W—ËËëW—óPÈXE @:¿ß\_ÓÕâ—Ëù‡ÕÏ—«~ËÃc	.q¿/Þà³N÷óg2Ójö
-úQ¶Øê §Ÿ2¢ö¶ìÜxÝ™{³§û¹Ð�ÙQÓòRjjuÙµãå[³nê¢}
¿RäuAë•s¸¥wûr›ïËêÑÉhA*¨
-Ûüs¹=8nþ¬‡ì©3Tª‹;Õò@R.¹o½‰+.7¸é'f®¸fQ©ohßfdhÎr&Ätɲ/f¬'"ýŒóvZ'ê9»•‹#MÊý›
ðS’že¤MF)D&ºÃ5©óŽÚŽ¸1û숂
ȼŠ#Ø£8Bèða¬	_ ûAê=,ÚºUÏ›qaîòCÕ�¿Þ(˜³xK‡NÊ żvgÖ%ns}"¨5Ýc ño»ÅSÈ¿§a¨Ì MÄs†!S"¥€æ•eQ	äïT—àQÐ�
FÊ%DèlrëvÐË©!ýáï–Z
-j‘r €úÇÀ?Êú„s¹DäAÚ”~e’píc´;o”Óá>Øñc°ãÃ`ÇÝY\àðéÕwÊ/ÁP»ßËŽèó¯H«"L§€WáÞOÇ0ø	–<�X—
ViÄâ,;cg
+ 9IξÄë”™ è‘E¨òÖ‰L‰…
ÈèÜÜ25Äá0'’h¾`ÎØÆ¢æp¿9at×8ëÖ-e>ïªr]Zl„ô>˜ÂJJ( à�ùœow•yAP]¥c¨>4>±‘|;�è£‚¸·\ÌqŒ*‡Ðó„R1!xÒ—±+5š®3Ï_óÝî˜ëœ/Þ~ŠŸ¯'–ÆÉ‘dГªÔÙiº²©i#w·±	
-lVaœècÝã‡ö�W¶bÁÙû²§ bgjfQìô€v)9ev4‹Q\F©ŸÈ6Ú;óŒNÍ3rö…B$‹°d·\1.çeýJ`GÈ[�?¢E?¹øÈY}¿ÐÄ‘$¬),~:Dõ°_{I*=–š@u»jNk¼øÛ»öÁvÖ††Ç&Mœ›¦uÃEÞåD3ÚájÿÐ0ÚÕ£Úûç)ö\‹µO2LÉÑ¢0”Ø[BU[þå®rè0Ð9ñD"–wÔÒ® cƒâ×ÛäŽs{,Ù-?YìÁsâyдd\YH9Ì
-E	¦4=yÌ>Îã
- 4ñU�u„,ë#„´3¿"r,ùÞ
ÝáÕ
-Ô¡4^yÙ•£#öG€XÛ{²£4uyõŠ‚KE=ú¤µCcÀÔn[óñà¿QÀЭ±_w g>ȧï#Xtþsƒ»š°ÉxõGi£?‚}ÔiMu7~ ^WyÛú:º0;\³öO…ôÎ'@çÓ�(ÓËo­vkÆŸmú}·¹ض{9>‰k(Úej9-üõðµ¶ßÕº:¦cDZ	¦ŽÏVásd#>#ȨÄ÷bB -¤´¸~õËo¯/§Jì-ø(‰ôU"Á'$@A/Ó~î°13J ™e±G‚�MúèL8�è¿ôøqäÏûÁ»ÇºË?ÿ8±/‰O¤ÉdÎIÓ'JKF¯	¡-Žž.ž
+xÚÅYÝoÛ8Ï_¡‡{��Šå‡¨�Åa�lêô¼h“^ê½.¶ÛÅ–c
²äZrÒì_3R–l¥iw÷p(P1äp83œ�ßÐÂãðOx‰f\¥¡§!Ó\ho±9ãÞ¬½>–&pDAŸê§ùÙËËHz)K#yóU�WÂx’o¾üè_üëüÝ|z3	¤æ~Ä&�Ž¸ÿÓìêͤô¹¸¾ºœ½þåæ|‡þ|v}EÓ7ÓËéÍôêb:	„
+µʲøíújJD—³7ÓɧùÏgÓy'r_-ÁÊûùìã'î-A»ŸÏ8Si¢½øƒ3‘¦ÒÛœ…Z1*åfʳ÷gÿîöVÍÖ13I%X¬•¨�%°è�+±D¦1U§,RRuF
Õ˜QCÁ¢4Õƨçe9	T*üz…_é·ë¼Éij>ÓÐä2Ÿ•íËÖÕD±¯ŠÖ’Ð~á7ù¢®–Í‹IʸÕû»õ±ðYE»níQù—mY,Š¶|¤ùf›/Šß9—ùÒpŠüU½£¥üK¶Ù–ù¼¨——:îiȽ@–j-�nb­ø†È†�)K’8r¤b–BzÝÞÜ€¥	”fBðÈ�¢Ï„à@œsVÝç;´:ÎÛl»-ª;ú£¨è;{wŽœBÊ�¥¡
Ï›ÜòQ)÷«lƒ£$õw‘øyS—û¶¨+Zý�kÞ®³–(
+²±öÛ]V5efé`ee6×Ú5{G³Ùri™6´`.ðP`-h¶h,ùb]€hKš½}¤ÙMgÑ]8G‡±W=}E˜ó!&Y¶Ûf#v�°)�Ó­,ëMV}b?«PŠ$òßÍoh@Š,jó]6ȱäþ´jwEÞÐ&ÚñìÄ‘fyp±¥…M¶Ì‡œÊ<kÚ ­ƒMÝ´¨€8™­®”§šâ®2¾^w%47§ÃµIpy:,[E™¯­2ׂ3»ânÝ‚f!�ýù¯gé«H-Ãz»­›¢Íiúp�Yt¼,µò²GšA¯ÀoÏ+r˺3®ï›}V–�v÷®h£ùÑõ¶y…’Ê$Ý£_*ˆ�7�Ë 'UÈœå¡h×4�@Z÷”Çî)­á‚€,Ê$S–A½/—´°Îî-W{øƒe±…Dñˆ}rñÒz}wЈJ
+Î�ñÙñvPT)é®D'Ž“Žýfm¥ƒY+Ìf4aœÿv¡½7ƒENËC—&ʇuÝØåeÖf4i²¢;…dˆí„1öƒŸýÈK{×bü“Sqô(L%æÖ…4«ü
$ÿò.m e`p‰4Y¬èKRÁÀ%Ä�·Î,å¦îœÍГW€ŽõA×R‘‰@ö+€ÂsÌ#×65´ÔlQo>ÑÅüÇ•^HË:=�HÈC~K­W©b1��jýŸÛåéÝÔ“Ð>¼ìÐ)?dtJ:æ,	•èÀÁ t
+)˜RJ{@ËBDhÅ\ßÌ^Ï
+õUÄ*Á®qÊß
+ÄÂÑ7¡j! ÖðɘIœœ|�ǹGFíš”Ph&Eöñt$¦œÅ¶‡°!Ñ!åÕ«´ÑN‚q¦•-´¹o
p
ÿKÿ¤Ý
+0+  �¹Q˜}0*Á+/ÚÂatÄþ+sOf•¶Þ\^ЄàJÓÈ´U8 4DÍþ¶É?ïóªuÜnó¼¢Qþ@þ2_2j:?¬Qª¯
¯N…�5:°Qn›¼\ÙqCßE™5�룗ùϬ,}†o88�½¶;ûÚñ›}c™ÝÚ™Ú
+ÐÉÝXmea�’	¸‘¢‡€qæpÓ$ݶ•jQî—y÷ÆÐË´
+\=ŽÄXúø¦O)´¥{1Â
+ÐL"”c4»ºxóË«éX‹
AË'²Wµa)C@>IìxÎçoÈ�„º SŽØCAxñôL؈˜;[vøqÏÇÁûǪ;ü0"—ÒLcF1ZŸ-¼&¦9:=<‚À†ªhi?Žp�%bg7€vôÉ‘›„y‰îÓˆø�@ÊØùSüÜåÇdbÙä­ñ+áÜUtRË®ù.óÃè¡ ¨Öã©Na$[Êš¾YõHƒ}õ*•}|£§Ï-J(H
¹=7£�Øì'l4Ó«îÜc‰Se�.z¯ "¤†¯É¨¶/Ä醾¦;„“‹
½ŽE”ÈÔ阃Ñ7lBHwWÿyMŒá¢º@Ýzþ3`¥¶‹.þ~‘jÀŠ�E&uê„¡ð
}{û Q�©
+ќć}Ú…Œ¦–¬3åÁ	ÐÞugw²°õ*soJ
é£W®Ãí0ÿvï�a£”A‰�žœDH'-=EÝí7]
(\½h‡uÃ`3“ÎnÍ£iÎFnˆ
+*í)\
 endobj
-1138 0 obj <<
+1147 0 obj <<
 /Type /Page
-/Contents 1139 0 R
-/Resources 1137 0 R
+/Contents 1148 0 R
+/Resources 1146 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
->> endobj
-1140 0 obj <<
-/D [1138 0 R /XYZ 85.0394 794.5015 null]
+/Parent 1133 0 R
 >> endobj
-482 0 obj <<
-/D [1138 0 R /XYZ 85.0394 769.5949 null]
->> endobj
-1141 0 obj <<
-/D [1138 0 R /XYZ 85.0394 749.4437 null]
->> endobj
-1142 0 obj <<
-/D [1138 0 R /XYZ 85.0394 707.9711 null]
->> endobj
-1143 0 obj <<
-/D [1138 0 R /XYZ 85.0394 696.016 null]
+1149 0 obj <<
+/D [1147 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 486 0 obj <<
-/D [1138 0 R /XYZ 85.0394 527.3014 null]
+/D [1147 0 R /XYZ 85.0394 714.4345 null]
 >> endobj
-1144 0 obj <<
-/D [1138 0 R /XYZ 85.0394 497.312 null]
+1150 0 obj <<
+/D [1147 0 R /XYZ 85.0394 684.4451 null]
 >> endobj
-1145 0 obj <<
-/D [1138 0 R /XYZ 85.0394 408.0188 null]
+1151 0 obj <<
+/D [1147 0 R /XYZ 85.0394 595.1519 null]
 >> endobj
-1146 0 obj <<
-/D [1138 0 R /XYZ 85.0394 396.0636 null]
+1152 0 obj <<
+/D [1147 0 R /XYZ 85.0394 583.1967 null]
 >> endobj
 490 0 obj <<
-/D [1138 0 R /XYZ 85.0394 202.1472 null]
+/D [1147 0 R /XYZ 85.0394 394.0393 null]
 >> endobj
-1147 0 obj <<
-/D [1138 0 R /XYZ 85.0394 177.8748 null]
+1153 0 obj <<
+/D [1147 0 R /XYZ 85.0394 370.8687 null]
 >> endobj
 494 0 obj <<
-/D [1138 0 R /XYZ 85.0394 109.157 null]
+/D [1147 0 R /XYZ 85.0394 305.4099 null]
 >> endobj
-1148 0 obj <<
-/D [1138 0 R /XYZ 85.0394 83.1291 null]
+1154 0 obj <<
+/D [1147 0 R /XYZ 85.0394 280.4837 null]
 >> endobj
-1137 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F57 624 0 R /F56 618 0 R /F84 848 0 R /F86 980 0 R /F77 703 0 R >>
-/XObject << /Im2 936 0 R >>
+498 0 obj <<
+/D [1147 0 R /XYZ 85.0394 138.799 null]
+>> endobj
+1158 0 obj <<
+/D [1147 0 R /XYZ 85.0394 112.5279 null]
+>> endobj
+1146 0 obj <<
+/Font << /F62 634 0 R /F43 600 0 R /F57 624 0 R /F42 597 0 R /F56 618 0 R /F84 797 0 R /F86 977 0 R /F77 703 0 R /F11 1157 0 R >>
+/XObject << /Im1 790 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1152 0 obj <<
-/Length 2290      
+1161 0 obj <<
+/Length 3048      
 /Filter /FlateDecode
 >>
 stream
-xÚµYÝoÛ8Ï_á‡<ÈÀš¿ô±XàMÜž‰Ós¼ÛÅuû Øt,À¶Knšýëo†CÊR¬¦)z‹å˜
g†3?Î0¼Â?ÞÓ‹R‘öâT1rÝ›oÎÂÞ=¬½;ãŽgà™M®_ggoÞF¢—²4Qo¶lÈJX˜$¼7[|"&Y$„Áo&£þ@è0x;¾ŠK¥EpñïáûÙhJ‘cýu<¹¤™”†‹›ÉÛñ»ß§Ã~¬‚ÙøfBÓÓÑÛÑt4¹õ?Í~;Íj•›fñP¢¾g?…½X÷ÛYÈdšèÞ#üOSÑÛœ)-™VRú™õÙíÙj��Uûi§›xÈ„—œúIuúI§,’BZ?�ßLÇïÆ4Øeƒ]ÅL
-ÃÈWšªDãyP­‹b“å[¤E°Í6Æ/gQ�ùzMÔ�!®l·3Û…Y8΂ÆlûDÄaûpÈÖù_a(ˆGû>O3/ì¸(áœ$—Á‡•qûfôåßÅÖmŸ;-QȾ¬Ð®ÞÀ›2àœ¥Zk‰Îp#®kŒ`-¸é’ÆÌ.Ë ßìÖù<¯œ¿šîå\3'©sX˱œ7�‚;¾_ˆCÇ
Ž˜Å*ñžGÛÖ¿§¢ : ê¥ãüW‡V-Q¬ã˜5S:õÊÌVÎîùaOnØv™ªKâZê!d-ulµ+�A€þ.j¿“‡]TÙs“ðH·®Ü™y#HB:;QÆ©²QÊxœFßV‚„¯mfÍ¿?lдËÒ�þwIã¶pÙ]Y¬•a'
-DL¥<

-P*Òª¥Í 
-ÃÀ|É º›+4iÙýáÃÿ8/&ÃkD²èëáx2¸Mÿ
-U.XšÂytª
-
T6 §¤%Êf¢ñ`6ØLÀYX®Êœ(WÅa½ N,ÐqnoʪØ7›-+
-Êk‘¤I¯™«?–þ4:…ùÁ±éý1pj"Š†Ž)ä/wÈ2Å�£Fu*OªÓÙìêÿ^™Ö7
-?­ýÀʼnª›µ…Yf‡u5¨ªuÇΠŒRüµ…éwV’ð!\l¡lßÒ·¶ÄH}Õ
-Ãów£Éh:D—ÎFÿ\F´v9
æê÷Pú+¾q6ëUÙUo	–„âµÉÑ�a<f©É÷¶lë¬ìÒH¤š¢´™fÏ{RP9ñ:WO;gà¾Ó@ç
ùÿ�¤ÿ³ƒ‚®*…B,}קÖÆ'ÁbÉf€m
¢la-¢`îŠØÊÐ|FCiö¹qÙD…‘8Ëâ`	[Bƒ€Sœ@éÔûàÇÛõQhA�eic~/©#Û�“ÍWîª3�¼sŸÚçAsHœ®~|.îÊý�·º…$ßt•b<âþ渙Œ"ª¢ØùgÐg8š*¤'¢ïÍur¼6kqšÞs‘²E	,�ø	iòá�ÑÚ'HÞí
-l¢¬ÄÃo„j~mVéŠ)oHËú…Y›û+•äÊù>¿{
äxì@è“iM¯°èðòrʆÓ÷èÌ¡—ç7`/½ru¼ÈA³å„`
¹ÃΧ9w‚3÷ÆÂ	 arK#=Ž�ׯcmQ¼[1‘ç'/nç,|éÍOÿÀ›ypê‚.£øWŒ/Èa]‚Ä‹‚øK‚ž!¾ož¹\¼R¨x�PÒ”±nDüZçWöëjçáÊÄ¿uü‘(¬‹�þ“T£˜Ž™LÑìÎ÷Yœ0¨ˆ¤WÊÖɉæþoW§ªÿÛ°ËDendstream
+xÚµ]sÛ6òÝ¿B~ g,Ÿ$Ñ7×Qrî$NÏQ;�Kó@I´Å9ŠTD*ŽûëoH”;îe:ž1– °À~PbÄáOŒLÊR+í(³š.Ìh¾:á£;x÷öDø5ã°h<\õóôäÕ›TŽ,³©LGÓÛ
®œñ<£éâS’2ÅÎ
+‘ÀÑ£/#
â±VÑ¢
ìhÝóÀM¼ºZ‰Ñë(
ˆ
+ˆÇCÌŽ¨\
¼¼ƒó3P/å›7—gc�ÙŒÕ
+¥�jŠ¯úeѨ¤5h
ÎpV˜„¬'ºe»­´rVÒܦìúvSúÙâ¶/7ô¢hˆ«y:Ôn%áŠZîµ{Lºº{q «Õ? Xi¦„XÎá@m’Ù™äÉï®Ó¤êi²êh쪚è¸mhÍý²Â74I,
+�é\¥:£™.Ö,:‘4?äÙ^Ô\?uåû�$x¬|”'‹@*žïÏÊqÀ7E‚§;ÕN½bïsÊ÷EçܾKE«�\L¾õeÓ�;ù	üŽ"FCx;¹ž@æ	,�Nþ9‹88å±2§Šq®B€Ȧ^v±lK²œË—GÜ‚ƒa¸ãb¸,ÒdÁÐꢋÝHZ–癚ÙWÎÃ�û‡µ'p%Pƒ¼Áþÿó?ÔXqi˜
z�=%°Cÿ~ؤj¨à¢\çt —WË4™û¶/i¾ ¡+7Ué79C…‘VvíÖ
.��ýbwÉ’ÛÜÔ-ª[\rëtžoÝ5
MYÌ—~¥ÎüÖ¢¡±Ã) òc³ýq ú H—UP¤¥"ˆ`Ž‡©4¥$!Í<Ïpy†cY@‚ô@ð]Ùà�üZgµ8Ý•}G�ËIàÕ#>áKšü²­88'—¼^·XC9ŒÛ
¯¤n†*«ó¹T ä€úEY—w&*;'×Í7Õì''2ï„.јê²ó;!ÿ¼xýú†]ÜüŠÌ¼øÂ
^$&‹¹c¯¶n®Þ^Aýœ‚Oä³	Éx/X,ÍòDÿ‡ûÄXz4\¤ñãäæ÷ÉÍ)›üqñþ×w“—¡2#ð”†Ëë‹÷þå)ãq;¤(Ä”"”µ?á„ø7(8!³ F”x‚(ñC$ŸåŽxÑ€3´î…Ò“/D*_†”Hf,N€Ì^J‚_ùÄyÃ<‡¼Up;’Ö8¶^�0+H¾3žõsþ¿]ƒ
+Ô?Èqs¸�1L‹Lþ
œ»-O©ZÊY¦2õ¼¦ñŒe¹±ŽtL.Ç©Péi&ìQÚîê5Šk()ã
�ö¾Á|AjJ¸I”’Éö«'7ûÙaÐ6Ô’ÄqæíS(ê:œÌåxÑ@Ê %hFÕÜÕ±n¦
#sM^ŠT1‚�Ó»d±{XÍÚº#¤X™¹Þ‹”OôJ�Y\íþ8CEklȹ»jQö]á†ɺ.æ®—“3Ou†
+Aª¬<ÊîWí‚ú´4Om“ûe…¥„Ò`™K*T•ö][Z*CÈ“Ãó¾QáNk
tã™r!¥t=D<¦Z¸¶£¶Î©GÂ̬èP£5Éûá%e>ì„䘂÷t‡ÅÖÙ.p¥öˆ#²àHs±+�oc±?‹[¯ ø\TàŸj�”øëtÏŠ‚�œiÏHõà”¢‹UdÒ¦,³:=ÊÂ#T9uÓG4=©°{)~:w¢øtŽüþü9‚Ù
+–¦»ÁÝTÝp“¼Aפ„IÊoÅj]—ç‘+¥9Ëıâÿ
+-M®‹Å¢ŒZ×Î]nxK	¥7JœR.1Ä*œä×¢ª‹YòO+p‡Ë8izo“0¿¿¢Ë%
�…
+•B¸”Ác/b½Æó,ˆ»®®çÑmÞòì)ä�¡i»W÷X“�e‡¸=Þ�1’	Ã�üåÔyO’8ð1V¥Áú¿E­Ÿk¬Œ%âBÓZ†í�¨ÚfGæR|¸Òv½&-˜ƒI#e[ÅÆ€û¾7<ì#
+rТ¯fU]õ¾Uè¿PH
	ù¦®B'»d®¡'ÃßMìʈÓX K}ÔM…ºM$~ûöè¼½kª¿¨ËJ]ã²YTó¢¹pù’Ò*’*bç¨ð�u—�Ôþ+Àa³n÷u€\ÙÓ¥á äúÁ*rzüšš)
$ÈZÆ~„ÂGAT?ü“—ý7E
ÕTžËø¯Yd–3�+WÑ.Ò‘Œ?ú=FøqLX6¸üÿ
 endobj
-1151 0 obj <<
+1160 0 obj <<
 /Type /Page
-/Contents 1152 0 R
-/Resources 1150 0 R
+/Contents 1161 0 R
+/Resources 1159 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
+/Parent 1133 0 R
 >> endobj
-1153 0 obj <<
-/D [1151 0 R /XYZ 56.6929 794.5015 null]
->> endobj
-498 0 obj <<
-/D [1151 0 R /XYZ 56.6929 653.8847 null]
->> endobj
-1154 0 obj <<
-/D [1151 0 R /XYZ 56.6929 627.8019 null]
+1162 0 obj <<
+/D [1160 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 502 0 obj <<
-/D [1151 0 R /XYZ 56.6929 405.3123 null]
+/D [1160 0 R /XYZ 56.6929 602.6023 null]
 >> endobj
-1155 0 obj <<
-/D [1151 0 R /XYZ 56.6929 382.8411 null]
+1163 0 obj <<
+/D [1160 0 R /XYZ 56.6929 580.3261 null]
 >> endobj
 506 0 obj <<
-/D [1151 0 R /XYZ 56.6929 301.1931 null]
+/D [1160 0 R /XYZ 56.6929 499.3874 null]
 >> endobj
-1156 0 obj <<
-/D [1151 0 R /XYZ 56.6929 273.8371 null]
+1164 0 obj <<
+/D [1160 0 R /XYZ 56.6929 472.2263 null]
 >> endobj
-1150 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F11 785 0 R /F57 624 0 R /F77 703 0 R /F84 848 0 R /F86 980 0 R >>
-/XObject << /Im2 936 0 R >>
-/ProcSet [ /PDF /Text ]
+1165 0 obj <<
+/D [1160 0 R /XYZ 56.6929 264.3736 null]
+>> endobj
+1166 0 obj <<
+/D [1160 0 R /XYZ 56.6929 252.4185 null]
 >> endobj
 1159 0 obj <<
-/Length 2375      
+/Font << /F62 634 0 R /F43 600 0 R /F42 597 0 R /F84 797 0 R /F86 977 0 R /F77 703 0 R /F57 624 0 R /F14 608 0 R >>
+/XObject << /Im1 790 0 R >>
+/ProcSet [ /PDF /Text ]
+>> endobj
+1169 0 obj <<
+/Length 1031      
 /Filter /FlateDecode
 >>
 stream
-xÚÕYKsÛȾëWð X%bç�AnZ/íhË+od¦*Ç�
-`iS¹¼hÛr^ ¹´‡ÍC]l‰¬³uDSéä0k;æ6*ÚfçˆÅÑè¢qÏ<pnè9÷“4+ëŠÜ
-ÄN@i�qw]?Ž1 DmYßWÁ…úZ€€d”T^žË!‰AÝÒo×ó¦j‰çCÙ­ÊiádzÊ”ŤÑ~ñ°B¹ÅkÃe^÷Œ$¤¢7cUÙç^6§O$Ê®p'A#"N¹HŽñ�uèÖ
-¦}ɪÀ|bÁ?fãTD
�ߣÓ!‘Ñã’NTî͇Í®ÛìüÔÇfGD]¸ãq2™r^d¿dXM¢hû¼ qù	»ÖK(@ÁJóc›ƒ¥a3%Ýñ•ŠæÙâßm•µ+bËU?€B‚SÖx¾õÀÆàK–óC|Q §"¾�˜I¹-'ÌÄ9f—/톦I„õ!�I”\ÈgU°
-ÖÙ#)¥ÙteSgUõèµSÐø²©ªæÁÙN9h„X&…mŽ4¼nòƒ}±EïTiô°*+$Á1W.W¹art ÀóÁøKŠæð¾t0mÖ´d?
ñëà	Õ†òDºœRT¹ß¦Ì»‘Ø‚÷<kÑŠñè—þ!…凖
H::C¾sþ„Пð[6`[nXl¹]%ã8Itðõr½.òÂSå™’~6q¯aGà‚Å
-Â3V=Ú%k˜€W˜*6sl´Ë
©ÜÔ‰Lg
{°â§+gŠOW¨ïÏŸ8§<6F'~åýw@]
ÔŽu’œkå© ò%A‚¤Á®äU>ÀG€Óˆ4}æØ­FÀ=gQ»›wÛlѵô*={H‡7ou0Œ…X!NM´Øm	£5ø‰HEhôf¢Í0ÛÒ8•\©tWùYKã½æÅ¢\g�aüvsèõ劆7Yž;?
-LìñùuÐïŠþ˜Û!5ñز½$ÿÌ,{wwÕ=i·ÙàÌ(Z”Y(	xäp¦HËŒ@/‡ð�ï®X8MÀþj§
ØvYõç/Euˆ4(œk^”:‡%‹S¦Ógë6W|`ù}lé–ºéºéˆÈæmSíºâŠ^És�èûú�-1{ïãÌ击›w7·C²AÕËE@~Ø=“Öäϸgs²7–ä¡j6�+˜°Çîý–:¿$Z4ëMÖ•ó²*»Gò®T‘m«²ð3¿ † |mêa4`Û`‚F/‡2Ðöó´/
-ðm»[=$Ccp_—ßœl0–Ñ£¬ór‘u¡ðµ`rcí@]è´C�Ê•½\ÒÃÅȾª(†�ïû-Ö+û¶C3ø'Ü:h¬­â/´‚Z§è,N_]º1ZhG
dÂà¿Ií"¹‹
-h8®�@>H¸»‡þ—û¢Æ‚ÏÙR<iüœ§
-òTøJÄa§<ð+ýž„aCo?
P	!Í)VŶì‚ìÚ=4.ù*`ƒpèpë²zágmÇ6ÚUE;T´œdÌt CaD¨"; «óÁCßá°5@P(ÜC   8áÜŸÂù t@z
îì|ÁNš/\
þæ{Xú£î?þȃWƆۗn? ‹9ødÏJà-:=k±Ó(׃¸×&@H^8æ�ßÿÖG>Œ _$á>¾Ó�•£²n±"ûbÒ	`NJŽot凙&œŒ¾ôOŸœB¾è¹Ô«¡lþŸ ÜÇÈe!ãôÙËò',ÊóP†ô™0+_€²² 
¹{ܼ|a|í.Bh-¨�p}‡ä¡#‡/M�ý+µP&6ÛŽ.mÇ¿¥/ûzÇ�Ý]Ñð›Ûë_¦W4úÓž†Fájè‚øþ|v®½Yo?>c·žB^§äÞ¬?ÎïÈä~Åy»'Z¾”u•Q@¤þ®°Ú<6œÓøª=vb_ÖäÍ:A…žk=oN\žlÞ,Š¶
~Ô–kh߶îÆ¢W6BùûŒ!z¾NkC~ú_üêÃS裼òilm’ö¤zòctæ±`º‰‚¦A“l-~ÔSÜ4ØÚÿ`S‡Hn’}©ünz;½sÝõl:Ôùʘ±ýýu^úT‚¿`Âãð›añµ+j,ØOünߺl²­§šåIyÔB”“ãûU‡|ƒy¤ò4¶ýYç{
‹ý—îª>…çN|8�
ø-N{({NKs“Io³Ùû9Þ¼¿þøñp¤¢ÊŸâ8˜‚º’„âS³Ñ‹�á{ý<üŒm›íÇsyÔ}zL…S¡žLúÄ¥�µÉÐá©Fëendstream
+xÚåWKsÛ6¾ëWðÐ5c¡x¯£âЮ2®œJì¥iŒYœ¡H•¤›¤¿¾xQb(ZÊÔ¹U:`µX,ß~X¬P
+
6û	žôÜýy›Yg4ë[½I&?ß1H fA²íù
+�‚$ûÞþ2ŸÄ«éS20�QÃ7‹å[§‘n¸}\Þ-î_ͧ<
+“ÅãÒ©Wñ]¼Š—·ñt†HD±v@¼‹?—±3º[<ÄÓ�É»IœCîAbâýkòá#2}ºwˆ4ø¬@€¤ÄÁ~QhDH§)&ëÉoG‡½Y»t¦À0%ÁŒa@˜ÆæÅmÝPoëEB�`”v�!
I¹�ž`€%Gè£>ô#@¡
§0‚‰Å¾mŒ¶%=[n\R³…±YÔ&ÿB¬šéŒ ¶;elW[Mµõ
+7CÂ'Uª:mUæôõ‰Pm*;f�NP$E¸Ø:ã²j�YsÜ)ëvÊ7õ9/ü^Ÿ”‰XǦ�nÂÄ6ȼܩ:·šŒ?7yùäD“ʪާ…W¶^ðëÒrã­ê©Ÿ¥ct¸ô1ì¹)Ò¦�G
+o™à@BäKó׃ºJÛyë8vp€6[£]%æaU_�ªy>ªÚ×dný7n&u«�þ}²ºqêÛåü×øÆißeÎoÆ*ð\\îs¬°\_È\’×Á|Ê\Î÷»ìV¼œ9A£k�*c:6	¥E¢Þ]¯7ª¬Ú§ýËt¯lÉ€ábp¿]z«�jšîÒ4ù>/ÒÚ$×>h•‹]s
óÞa^Ð	óS·s­}2k8äƒöé¿­êA
¡Ë½¾µÁe¿í:k¿d@`ÉuZ‰v‡œ¹K+iS™®dHx~';5^Ó~\Vº�—±nQ%“x„š%’È[g¹0ÚüoõmÂS7œº`õ¥Ue“WåàŠÙÞÉR$­½Tm�O£Û›ÌÝq¿Ê>5V2�Fáå­i�ZKÝÑë£s]ŠfH×$‚…�ø�èø«šA ¾Ìb¨­¾k¿’äapŽÛ‡ùz}
+IÙ9�»´è
+núì‘WKÀ÷¶ó§¿4D<N•#¥|P%ŽÎn €
+ÌGBÿ�wendstream
 endobj
-1158 0 obj <<
+1168 0 obj <<
 /Type /Page
-/Contents 1159 0 R
-/Resources 1157 0 R
+/Contents 1169 0 R
+/Resources 1167 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
+/Parent 1133 0 R
 >> endobj
-1160 0 obj <<
-/D [1158 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-1161 0 obj <<
-/D [1158 0 R /XYZ 85.0394 769.5949 null]
->> endobj
-1162 0 obj <<
-/D [1158 0 R /XYZ 85.0394 769.5949 null]
+1170 0 obj <<
+/D [1168 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
-1157 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F14 608 0 R >>
+1167 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1165 0 obj <<
+1173 0 obj <<
 /Length 69        
 /Filter /FlateDecode
 >>
 stream
 xÚ3T0
 endobj
-1164 0 obj <<
+1172 0 obj <<
 /Type /Page
-/Contents 1165 0 R
-/Resources 1163 0 R
+/Contents 1173 0 R
+/Resources 1171 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
+/Parent 1133 0 R
 >> endobj
-1166 0 obj <<
-/D [1164 0 R /XYZ 56.6929 794.5015 null]
+1174 0 obj <<
+/D [1172 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-1163 0 obj <<
+1171 0 obj <<
 /ProcSet [ /PDF ]
 >> endobj
-1169 0 obj <<
-/Length 1537      
+1177 0 obj <<
+/Length 1535      
 /Filter /FlateDecode
 >>
 stream
-xÚ•XÝoÛ6÷_!äÉ*Z¤¾Ûa@š¶[»bØšô©íƒ,Ó¶YÔô7ö¿ïŽGʲ­¶‚@Gòøãñ¾iîxðÇ�$džŸNœ,ôxèäû™çlaí—7<Aè³0ð}L¬º¡Ÿ°0±ãŽA^ÞÍ–oá�E‘�»ÍpVûÌ÷îÜ­?ÍovYÝÉfáŠÐ›Ç‹/wïh[Àâ$æ¸Ís܈³€Ç‘Þðòí﯈;¥Ï­Ìû¦èit£ª¶XË&ë
- <0?ˆ„ÅK™ŸÄ‰Æ‹_¸Üó¼ùužË¶`ºF•4x_´�…ò�”¥‘ˆ’±45Ðq{HÛ<™D` ôÚg/ô®oÞ·ðåÏp*šgšWÒz¶^Ó�À‚ù>ëò­•G˜n—u´þ¨zšÊ³ŠˆVš¥¾6˜ÕšˆªÈï«loŽÚ¨†ø6}×�eè[Cՠ“{sÎÒ0úâYYªƒ[©®Ø<Nh)ŒXÄ1ìBægx
KîBû«—Í$Xvüi`
zHþ0
spý_ÀU™å÷;UÊ	¨ `‰àO¼h×dU»�
-7Ù2{:©”û-Èè‡þ¼h雑­Âhd+‘2�-ÈV[¥ÖfÏZfS®ÂY’ÆÖ�ÑȬ£	´hÉ�SŠ\BÔ2åãÔ¢Å1ŠGš˜£(œ9ª�- �¦�‰öE§}/7û—›5½z$·ƒ€áQpj0#&]Rh�5]a�aRØB–ƈ5©ûAVM´µRÚõŒ5M²òæ¯Ô­™é:;™m³¢j»s�_ôĈ¿Êc~ó´)é(U_³}]ÊSÙ©:RÉU-›ÒT›¬®-‰6{n<#>+!yk9–K0ƒ‡U«#}¿(
-~
‡�5‘W+µíÛJvíMPòGêP”%Q«Rå÷D~xsÃSžÐ ­³\>›
-++ËaW`�Aƒß\í÷ªÂ»i[+IQYP¥6Ú‹´ìd6uH–[ùìhø}<¦ÿ–Éó³±8_Oqþ—"°,Ð,“o™.PcÈ•‘žâb„Ä£„&#3ùï‹Ó;ð'-‡Tku®éâ}™1Š¬¡xHk@«iJW4g™�a’Ò¾ÐïW²ù�‚íy'úýÊôßQ[ÃÿÆ•MH×Ô@,ä°9Q
c“B}cz\ÜÇRZÑ¿k…óbþ€ï
-u¬écÄÁ]¿+“…tÏ”CÈÓbü­*sÔ•É;Âíꇪîk³oŸµP,'Á7…½ÇÕ~9†ñ{dÕãéµÝI‰hq¢+Ö	�úë;íé>÷‡.iJÆÚ’Ø}àJ¡ë0û< ˜À‰¡
½¡<¼§ÑÀ2T!ôUI…íô0tœÚefm%eEGÙºT`ãÓ·˜ûpz]´î¤êVè“ýÂêªù|¯Ž5G@ê„v{¯ß%´L_aë7uFØî›Û¦h‰ÛÔɼ£[
+xÚ•koÛ6ð»…�O6PÑ"©g;HÓvKW[“~jûA–i[ˆ,ªzÄõ†ý÷y¤,[ê#�Ç{óîhêxðG�8 O|'J|x4p²ýÌs¶°÷ÛŒ?à$ð9‡ÅÄ®ð˜1‹wÈäåýlùÆgóH²À¹ßô²Â( AÂœûõÇùÍ.­ZQ/\xóhñùþ-žòIGT�ò@BB(ç‘>ðòöÏWH�àçNd]�·G\ÝȲÉ×¢NÛ žõ	÷Cfø…¡�5?
+„>y+õUé<“:f1àä#îzóÃΜƜS2lú£Cgr
 FÔêtäkKB>?äíNv­aSt-T
¥»2î"Ã0�{¾
+P‘/ñ(Á›ËáŠZ¢lXZ´:Æñ
+F"ß8JaNn'7¤	T¢}ÞêQ„ãÃ||Xë#¦\ú6>T
+qž!;y@@ß”^sY‰º0Í&­*ª˜=7™�zãv›åÂ੦Õ" r[}•*ê|PWg�àÕJn»¦ms…,þ
+:äE�Ъ�Ù‚ïßÜЄƸhª4Ϧ®•Õå°ËUƒQ rŒúfr¿—¥²MëØXMòÒ2•r£³HëŽñ!SBÒÌêgmÀå¿øñˆþ[Æ/pM/Öìr?Qø_2ß’À¬€DÜ�¸FP+C�¢lÀ‰†1"CƒüïEŸ<œ$0#<1h”Zë+HMWÙKLPDÍCØ
+Æb¬#©¦…RZ辡ªsêã�Pˆ¾
¼Á:¼ÇUOÒw!µèÊÛ¹0•6
+µKÍÞJˆEÙ¾”«Á§kTíSèuÞ¸“®[ÁE¿h58‚½Á©šÎ÷òÔs”N·÷úY‚Ûøe¶ÏPÓg˜�¾©�à
+Ój~™}üì9k0ðíÌ#<‰ç
 endobj
-1168 0 obj <<
+1176 0 obj <<
 /Type /Page
-/Contents 1169 0 R
-/Resources 1167 0 R
+/Contents 1177 0 R
+/Resources 1175 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
-/Annots [ 1173 0 R 1174 0 R ]
+/Parent 1183 0 R
+/Annots [ 1181 0 R 1182 0 R ]
 >> endobj
-1173 0 obj <<
+1181 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [513.6761 73.4705 539.579 85.5301]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://ftp.auscert.org.au/pub/auscert/advisory/AL-1999.004.dns_dos)>>
 >> endobj
-1174 0 obj <<
+1182 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [84.0431 62.7606 448.7754 72.9224]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://ftp.auscert.org.au/pub/auscert/advisory/AL-1999.004.dns_dos)>>
 >> endobj
-1170 0 obj <<
-/D [1168 0 R /XYZ 85.0394 794.5015 null]
+1178 0 obj <<
+/D [1176 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 510 0 obj <<
-/D [1168 0 R /XYZ 85.0394 769.5949 null]
+/D [1176 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-1171 0 obj <<
-/D [1168 0 R /XYZ 85.0394 565.4467 null]
+1179 0 obj <<
+/D [1176 0 R /XYZ 85.0394 570.0146 null]
 >> endobj
 514 0 obj <<
-/D [1168 0 R /XYZ 85.0394 565.4467 null]
+/D [1176 0 R /XYZ 85.0394 570.0146 null]
 >> endobj
-1172 0 obj <<
-/D [1168 0 R /XYZ 85.0394 528.8591 null]
+1180 0 obj <<
+/D [1176 0 R /XYZ 85.0394 536.782 null]
 >> endobj
-1167 0 obj <<
-/Font << /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R /F11 785 0 R >>
+1175 0 obj <<
+/Font << /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R /F11 1157 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1177 0 obj <<
-/Length 3185      
+1186 0 obj <<
+/Length 3186      
 /Filter /FlateDecode
 >>
 stream
-xڥ˒Û6ò>_¡ÛJU‡$@Ü›�“ÉÁN<ò #qM‘
-£(_¿ÝèEJœ²«Ö>h4èF¿5Á‡ÿÁ"Š½8
ÓE’J/òƒh‘îüÅÖ~¸gí�Öc¬ï6w÷ïãp‘ziÆ‹Íóˆ–ò|¥‚Å&ÿm™x¡·úcóÓýûÔᆾ…È#Î÷?~úøqCXŠRy2P!£½ýðnŽRì…"�Œóô°ùüønŽT
-á åÝÓÝ/ÁѪÝ:ûŽ�B
-õí™…s4Yñ|.ª`Ï’ø=%³™Œè)åEñ`ZënæÈ ðÒ(r(ŽÎb-%î-r¸\»¢®Ð<DºÜìñUD/3]Ñ`oÊ#�ŠÃ‘dôbОÛÎpœÀg}StgZÙò÷XêÌr†zFK©¢Mš¦xÃôq[ÿ…CÐ!£åi_d{B8eI£²8 þàf²å;~Èoåú w†ô6¯+Ϭõc…楖¾Yíø;­É½�xâ¥"TäɪŽÅ�Ò_ö­yîKËg£»Þî6´h5Uºç”ƒ5
O†w©Ó¼~&Vsɦ
Þú¾-J+\­é;˜Èø˜\›ƒ#¬™Œæy_›â¥(ÍŽLâ":R`¨¹ø�ÝÁ•ˆÄ9ãuO(Éœ‘”‘SwKñVAÁõK?™¨Ÿüå¿Wi¸äkûÝδ쬈Պ�Ä'Î"æ¾Î2ðrÚ‡ÕXy®L;L"/UA:±í9›†˜”Qpôö¤4k�‘'8sVžÄâýhQüÆðµ,À×ü¥Ç’Aä •:_1ؾ<|ËZç4b�QìÕà§|�‚¨­¾Ùg)/"Ç›æ›Â|¡Œ]¿ÑÍ}¥³"’£‰±@¥„Î�¾=)’^šnt8œZˆwH“©*sP›aÍ÷_&L‡¢ÍX[B?ü'k¾m[»}“½ïÛ澬3]Þo‹ŠY_ÇiÁ6ìÈ1 £ï�ŒÂÁ]S(…§
-?r°€c÷fφ1â·8fÍf›„$©=¢×UbY[5Ì‘cœÚx�ƒ9͉cÈýoWH;D¾Uñ9~Ouó…Fìu�¦)Ï)*w#BÐMWd}©ù¢9Q5YW7¼cH\p¦ôfƃ‰@A²N4Öé‘ðâ(’Óhòš6‡©§T’Ž\F­$\žë×r1F•A­À‘å¾ �4è1´ÊÄ:
œßJwí5�Š*+ûÜ´Œ�äÜí)¾Âœã+�ÃÛé‘dX*¡\¾ç8Gœ;^&„Äþ�.*M!C+ì]@m¬ÐKaNè¬çdœ¦^¢Òà[œäRI”¸×(ø<Ìð4—ÁØ�M±¿û~XÊB€3;Ë_ñRø¸ÎO
-¨Ë|gém§;¾¯=¥ª—ïÁ0Eñ?Ï­¢ø*&í5ù-¼a’‚²lÝVáæ0Ö%ã
-i¸B½=ÄY&J©ZþXŸÐú±Jµ‘4
w~4UNù
àۀę&úW¸»E€²»9æw
èAŸ	›å¨l¶9“e[f#çqPŸj×^[ÁÄ/$‰§yïsórÿ·iê¹TAxI:”8s.Fbš&Ǥ°rh×.&#ä׈‰1±²ÞÍÙ&Ü?ô“QCeô}ÝÌEð‚Ñ€}oºŒ2…®8ÌYªh©ÎExsÉ
ĨߔR·I‚+ð?O3Ü›úþ}_e踾ž,üÜu3¶¤pš„sÍqkU©ïA4Œ¿ÅªRg{T´X'!0£óæé'P`„áŧõP$ÎÄgx«Øw~´ï†ò‰ÊzÇR¶×ÕÎ8¸u¢.Ò´-WQ6Gà¡ÎDÊt7ÔnøšC_$‚¶Añ:5+H½Zt@ø•—š£>Í=�€r±žC@v`HÄl—|–…pj «
-Nˆû„.W:hÈ�›9­Ï¨±È<‹ÅÀi?€u×áÛæ´¸eh;dà‘³q€^Tƒ}}äì
-‹Ä´>Öe‘�çËÆ(ñµ´¬!ð`k†æqîÿ�LÅPýO['OõÁ8
èèá±�[×-ƒ­åÀ÷‹1GZÕÖþ
Ä~Œ]
+xÚ¥ËrÛ8òî¯Ðm©ªˆ&	ðµ·LâÌxIÆVvwj2ˆ„%n(RÇÍ×o7ºA‘]NÕ&�FÝè·ì/<øï/ÂÈ�Ò ]Ä©tCÏÙþÆ[laíçŸqVi5Æúi}sû!
+©›FA´X?�h%®—$þb�ÿáÄnà.ÿ\ÿzû!õF¸�ç†�
+BÏùòñþ?4z¼{X†¡ó¯»‡GÀð—°AÂåÞ~^ß1nì.AžóÓ=ÜÅ@R»õÝ—‡ûõï4{÷éããýû»‡·ËX:ë{˜á�nîÖƒLÇr÷=�ýëæ�?½EâÿõÆsEš„‹#L<×OÓ`±¿‘¡pC)„…”7�7¿
G«fëì;ú
Ärý�2XøÒÇ/¦n�Ä�}ÉåÊ÷<ÏÉvM]wĪªr´ºë£|ŸêæR¾­nžuÓÙš’bôBÞb$n§Â÷©ÂMþ°Ý·ÛßЬèøÛÒ÷P·m±)5ͺš¾Í2qz¦d
ö0DÑ5Âh¬O¾p	cRàué'ð«ó™KоPúŒ¬«ç‚Ы½®ø‚(Þ9VÈ(
+ÀPsö3º€+±uÆ«žPâ1
+8#)C«î†âµ‚‚ë—ž?2	P?á{ο—iàð‹µýv«[vVÄjÅFâg!sß	gx9î´Åj¬<¦Ä¡›&~:±í9›†˜Qpôö¤4+�‘+8sVžØàý¢Iø�ákX€¯þ®ö‡’A÷ä t¾b°yyø–µÊiÄ:“°kL×8åœDíä‡}Vâ~hùcÓ|3CX‚/”‘�á·Ïª¹­Ô~ÖáÂ#CD²41$)¡�³A§¯O
+¥›Æƒ
§àÒxªÊÔfXóÜØ“1Ó¡h3Ö–ÀþÉšŸŒ¶­ì¾É‹Þöms[Ö™*o7EŬ¯"ˆ´`æäÐÑ÷JFÁà®)”ÂSù¾9˜Ï±{½cÃñ;Œ[³æ3ˆMB’…ÔîAC$8ÎÚ¨aŽC¸tL¼—ÆÏ»ØM?xÕ „ë‰ x)š"u5w¬›oao{ÐMy¢µ¢²7!ÕtEÖ—ŠošU�uus"”!aÁ	›Ð›Ï—s/+ªUáFa(§Aä%%R7Iâtä¹0XÅ�sª{ŒZ‰
U0ª4*Ž�uü‚RҠLj*ccû8¿˜ÙµS<*ª¬ìsÝ22Ä�S·£°
+s«@Ol§G’=¹¨{ÒùÀá�8·¼Lì‰ý=SšBbV˜»€ò™ çBÑGω8MÝ8Iýñ�BÅalÝFÁ癆§ÙÄ�Àöl
+q0øêyA©)ù
+¦‰7××&•z.„ÂèGL*µ†G…Šñó/:ož~EEœZ…áLp†‡Š<ëDûn(™¨”·,e;Umµ…jààuÛrådòR
+|Ë&%8ÿÇe]
+!(ßs{iÈRprÎRp†Yʸ'ŸïUW”•\vGŽ&H¦‚sIéä5Ïw”Á‚6=ÐFµ”y
+2©TÚôU8÷Ÿ	 òœ_�7Q¢+,¦tv5¥ªV=þ‚,•Cù�d‡…äø¾dY¨¬Ö/=å)7Ä
+¦£j-¡Xú|
tß	HýØäk…håÊ8µ
ò¤ú¸â—ž-
+’$²NþonÝ%ç¥
+!œ·e[³¸ën¸ª²$ž&—�é	§—Ö|Œ‘/õ¿n/¿ô2"E9ÄâW^f5 ÏCè¿"[¢Ò„.ƒ©d
`TèÓ–ê™Qßœ
¶
+àfNë3j&²Áb1pÎ`Õuø¶9-nÚéwhm gÕ`_Z{€áú
�-«°Î¡€#i‰~2™!ÅÜð~S�
´èÚ9†Iʼn‰
x¬SÞ¥!@¥ú™äò|¨w..£ßLüáB
oU÷<!†Æ<Ó[ÿ€nGxF}ZS™ÇìpT~ý[
+Þ2�S¥›Ñ-ÍÚe[£0ãqS�bŒnùw�·%(ˆ±xÖp?ß÷m6è$&R3i¶L]/¶CbZê²ÈNó5c‹èRZÆx°ÑCÃ8·Í~H¦"(ý§}“Çz¯­tôðغ­ë–ÁÆràûMë­*cÿ
+ð×b!æþÀÚÿ÷Ÿœÿ.DBºŸ$Áù¯	¦õtâʈð¥Ly ¯nnÿ6áúêÿc	endstream
 endobj
-1176 0 obj <<
+1185 0 obj <<
 /Type /Page
-/Contents 1177 0 R
-/Resources 1175 0 R
+/Contents 1186 0 R
+/Resources 1184 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1149 0 R
+/Parent 1183 0 R
 >> endobj
-1178 0 obj <<
-/D [1176 0 R /XYZ 56.6929 794.5015 null]
+1187 0 obj <<
+/D [1185 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 518 0 obj <<
-/D [1176 0 R /XYZ 56.6929 769.5949 null]
+/D [1185 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-1182 0 obj <<
-/D [1176 0 R /XYZ 56.6929 747.0488 null]
+1191 0 obj <<
+/D [1185 0 R /XYZ 56.6929 747.0488 null]
 >> endobj
 522 0 obj <<
-/D [1176 0 R /XYZ 56.6929 613.0366 null]
+/D [1185 0 R /XYZ 56.6929 613.0366 null]
 >> endobj
-1183 0 obj <<
-/D [1176 0 R /XYZ 56.6929 586.6546 null]
+1192 0 obj <<
+/D [1185 0 R /XYZ 56.6929 586.6546 null]
 >> endobj
 526 0 obj <<
-/D [1176 0 R /XYZ 56.6929 473.2336 null]
+/D [1185 0 R /XYZ 56.6929 473.2336 null]
 >> endobj
-1184 0 obj <<
-/D [1176 0 R /XYZ 56.6929 445.9291 null]
+1193 0 obj <<
+/D [1185 0 R /XYZ 56.6929 445.9291 null]
 >> endobj
 530 0 obj <<
-/D [1176 0 R /XYZ 56.6929 376.148 null]
+/D [1185 0 R /XYZ 56.6929 376.148 null]
 >> endobj
-972 0 obj <<
-/D [1176 0 R /XYZ 56.6929 340.4845 null]
+969 0 obj <<
+/D [1185 0 R /XYZ 56.6929 340.4845 null]
 >> endobj
-1175 0 obj <<
-/Font << /F62 634 0 R /F90 1181 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R /F77 703 0 R /F58 627 0 R >>
+1184 0 obj <<
+/Font << /F62 634 0 R /F90 1190 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F57 624 0 R /F77 703 0 R /F58 627 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1187 0 obj <<
+1196 0 obj <<
 /Length 1975      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥Û’«Æñý|…ÞÌVY,Ã'ÇÞÛ—].Ÿ­J99yÁH"Œƒ”õק{º�ĉS•Ý5}Ÿ¾MƒØð/6yâQo²"ö“@$›²}l@ûö�`ž8‰ü$Ž"xX¡n“(÷“<Ì6Û¥’¯_Þ=~‡›0ðÓ4L6/ûÉVšå~ÅÅæ¥ú‡÷t”'£ú‡m˜^þðÏ—¿’Xìgy&P,
-Þü�žŽúB@)ÙÚ3ý|‚ð0öŠžôè¤�òJí¥×ÝáKö,Ú~‘†);á)bS@Ž )Š…·Sƒ!hÐÍhj<$>=aÏ,ûPwÀ,<Ù4ræ”]E@©;örA­‡aTƒƒ¯uùÊ^œú‘{ê¬:²gƶJ#QXr÷†GÃÃL1‡ÃÊØ„nÃ,óÆþ¦^£‡	‰~5¨);µ×¤õ¾û ¹( ,w'“±ƒú\WÌ&	?hr°d´ÞþXw†ÍÙø ®îÀn˱AŠ�䉲
ÀN]PØŽƒª(¿ºE9ØS¬”CNWÖ}x$—–å¶ÔûoFY3ŸkÞÿDÓÄ�¦‘«ùÐU|Wöª'ê;ÃÐÁÝaBO¦>¨¾–
Á?Žíz|½”sè±"²öþ®;¬—(„: é(^g¥"H(¤ük´hæÙ‚ù7¢1c÷sTÒ° îVL÷±4Ú¦'¥O
KAeL´„²Å�>-}X«j®ŽÐÙæUVhU �üÁ
-e„æ|#¼­Å0äèË�P¿Àß?¼ÿóÏ>‘¾"<{s%î΃¸£<+Âî”êg`‚P&ÉÖ ÖN3å#Lt„€_Âï	(u{j`´Ô²³­”ºZ
€�dÉ
-fqd"‰½
-pTÀ4 pјéß©ù^5+“³K™›-“ç9Ì©ª.±ð?]”00%ýüf»¡£àÒ
-Ç
'\ÞÝ0	™YhíŸ#:GqÚ�NªçÉ5…q¸ŽíÿOºùEºX€BÁÝ Ðe[f€¡ßt¢Èª"B(â,Σ4Έð1H‚ðc(‚Hl<ˆ[�Šs¿Ûñ¹KFËꆓ»L¸mB`†^™8Ì{
-­Ýv?v•ÕšÁ>¦ð­ÎÌspÿ
-/o“¥9”,‰Ãà«qP¢ßÐý'À_U$ò‘¦Á€aJ"۟˹–G¨“,_å�¹kÈëÊq©‰+b~êÝë>ì)-=ÙH!Àï:Ê®ƒÔ•®æe÷tÔD¥©í‹
+xÚ¥Û’«Æñý|…ÞÌVY,'ÇÞÛ—].Ÿ­J99y@0’È#Ã eýõéžî
$qâTe÷AMߧoÓ 6
ü‹M&ý ÊãMšÇ¾„Ü”í»`s
+À„ôÓ<ȬÀ˃Âëõ¸kÔpÔÚÔÝa±ÅIÈbIä§I@v2_<lEÞ“n[Ý‘ÁŸz
jÚaV ü\J§ çS‘9“ŠgóÙƒ”Þ@J:m¸èþ¼ù=õ…€²`kÏôó1ÂÃØ+zÒ£“>Wj/½î_²gÑ&÷ó$LØ1O‹˜rMQ,¼�AƒnFSã!ñÉè	{Æ`Ù‡ºfáMSÌœEWPꎽ\PëaÕààkݦxe/NýƒÈ<uV�
Ù3c[U#QXr÷†GÃÃL1‡ÃÊØ„nÃ4õÆþ&^£‡	‰~5¨);µ×¤õ¾û 9( ,w'“²ƒú\WÌV~Ðä`Éh½'ü±î›³ñA\Ý�Ý–cƒÉ#e€�º> °UQ~1t‹r°§X)	† œ®,¬û6ðH.-Ëm©÷ߌ:²f>;Ö¼ÿ‰¦‰?L"Wó¡«ø®ìUNÔw†¡ƒ»Ã„žL}P}]4ÿ8¶;èñõRΠÇòÈÚû»î°^¢ꀤ£Hx�•ˆP¸@!å_£­x@3ÏÌ¿�»Ï˜£*K
ê^aÅH踯ˆ¥Ñ†80õˆ8)}jX
+*“�`¢%”-~ôiéÃZUsu„Î6÷È ¨²B«ÉèäçfP(#4çám-†!GX~„úþ~øáýûŸö‰ôáÙ›+qwÄ‹³"ìN©Žp&e’l
jí4S>Â$@Gø%üž€R·§FK]t¶•W+
 endobj
-1186 0 obj <<
+1195 0 obj <<
 /Type /Page
-/Contents 1187 0 R
-/Resources 1185 0 R
+/Contents 1196 0 R
+/Resources 1194 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
-/Annots [ 1194 0 R 1195 0 R ]
+/Parent 1183 0 R
+/Annots [ 1203 0 R 1204 0 R ]
 >> endobj
-1194 0 obj <<
+1203 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [348.3486 128.9523 463.9152 141.0119]
 /Subtype/Link/A<</Type/Action/S/URI/URI(mailto:info@isc.org)>>
 >> endobj
-1195 0 obj <<
+1204 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [147.3629 116.9971 364.5484 129.0567]
 /Subtype/Link/A<</Type/Action/S/URI/URI(http://www.isc.org/services/support/)>>
 >> endobj
-1188 0 obj <<
-/D [1186 0 R /XYZ 85.0394 794.5015 null]
+1197 0 obj <<
+/D [1195 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 534 0 obj <<
-/D [1186 0 R /XYZ 85.0394 769.5949 null]
+/D [1195 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-1189 0 obj <<
-/D [1186 0 R /XYZ 85.0394 576.7004 null]
+1198 0 obj <<
+/D [1195 0 R /XYZ 85.0394 576.7004 null]
 >> endobj
 538 0 obj <<
-/D [1186 0 R /XYZ 85.0394 576.7004 null]
+/D [1195 0 R /XYZ 85.0394 576.7004 null]
 >> endobj
-1190 0 obj <<
-/D [1186 0 R /XYZ 85.0394 548.3785 null]
+1199 0 obj <<
+/D [1195 0 R /XYZ 85.0394 548.3785 null]
 >> endobj
 542 0 obj <<
-/D [1186 0 R /XYZ 85.0394 548.3785 null]
+/D [1195 0 R /XYZ 85.0394 548.3785 null]
 >> endobj
-1191 0 obj <<
-/D [1186 0 R /XYZ 85.0394 518.5228 null]
+1200 0 obj <<
+/D [1195 0 R /XYZ 85.0394 518.5228 null]
 >> endobj
 546 0 obj <<
-/D [1186 0 R /XYZ 85.0394 460.6968 null]
+/D [1195 0 R /XYZ 85.0394 460.6968 null]
 >> endobj
-1192 0 obj <<
-/D [1186 0 R /XYZ 85.0394 425.0333 null]
+1201 0 obj <<
+/D [1195 0 R /XYZ 85.0394 425.0333 null]
 >> endobj
 550 0 obj <<
-/D [1186 0 R /XYZ 85.0394 260.2468 null]
+/D [1195 0 R /XYZ 85.0394 260.2468 null]
 >> endobj
-1193 0 obj <<
-/D [1186 0 R /XYZ 85.0394 224.698 null]
+1202 0 obj <<
+/D [1195 0 R /XYZ 85.0394 224.698 null]
 >> endobj
-1185 0 obj <<
-/Font << /F42 597 0 R /F43 600 0 R /F11 785 0 R /F57 624 0 R >>
+1194 0 obj <<
+/Font << /F42 597 0 R /F43 600 0 R /F11 1157 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1199 0 obj <<
+1207 0 obj <<
 /Length 69        
 /Filter /FlateDecode
 >>
 stream
 xÚ3T0
 endobj
-1198 0 obj <<
+1206 0 obj <<
 /Type /Page
-/Contents 1199 0 R
-/Resources 1197 0 R
+/Contents 1207 0 R
+/Resources 1205 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
+/Parent 1183 0 R
 >> endobj
-1200 0 obj <<
-/D [1198 0 R /XYZ 56.6929 794.5015 null]
+1208 0 obj <<
+/D [1206 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
-1197 0 obj <<
+1205 0 obj <<
 /ProcSet [ /PDF ]
 >> endobj
-1203 0 obj <<
-/Length 2607      
+1211 0 obj <<
+/Length 2587      
 /Filter /FlateDecode
 >>
 stream
-xÚ}ÉrÛ8öž¯ð­éªH!	R¤æfËYœ´=.Ë™®šé9@$,aB‘AÚQý¼
”ì°S:xððv@ÑY¿è,Oç¡Z&gÙ2™§a”žû7áÙpßDB“¤jž&JÁd;KU>Oó8;›�.rùðæ݇$>‹Ãùb§g�ã^‹l1O�ãì¡üOpѶ¦.í�óYœ†ÁÅù>3_2Ïò,B¾öÈçÑ"KN9
-ãFâ(™«dñb1�T–2ñ<:ŸEaKßêæ¹2åvoêþ„7š/ÓÔóª6R‘ç=r³|—�5�<üd]ßtž4ìw†W·kèºÖëÛ+ÙT�-çËE¼�=ã|ž(ÐíYõ»fØî€G-e9üÇ	ìåÁŸaVWaÜæ<
-ÌÖÖµ­·!iNÙ¯š½¶5�oõ^ ëƒëÍ^XŠbè:ÜÀ ¼*<}´Ìe£gÛ¿–«6•-to›zÜΈ§õ
-§ºÿ°B%$Á2ßòH4•EÃÛâL‰"G´
-jóÌç¥à³v,�+:»!™
N2dV<bˆB	„%Ïc‰e¢æç3‡Á¥Ù�«$"MÃ,
-T“¥‡RD¡J@ʼnJ([ø�G†¼›­šº0-JŠ0R>èÂV¶·Æ!›¬ ØüÅòéÛ)Õ¿ØL-d³ë}[™7T*•E�dÝš‚ôË™ƒS"ŽfDúƒ!rd÷±€4¬ 
-Á¢å“oC
-!mg8iP¦
üoð?SP­ (®ÐDŽñ04È•ï!¼¿Àzÿ:�"èòà윓BiòàK}%õ;QóVöLæù\ñð¤@Â=`ò@= |ÞÙHTö>«­š};ˆcgÒ=JD¾:/ ?MÎ1
Wëû�lc6
-�ÿDï}�ðÁ+ýd©µ
ƒ{»ÝVx¨ØÇ<
-.8bxÝã)´¢ei}K„(É-0š®`âŸ1„âcÿ<V'„H
-¦¼JW[¾,…{L
/cW<€õ‚ßÈÆœU†¨rè¸9È߀"#´ðÿ`Ù1ýáÎY£ÓäQ°ê´Ì�î`ï’ò6¢Öû¦‘•Vº«&CýÆöÐÂWYWÁôjÒÈÍ08R\Ÿíž�—UCê%bˆpdY;ðÂþ/ô <ñF	sJ4P7032€=VqÃÆ™ïƒ
}Õ=Ý
-Q}¯¿qÆýiîOq;¸3ºþ6ÍÓàng+]T{Ж£¼÷Óûfc:Ô[¾ÞW	ô¢¢,
ä—ZÞ,zÏ!ÐRÛ{–Ëî0òSìŽÍ6®WËõöYÄ
WÖõy`
V;±þtét˜Y$=1>"À�õw»Ç{WUYÂÆXçú]S•Œ¾Óôªó¦Ü	û‡�²
- FÏæé{*úú§3/Å‘÷‚Ÿ¨�Ï(ˆòÞ�pà®Ûjáò­Ìô­¢‡ÂþNŠ<´�û½��¿O3¹:M30;V¤¶G(F4µÔó’ç;ýd˜hc(„
&EÄ	
+xÚ}YYsÜ8~ϯðÛÈUéŽîcßìv'c�ËíÌTíÎ>°%º›‰RDÉNϯ_€
+P2kb
<9iHñ{|¸,BïJË
2§ˆ!^‰oƒ“ŽŽ
+®6pjKÂ¥é·û_NïV²‡%@9 öF–6n8¬!Í`OŽôþÊ�ìf8‰Ïn³J¾Èºíl¢Ø%È°Äzyæ4Z4 ûNTnŒU�ÒÌ3åN¢A8F'ã¯àß^tªª÷4
‹ÀÓ Ž‹ŠÔkÁ@k›¨I
+‚ÆC@\Ò4ðî1	�mÃ8“`¯rJ¢8ó^{5RÓ„Â›«f'yª˜�1¥Ñ°�š¶RxÑœ,e#Ú^ÁMCËÃ8÷ª¶ÁJ¸ƒ!ŠM»8¤u×ÂAYQ5ûöENðsîí�0¸aTÀ>š~íÆ8@‘ï‹Í“5¸&KºZ(øQ.Ž£Ø¢…»òÈÂ+o«V—²CK‘fÝ‚ƒ¢Tµ”4¨Æ+07?Y>y;gõÉfQÊ›Ý6]-�Ò0Š^DÖ�,­	9Ê�q#Ê™“º»(C¢€/¬zeˆ4v°ó\²ìT¹ct®ë3¼V'†;@”ïmFUCbº…‹eêT™ž´2Ò½h2…'•CbkBbÙ¿ÀѳسèRx%F –Y–ps]€P€ð8×ÎéÄæt´ ðʼ͞~Äh›{wmùMtr褮!bÄLt§ÛJRôåýŠOˆvmg¡O„F”;¥¥!¹º…ÓArÏÞ®ÄU |Õ
+ŽmÔ°çÕŸI`ÝŽ Óóž+Q+°N+ñÛz«aÞLf�B©sÖK]ZKâtÌ †qà ",]¯·ë[Y”a¨€õoIŒ€<‹X¿pBÜ;Ì¢¥�Í
ÂJ¢Úa#Xnq»Â�–$qE?SÖqÌ$«Åî(°ÎúA#çâ·ÇW
+‡/´òÿd9pæ\UPR¡u<Ü*Ê‘×9P–Ì Ëï—A
+wÛì!`UcO�
+þÔ?£úÈ65 ÖÁÃQØ/À(ÙõƒøF¸úÓþVÜž…ïÁÜ›—Ëïa§j]Õ
xËXôƒ'èc»‘=ú-O½÷õ_L½ª-H€øµàσÓ`ìR58•ë~?éHYîÕ
+Õ™õnZæþ*_Õ<<®v=~Éêÿa�V?ïÆ­¬ßžÝ;‹æn[”Ç'�
+R{¿BbRK	4¯3ÓNŸœ�g{H`M™MÓ÷¶´˜ŸF|÷.~’>|)A–Ën¤ƒ¶.U'X˵/ó‡
Ê÷;.åÐ(6�»3€£G0³£ºÛ£"b´škxEó�x‘$´‘ö
+�k‡d
+
+¼®ÜÝØÎèöû!
mNDî*\vª#} ì×Û"“òPo0aäºå³%箋rn6\©]] ¡$‘9uŸɯã\V)Ȩº,ë¨7ÿ2¸ÿDøq?šý?„YdèŸÇßÛ#?]æPíÜBh~–�ï6ýKãçíþRÉÒ¥endstream
 endobj
-1202 0 obj <<
+1210 0 obj <<
 /Type /Page
-/Contents 1203 0 R
-/Resources 1201 0 R
+/Contents 1211 0 R
+/Resources 1209 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
+/Parent 1183 0 R
 >> endobj
-1204 0 obj <<
-/D [1202 0 R /XYZ 85.0394 794.5015 null]
+1212 0 obj <<
+/D [1210 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 554 0 obj <<
-/D [1202 0 R /XYZ 85.0394 769.5949 null]
+/D [1210 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-1205 0 obj <<
-/D [1202 0 R /XYZ 85.0394 572.1453 null]
+1213 0 obj <<
+/D [1210 0 R /XYZ 85.0394 573.5449 null]
 >> endobj
 558 0 obj <<
-/D [1202 0 R /XYZ 85.0394 572.1453 null]
+/D [1210 0 R /XYZ 85.0394 573.5449 null]
 >> endobj
-1206 0 obj <<
-/D [1202 0 R /XYZ 85.0394 536.5761 null]
+1214 0 obj <<
+/D [1210 0 R /XYZ 85.0394 539.0037 null]
 >> endobj
 562 0 obj <<
-/D [1202 0 R /XYZ 85.0394 536.5761 null]
+/D [1210 0 R /XYZ 85.0394 539.0037 null]
 >> endobj
-1207 0 obj <<
-/D [1202 0 R /XYZ 85.0394 506.7869 null]
+1215 0 obj <<
+/D [1210 0 R /XYZ 85.0394 510.2426 null]
 >> endobj
-1201 0 obj <<
+1209 0 obj <<
 /Font << /F42 597 0 R /F43 600 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1210 0 obj <<
+1218 0 obj <<
 /Length 3135      
 /Filter /FlateDecode
 >>
@@ -4775,73 +4837,73 @@ BPC,LØwÿÛ,ÏGç€ÙË
Íc@ËýŒ>©Ö'GBqwüL×L#°$xE›VŽà
 Iz¼mkV òl¿P]RÕ‹Ø	L‘ÇMê»sÖØEŸœ5O¯kpÚ°¸�Ÿö"맪ÔVÙVÇ…çyž�9o’Üå{…4„yý|zÖ?ÿ¼ÛH\–4»O]‹ÃÃelÑø>ÃaV/ÜÉy}½{–Bõ¯<Ó4/t›-.}z·ó”õuR/ü}³^$nÝe2[dEZ>F·W
�6);‰^ÑW.ÖgÉ*™âûÉ–êv7íß� dO{‹‚–Nj ™>f”4ÚsE¥úUu„Æ`v0âf妩ïY¯³t¾ë1¨ÜÔ}•ÐcÊM1O`^õÎé "1º	y»1(sŸlû¹ë“<©ª¼Is[ã<-—‰§vC�Ií=éäòô•ôµ :Z`QÏ¡²ði*
,76Õ¥©›²)²ß7n¼•ÚÀPj
.âÃ]Š¶âŠÐ�±€p$â(“Ð0ÀÚN+ª6·ËX€RVíÒ‚�'bz=Á!+¢'ïØSöFÄö­q]5óÚ7¨N·µ5{ DÔ™· —ºùCûb'zï�(¥ä˜“Qçççgøk›Ò(žð™'¯±÷XØ
†¢Þ.ÇCAgЕ—)½§ÀfÈî
 «Ø5u“%CÁ®ïY2¶¥lÐX”›|N­NDìw“får•ƒ§M—`jé< g¯ãÞ!ԓʽ$za¤ÔÇuV×H+¸CP)èÛ¦y9ûTQ¹JW	V]عöÄ		5ÌÀ%ö�ŽQ¸€}yšÌívÂÿ!'X:‚öѦ¡v-jY¢
Ûõ£å�[ê¼y+}¢°ô1
HÒ£æ�¾÷žÞ=<Á‹ò£ùT	ø5G	cPºEÞn�nSÍ�ÄTŠÝÏòÝÝïŽTóôùÌpðÜéÌé“Ê
k,	†äÙ§4ßR‡ÝE•ZÔtá
 ~ÏI‹ƒ�|ò¬p�÷YB…ó	>,s5Ä�
-nëÕÑû÷(w�UY�Î7ï³bdUó?®°ö—…Î5“É
+nëÕÑû÷(w�UY�Î7ï³bdUó?®°ö—…Î5“É
 endobj
-1209 0 obj <<
+1217 0 obj <<
 /Type /Page
-/Contents 1210 0 R
-/Resources 1208 0 R
+/Contents 1218 0 R
+/Resources 1216 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
-/Annots [ 1218 0 R 1219 0 R ]
+/Parent 1183 0 R
+/Annots [ 1226 0 R 1227 0 R ]
 >> endobj
-1218 0 obj <<
+1226 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [401.6435 61.5153 511.2325 73.5749]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://www.isi.edu/in-notes/)>>
 >> endobj
-1219 0 obj <<
+1227 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [55.6967 30.8502 511.2325 44.7979]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://www.isi.edu/in-notes/)>>
 >> endobj
-1211 0 obj <<
-/D [1209 0 R /XYZ 56.6929 794.5015 null]
+1219 0 obj <<
+/D [1217 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 566 0 obj <<
-/D [1209 0 R /XYZ 56.6929 769.5949 null]
+/D [1217 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
-1212 0 obj <<
-/D [1209 0 R /XYZ 56.6929 748.2826 null]
+1220 0 obj <<
+/D [1217 0 R /XYZ 56.6929 748.2826 null]
 >> endobj
 570 0 obj <<
-/D [1209 0 R /XYZ 56.6929 748.2826 null]
+/D [1217 0 R /XYZ 56.6929 748.2826 null]
 >> endobj
-801 0 obj <<
-/D [1209 0 R /XYZ 56.6929 720.3635 null]
+809 0 obj <<
+/D [1217 0 R /XYZ 56.6929 720.3635 null]
 >> endobj
-1213 0 obj <<
-/D [1209 0 R /XYZ 56.6929 647.0664 null]
+1221 0 obj <<
+/D [1217 0 R /XYZ 56.6929 647.0664 null]
 >> endobj
-1214 0 obj <<
-/D [1209 0 R /XYZ 56.6929 635.1112 null]
+1222 0 obj <<
+/D [1217 0 R /XYZ 56.6929 635.1112 null]
 >> endobj
-1215 0 obj <<
-/D [1209 0 R /XYZ 56.6929 529.3677 null]
+1223 0 obj <<
+/D [1217 0 R /XYZ 56.6929 529.3677 null]
 >> endobj
-1216 0 obj <<
-/D [1209 0 R /XYZ 56.6929 517.4125 null]
+1224 0 obj <<
+/D [1217 0 R /XYZ 56.6929 517.4125 null]
 >> endobj
 574 0 obj <<
-/D [1209 0 R /XYZ 56.6929 180.3481 null]
+/D [1217 0 R /XYZ 56.6929 180.3481 null]
 >> endobj
-1217 0 obj <<
-/D [1209 0 R /XYZ 56.6929 143.7717 null]
+1225 0 obj <<
+/D [1217 0 R /XYZ 56.6929 143.7717 null]
 >> endobj
 578 0 obj <<
-/D [1209 0 R /XYZ 56.6929 143.7717 null]
+/D [1217 0 R /XYZ 56.6929 143.7717 null]
 >> endobj
 644 0 obj <<
-/D [1209 0 R /XYZ 56.6929 116.6563 null]
+/D [1217 0 R /XYZ 56.6929 116.6563 null]
 >> endobj
-1208 0 obj <<
-/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F11 785 0 R /F77 703 0 R /F57 624 0 R >>
+1216 0 obj <<
+/Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F11 1157 0 R /F77 703 0 R /F57 624 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1222 0 obj <<
-/Length 2590      
+1230 0 obj <<
+/Length 2591      
 /Filter /FlateDecode
 >>
 stream
@@ -4851,192 +4913,192 @@ xÚ­Z[s£8~ϯð£]µV�„lmm•c;wwÜ;½³³=ó@Û$¦Úà\æ×ï’@`�{j·ò!tÄùÎå“d<pà|†¸
 U
ùÿæ”ïdk¾ÿS¶ÓþýG�0æ�0¤,Hh©
 	êø$lª
$Úº{�0•/£g0é‹ÎjáfW±
 �ô*~>EYí†í9&é.E“d+ß«æq÷rÿ»ÙUv÷ûíDÂeÀRìv7¤,v×R•Ý}×B¬ª
»·u÷ØÝT¾ŽyŸ²áÇè]6jnT
¢”Š¤ˆ«¢’²‚AC
qÚñ¸^TçKg•‰"ÇgØ@	^ªK<@:t‡ñUu¢Áð³º;m�¿r™	õ‡352ób,_¥¢‘øöáw]ëhùÕ:VÄõF¹Š<ßØïÁ	©§ôŸÄqœnÖ	Û>ŸºøÇX§zŒ÷*
I¶šqÍ¢—hŸCëóGêäòK$É”ê÷ÇJª"I¾o)ÂVÕµ?žéîödžò*ÈçoE”äçI9?�i¦XÊâAþ‰²¼"I^Wb
-²ö
ÉÙR˜y¯:§ªs�Ê<.¹œž·�sã$c&ÆÏm2§Ëû=0¬jŸü×\û
‚
õ—0¥ú]¢’ªO¢|ÒïVÕµKœéîv‰†ò5ìŸôÁßòT³™	äƒÝ!zßy¡ÉsÏw¶Õ6¶e}s«k;`:Ëô˜{ˆr¯ut»Šòô”mT}ZE›4ÛêËÀ¾£Þc\ØŠKÛÖB•P… ö©A‹^À–âüÍËè¾SÎÐX­TG$'’¸è£[Ž‹<1M�aIŸnÅvÉ9æ/òšzfE)€‡ŸÔÐDý¿%+Ks%°R_ö{ˆÛDÍ+]
ºëX/›·)’›éU5¼¤No�Š›fâÛá­eúÑU2¸Ü±dl‹ÒÛ–Önh
µ?Y®'ÚÓ…ß—§
ßï„—À.'à­‹½§½dίjt˜NÓ=ìwÞéöŸsD¸‡/ü¦ê7¿ª÷ Üb›Þ€¶ânLÍ┞ðá}–;Oâ©ó
蛿%WÉsiGü”VG! ±H@øPuxò愨“cѨè6*º
½½'ÇÔÁˆCã¨Ë2)&_ä•$ôÕ1F§É’*éiT„ÉO}%µ«æB×Ôxó=NòŠGµîÝ,×”!ñ{Ÿdœ*ÑÿÏ?+2��Ûú=×oÔñ º®%¾›ó³£èß�/ý¿‚¨¦endstream
+²ö
ÉÙR˜y¯:§ªs�Ê<.¹œž·�sã$c&ÆÏm2§Ëû=0¬jŸü×\û
‚
õ—0¥ú]¢’ªO¢|ÒïVÕµKœéîv‰†ò5ìŸôÁßòT³™	äƒÝ!zßy¡ÉsÏw¶Õ6¶e}s«k;`:Ëô˜{ˆr¯ut»Šòô”mT}ZE›4ÛêËÀ¾£Þc\ØŠKÛÖB•P… ö©A‹^À–âüÍËè¾SÎÐX­TG$'’¸è£[Ž‹<1M�aIŸnÅvÉ9æ/òšzfE)€‡ŸÔÐDý¿%+Ks%°R_ö{ˆÛDÍ+]
ºëX/›·)’›éU5¼¤No�Š›fâÛá­eúÑU2¸Ü±dl‹ÒÛ–Önh
µ?Y®'ÚÓ…ß—§
ßï„—À.'à­‹½§½dίjt˜NÓ=ìwÞéöŸsD¸‡/ü¦ê7¿ª÷ Üb›Þ€¶ânLÍ┞ðá}–;Oâ©ó
蛿%WÉsiGü”VG! ±H@øPuxò愨“cѨè6*º
½½'ÇÔÁˆCã¨Ë2)&_ä•$ôÕ1F§É’*éiT„ÉO}%µ«æB×Ôxó=NòŠGµîÝ,×”!ñ{Ÿdœ*ÑÿÏ?+2��Ûú=×oÔñ º®%¾›g?FÑ¿?:_ú
ƒ
 endobj
-1221 0 obj <<
+1229 0 obj <<
 /Type /Page
-/Contents 1222 0 R
-/Resources 1220 0 R
+/Contents 1230 0 R
+/Resources 1228 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
-/Annots [ 1223 0 R 1225 0 R 1226 0 R 1227 0 R ]
+/Parent 1283 0 R
+/Annots [ 1231 0 R 1233 0 R 1234 0 R 1235 0 R ]
 >> endobj
-1223 0 obj <<
+1231 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [84.0431 793.5053 539.579 807.4529]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://www.isi.edu/in-notes/)>>
 >> endobj
-1225 0 obj <<
+1233 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [84.0431 756.4942 140.332 767.8862]
 /Subtype/Link/A<</Type/Action/S/URI/URI(ftp://www.isi.edu/in-notes/)>>
 >> endobj
-1226 0 obj <<
+1234 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [507.6985 756.4942 539.579 767.8862]
 /Subtype/Link/A<</Type/Action/S/URI/URI(http://www.ietf.org/rfc/)>>
 >> endobj
-1227 0 obj <<
+1235 0 obj <<
 /Type /Annot
 /Border[0 0 0]/H/I/C[0 1 1]
 /Rect [84.0431 745.1168 199.6097 755.2785]
 /Subtype/Link/A<</Type/Action/S/URI/URI(http://www.ietf.org/rfc/)>>
 >> endobj
-1224 0 obj <<
-/D [1221 0 R /XYZ 85.0394 794.5015 null]
->> endobj
-1228 0 obj <<
-/D [1221 0 R /XYZ 85.0394 694.0474 null]
->> endobj
-1229 0 obj <<
-/D [1221 0 R /XYZ 85.0394 694.0474 null]
->> endobj
-1230 0 obj <<
-/D [1221 0 R /XYZ 85.0394 660.6469 null]
->> endobj
-1231 0 obj <<
-/D [1221 0 R /XYZ 85.0394 660.6469 null]
->> endobj
 1232 0 obj <<
-/D [1221 0 R /XYZ 85.0394 660.6469 null]
->> endobj
-1233 0 obj <<
-/D [1221 0 R /XYZ 85.0394 654.2654 null]
->> endobj
-1234 0 obj <<
-/D [1221 0 R /XYZ 85.0394 639.5008 null]
->> endobj
-1235 0 obj <<
-/D [1221 0 R /XYZ 85.0394 635.7135 null]
+/D [1229 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 1236 0 obj <<
-/D [1221 0 R /XYZ 85.0394 620.9489 null]
+/D [1229 0 R /XYZ 85.0394 694.0474 null]
 >> endobj
 1237 0 obj <<
-/D [1221 0 R /XYZ 85.0394 617.1617 null]
+/D [1229 0 R /XYZ 85.0394 694.0474 null]
 >> endobj
 1238 0 obj <<
-/D [1221 0 R /XYZ 85.0394 557.6417 null]
->> endobj
-746 0 obj <<
-/D [1221 0 R /XYZ 85.0394 557.6417 null]
+/D [1229 0 R /XYZ 85.0394 660.6469 null]
 >> endobj
 1239 0 obj <<
-/D [1221 0 R /XYZ 85.0394 557.6417 null]
+/D [1229 0 R /XYZ 85.0394 660.6469 null]
 >> endobj
 1240 0 obj <<
-/D [1221 0 R /XYZ 85.0394 554.1294 null]
+/D [1229 0 R /XYZ 85.0394 660.6469 null]
 >> endobj
 1241 0 obj <<
-/D [1221 0 R /XYZ 85.0394 539.3648 null]
+/D [1229 0 R /XYZ 85.0394 654.2654 null]
 >> endobj
 1242 0 obj <<
-/D [1221 0 R /XYZ 85.0394 535.5776 null]
+/D [1229 0 R /XYZ 85.0394 639.5008 null]
 >> endobj
 1243 0 obj <<
-/D [1221 0 R /XYZ 85.0394 520.813 null]
+/D [1229 0 R /XYZ 85.0394 635.7135 null]
 >> endobj
 1244 0 obj <<
-/D [1221 0 R /XYZ 85.0394 517.0257 null]
+/D [1229 0 R /XYZ 85.0394 620.9489 null]
 >> endobj
 1245 0 obj <<
-/D [1221 0 R /XYZ 85.0394 490.306 null]
+/D [1229 0 R /XYZ 85.0394 617.1617 null]
 >> endobj
 1246 0 obj <<
-/D [1221 0 R /XYZ 85.0394 486.5187 null]
+/D [1229 0 R /XYZ 85.0394 557.6417 null]
+>> endobj
+746 0 obj <<
+/D [1229 0 R /XYZ 85.0394 557.6417 null]
 >> endobj
 1247 0 obj <<
-/D [1221 0 R /XYZ 85.0394 471.7541 null]
+/D [1229 0 R /XYZ 85.0394 557.6417 null]
 >> endobj
 1248 0 obj <<
-/D [1221 0 R /XYZ 85.0394 467.9669 null]
+/D [1229 0 R /XYZ 85.0394 554.1294 null]
 >> endobj
 1249 0 obj <<
-/D [1221 0 R /XYZ 85.0394 453.2621 null]
+/D [1229 0 R /XYZ 85.0394 539.3648 null]
 >> endobj
 1250 0 obj <<
-/D [1221 0 R /XYZ 85.0394 449.415 null]
+/D [1229 0 R /XYZ 85.0394 535.5776 null]
 >> endobj
 1251 0 obj <<
-/D [1221 0 R /XYZ 85.0394 377.9399 null]
+/D [1229 0 R /XYZ 85.0394 520.813 null]
 >> endobj
 1252 0 obj <<
-/D [1221 0 R /XYZ 85.0394 377.9399 null]
+/D [1229 0 R /XYZ 85.0394 517.0257 null]
 >> endobj
 1253 0 obj <<
-/D [1221 0 R /XYZ 85.0394 377.9399 null]
+/D [1229 0 R /XYZ 85.0394 490.306 null]
 >> endobj
 1254 0 obj <<
-/D [1221 0 R /XYZ 85.0394 374.4276 null]
+/D [1229 0 R /XYZ 85.0394 486.5187 null]
 >> endobj
 1255 0 obj <<
-/D [1221 0 R /XYZ 85.0394 359.7228 null]
+/D [1229 0 R /XYZ 85.0394 471.7541 null]
 >> endobj
 1256 0 obj <<
-/D [1221 0 R /XYZ 85.0394 355.8757 null]
+/D [1229 0 R /XYZ 85.0394 467.9669 null]
 >> endobj
 1257 0 obj <<
-/D [1221 0 R /XYZ 85.0394 331.806 null]
+/D [1229 0 R /XYZ 85.0394 453.2621 null]
 >> endobj
 1258 0 obj <<
-/D [1221 0 R /XYZ 85.0394 325.3687 null]
+/D [1229 0 R /XYZ 85.0394 449.415 null]
 >> endobj
 1259 0 obj <<
-/D [1221 0 R /XYZ 85.0394 265.8487 null]
+/D [1229 0 R /XYZ 85.0394 377.9399 null]
 >> endobj
 1260 0 obj <<
-/D [1221 0 R /XYZ 85.0394 265.8487 null]
+/D [1229 0 R /XYZ 85.0394 377.9399 null]
 >> endobj
 1261 0 obj <<
-/D [1221 0 R /XYZ 85.0394 265.8487 null]
+/D [1229 0 R /XYZ 85.0394 377.9399 null]
 >> endobj
 1262 0 obj <<
-/D [1221 0 R /XYZ 85.0394 262.3364 null]
+/D [1229 0 R /XYZ 85.0394 374.4276 null]
 >> endobj
 1263 0 obj <<
-/D [1221 0 R /XYZ 85.0394 236.8919 null]
+/D [1229 0 R /XYZ 85.0394 359.7228 null]
 >> endobj
 1264 0 obj <<
-/D [1221 0 R /XYZ 85.0394 231.8294 null]
+/D [1229 0 R /XYZ 85.0394 355.8757 null]
 >> endobj
 1265 0 obj <<
-/D [1221 0 R /XYZ 85.0394 205.1097 null]
+/D [1229 0 R /XYZ 85.0394 331.806 null]
 >> endobj
 1266 0 obj <<
-/D [1221 0 R /XYZ 85.0394 201.3224 null]
+/D [1229 0 R /XYZ 85.0394 325.3687 null]
 >> endobj
 1267 0 obj <<
-/D [1221 0 R /XYZ 85.0394 141.7069 null]
+/D [1229 0 R /XYZ 85.0394 265.8487 null]
 >> endobj
 1268 0 obj <<
-/D [1221 0 R /XYZ 85.0394 141.7069 null]
+/D [1229 0 R /XYZ 85.0394 265.8487 null]
 >> endobj
 1269 0 obj <<
-/D [1221 0 R /XYZ 85.0394 141.7069 null]
+/D [1229 0 R /XYZ 85.0394 265.8487 null]
 >> endobj
 1270 0 obj <<
-/D [1221 0 R /XYZ 85.0394 138.2901 null]
+/D [1229 0 R /XYZ 85.0394 262.3364 null]
 >> endobj
 1271 0 obj <<
-/D [1221 0 R /XYZ 85.0394 114.2204 null]
+/D [1229 0 R /XYZ 85.0394 236.8919 null]
 >> endobj
 1272 0 obj <<
-/D [1221 0 R /XYZ 85.0394 107.7831 null]
+/D [1229 0 R /XYZ 85.0394 231.8294 null]
 >> endobj
 1273 0 obj <<
-/D [1221 0 R /XYZ 85.0394 93.0186 null]
+/D [1229 0 R /XYZ 85.0394 205.1097 null]
 >> endobj
 1274 0 obj <<
-/D [1221 0 R /XYZ 85.0394 89.2313 null]
+/D [1229 0 R /XYZ 85.0394 201.3224 null]
 >> endobj
-1220 0 obj <<
-/Font << /F62 634 0 R /F57 624 0 R /F11 785 0 R /F43 600 0 R /F77 703 0 R /F42 597 0 R /F56 618 0 R >>
-/ProcSet [ /PDF /Text ]
+1275 0 obj <<
+/D [1229 0 R /XYZ 85.0394 141.7069 null]
+>> endobj
+1276 0 obj <<
+/D [1229 0 R /XYZ 85.0394 141.7069 null]
 >> endobj
 1277 0 obj <<
+/D [1229 0 R /XYZ 85.0394 141.7069 null]
+>> endobj
+1278 0 obj <<
+/D [1229 0 R /XYZ 85.0394 138.2901 null]
+>> endobj
+1279 0 obj <<
+/D [1229 0 R /XYZ 85.0394 114.2204 null]
+>> endobj
+1280 0 obj <<
+/D [1229 0 R /XYZ 85.0394 107.7831 null]
+>> endobj
+1281 0 obj <<
+/D [1229 0 R /XYZ 85.0394 93.0186 null]
+>> endobj
+1282 0 obj <<
+/D [1229 0 R /XYZ 85.0394 89.2313 null]
+>> endobj
+1228 0 obj <<
+/Font << /F62 634 0 R /F57 624 0 R /F11 1157 0 R /F43 600 0 R /F77 703 0 R /F42 597 0 R /F56 618 0 R >>
+/ProcSet [ /PDF /Text ]
+>> endobj
+1286 0 obj <<
 /Length 2680      
 /Filter /FlateDecode
 >>
@@ -5053,215 +5115,214 @@ Y«Yëó!4.EGSÊ’õͪuÖT­«ã½•B˜5"afô¨pº¹ºCõ`N¶Ø,«²¦Åš÷¢ýŽ¼‰ü¥ÕO_Ÿtì]Šöu)�
 ­ÑØÇ6Ó¨cBʼo §„®�Û­9Ï÷mPbß8gŽtÉ{"Óˆ÷å+Ýë–7ÎM`ñI|AÏš”EÏRê¤çÄf.6hMÏ}l³žul¥Ny5íjûSI62ÈI‘¨Ûó!vèç“ž™““ñC•ÕiiÊ-ÀÕkPá®ë øRVO—²(\J�$ß7X¡5…÷±Í
 ×±Åé\�r©Ù:;ÛåÆËî,ÏåSäàA9èr𠢂�Éq»#ÅÐÆήâ±·E6¾.5̃’:Ýcý`˜+ô‰‡3l#lu&„¾Ì´±"㸤x;	ðÒŠ%Éè+pgJ#`Ç�ãHóø‰×¦ØÈ?rZÀÙÔ¶be¬ç/FN™¿ˆ
j	KÑÿ°…ûöú­õˆb¸:.fÿ¼~‚ä@Àx!ÎÓ¥,tJ©�¶—˜Vh�Î>¶™N{¦î=¯ì=‡Œ¼n¤A‰° gzzŠµ6[žñd‡3Æý®­1¶.ä<ö&«t#»u]æ´é'³>Ùþ�·¹Iç-~Á}$c-òÙV«ÁÀűƒ.ùUMh˜)¤…úm¸'öûÀFòu`~†áPOªcñbþ—´ÜVä°ËÒV5ÐòÉâECìÄA�è/´ÐøÚáo¿BÓ<=mÀ�!*LwÇü¿T´>	ùÇœfMAÕÕº8‰Ð72p°nÊ"{'ìYâwìy J9ÛEìK¯ŸÀbkàɹn?u=¯ÈKcÚà.³A'öSk£â@Ž‚²ß~ìq;¯ù¬“¨ì+Txº
,aºacx#»^qŽ`ü¦L�2ÅóOØ?Iý]äE
ñ¥•ðw ¤þÎ…oJñÆ4ë#èÝQî%Ý®6Å�ß�Çí!Eìõ5-RÞšð{´‡ªŸß& p[ Ûg¿@cÝ�m{†@¹ýFnè+ÍË{>XQ˜ ñ­4[–ƒie”¾ØÀ”´ïu™M³jÁ2-tÙ}îòøÈ-Ÿ�m*ØdÀ/´î,òÆ2÷™Á‘Åv`,ÝHÔÞ�Þ¸T½+�¹hmQYaMùÿ�cÉÝ¶îÚÒL4ù­~ZÄBLÖ~(�óF�_¨‘9fòiZî§&~ìµ1›¹ãõÿç;
 $sž®’¤Q"Bø´	¡ò"=¶çj^m—ÿœEðâÓ‡Éñ.®D(ìÈ«˜„ð¿<{¡5,�×ÚÝ
-ÿuö‹öeÑìÄXØïr‰?ÁõìL*Vè+nÓÝÌçÇ®TÆʇÍéf¿~S/T3á`ûìJ‘W2Ô�þb2¸_W¹‘ÿûƒ*-U9^<tã„›.0‰XÓGŸ­¹öBlXúÿ
+ÿuö‹öeÑìÄXØïr‰?ÁõìL*Vè+nÓÝÌçÇ®TÆʇÍéf¿~S/T3á`ûìJ‘W2Ô�þb2¸_W¹‘ÿûƒ*-U9^<tã„›.0‰XÓGìž­¹öBlXúÿ
 endobj
-1276 0 obj <<
+1285 0 obj <<
 /Type /Page
-/Contents 1277 0 R
-/Resources 1275 0 R
+/Contents 1286 0 R
+/Resources 1284 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1196 0 R
->> endobj
-1278 0 obj <<
-/D [1276 0 R /XYZ 56.6929 794.5015 null]
->> endobj
-1279 0 obj <<
-/D [1276 0 R /XYZ 56.6929 769.5949 null]
->> endobj
-1280 0 obj <<
-/D [1276 0 R /XYZ 56.6929 771.5874 null]
->> endobj
-1281 0 obj <<
-/D [1276 0 R /XYZ 56.6929 747.5177 null]
->> endobj
-1282 0 obj <<
-/D [1276 0 R /XYZ 56.6929 741.0838 null]
->> endobj
-1283 0 obj <<
-/D [1276 0 R /XYZ 56.6929 714.364 null]
->> endobj
-1284 0 obj <<
-/D [1276 0 R /XYZ 56.6929 710.5801 null]
->> endobj
-1285 0 obj <<
-/D [1276 0 R /XYZ 56.6929 683.8604 null]
->> endobj
-1286 0 obj <<
-/D [1276 0 R /XYZ 56.6929 680.0765 null]
+/Parent 1283 0 R
 >> endobj
 1287 0 obj <<
-/D [1276 0 R /XYZ 56.6929 623.4385 null]
+/D [1285 0 R /XYZ 56.6929 794.5015 null]
 >> endobj
 1288 0 obj <<
-/D [1276 0 R /XYZ 56.6929 623.4385 null]
+/D [1285 0 R /XYZ 56.6929 769.5949 null]
 >> endobj
 1289 0 obj <<
-/D [1276 0 R /XYZ 56.6929 623.4385 null]
+/D [1285 0 R /XYZ 56.6929 771.5874 null]
 >> endobj
 1290 0 obj <<
-/D [1276 0 R /XYZ 56.6929 617.0603 null]
+/D [1285 0 R /XYZ 56.6929 747.5177 null]
 >> endobj
 1291 0 obj <<
-/D [1276 0 R /XYZ 56.6929 602.2957 null]
+/D [1285 0 R /XYZ 56.6929 741.0838 null]
 >> endobj
 1292 0 obj <<
-/D [1276 0 R /XYZ 56.6929 598.5118 null]
+/D [1285 0 R /XYZ 56.6929 714.364 null]
 >> endobj
 1293 0 obj <<
-/D [1276 0 R /XYZ 56.6929 583.8071 null]
+/D [1285 0 R /XYZ 56.6929 710.5801 null]
 >> endobj
 1294 0 obj <<
-/D [1276 0 R /XYZ 56.6929 579.9633 null]
+/D [1285 0 R /XYZ 56.6929 683.8604 null]
 >> endobj
 1295 0 obj <<
-/D [1276 0 R /XYZ 56.6929 565.2586 null]
+/D [1285 0 R /XYZ 56.6929 680.0765 null]
 >> endobj
 1296 0 obj <<
-/D [1276 0 R /XYZ 56.6929 561.4149 null]
+/D [1285 0 R /XYZ 56.6929 623.4385 null]
 >> endobj
 1297 0 obj <<
-/D [1276 0 R /XYZ 56.6929 501.9076 null]
+/D [1285 0 R /XYZ 56.6929 623.4385 null]
 >> endobj
 1298 0 obj <<
-/D [1276 0 R /XYZ 56.6929 501.9076 null]
+/D [1285 0 R /XYZ 56.6929 623.4385 null]
 >> endobj
 1299 0 obj <<
-/D [1276 0 R /XYZ 56.6929 501.9076 null]
+/D [1285 0 R /XYZ 56.6929 617.0603 null]
 >> endobj
 1300 0 obj <<
-/D [1276 0 R /XYZ 56.6929 498.3987 null]
+/D [1285 0 R /XYZ 56.6929 602.2957 null]
 >> endobj
 1301 0 obj <<
-/D [1276 0 R /XYZ 56.6929 483.694 null]
+/D [1285 0 R /XYZ 56.6929 598.5118 null]
 >> endobj
 1302 0 obj <<
-/D [1276 0 R /XYZ 56.6929 479.8502 null]
+/D [1285 0 R /XYZ 56.6929 583.8071 null]
 >> endobj
 1303 0 obj <<
-/D [1276 0 R /XYZ 56.6929 465.0856 null]
+/D [1285 0 R /XYZ 56.6929 579.9633 null]
 >> endobj
 1304 0 obj <<
-/D [1276 0 R /XYZ 56.6929 461.3017 null]
+/D [1285 0 R /XYZ 56.6929 565.2586 null]
 >> endobj
 1305 0 obj <<
-/D [1276 0 R /XYZ 56.6929 446.5371 null]
+/D [1285 0 R /XYZ 56.6929 561.4149 null]
 >> endobj
 1306 0 obj <<
-/D [1276 0 R /XYZ 56.6929 442.7532 null]
+/D [1285 0 R /XYZ 56.6929 501.9076 null]
 >> endobj
 1307 0 obj <<
-/D [1276 0 R /XYZ 56.6929 386.1153 null]
+/D [1285 0 R /XYZ 56.6929 501.9076 null]
 >> endobj
 1308 0 obj <<
-/D [1276 0 R /XYZ 56.6929 386.1153 null]
+/D [1285 0 R /XYZ 56.6929 501.9076 null]
 >> endobj
 1309 0 obj <<
-/D [1276 0 R /XYZ 56.6929 386.1153 null]
+/D [1285 0 R /XYZ 56.6929 498.3987 null]
 >> endobj
 1310 0 obj <<
-/D [1276 0 R /XYZ 56.6929 379.7371 null]
+/D [1285 0 R /XYZ 56.6929 483.694 null]
 >> endobj
 1311 0 obj <<
-/D [1276 0 R /XYZ 56.6929 355.6674 null]
+/D [1285 0 R /XYZ 56.6929 479.8502 null]
 >> endobj
 1312 0 obj <<
-/D [1276 0 R /XYZ 56.6929 349.2334 null]
+/D [1285 0 R /XYZ 56.6929 465.0856 null]
 >> endobj
 1313 0 obj <<
-/D [1276 0 R /XYZ 56.6929 334.5287 null]
+/D [1285 0 R /XYZ 56.6929 461.3017 null]
 >> endobj
 1314 0 obj <<
-/D [1276 0 R /XYZ 56.6929 330.6849 null]
+/D [1285 0 R /XYZ 56.6929 446.5371 null]
 >> endobj
 1315 0 obj <<
-/D [1276 0 R /XYZ 56.6929 315.9203 null]
+/D [1285 0 R /XYZ 56.6929 442.7532 null]
 >> endobj
 1316 0 obj <<
-/D [1276 0 R /XYZ 56.6929 312.1364 null]
+/D [1285 0 R /XYZ 56.6929 386.1153 null]
 >> endobj
 1317 0 obj <<
-/D [1276 0 R /XYZ 56.6929 297.3719 null]
+/D [1285 0 R /XYZ 56.6929 386.1153 null]
 >> endobj
 1318 0 obj <<
-/D [1276 0 R /XYZ 56.6929 293.5879 null]
+/D [1285 0 R /XYZ 56.6929 386.1153 null]
 >> endobj
 1319 0 obj <<
-/D [1276 0 R /XYZ 56.6929 269.5182 null]
+/D [1285 0 R /XYZ 56.6929 379.7371 null]
 >> endobj
 1320 0 obj <<
-/D [1276 0 R /XYZ 56.6929 263.0843 null]
+/D [1285 0 R /XYZ 56.6929 355.6674 null]
 >> endobj
 1321 0 obj <<
-/D [1276 0 R /XYZ 56.6929 203.5771 null]
+/D [1285 0 R /XYZ 56.6929 349.2334 null]
 >> endobj
 1322 0 obj <<
-/D [1276 0 R /XYZ 56.6929 203.5771 null]
+/D [1285 0 R /XYZ 56.6929 334.5287 null]
 >> endobj
 1323 0 obj <<
-/D [1276 0 R /XYZ 56.6929 203.5771 null]
+/D [1285 0 R /XYZ 56.6929 330.6849 null]
 >> endobj
 1324 0 obj <<
-/D [1276 0 R /XYZ 56.6929 200.0681 null]
+/D [1285 0 R /XYZ 56.6929 315.9203 null]
+>> endobj
+1325 0 obj <<
+/D [1285 0 R /XYZ 56.6929 312.1364 null]
+>> endobj
+1326 0 obj <<
+/D [1285 0 R /XYZ 56.6929 297.3719 null]
+>> endobj
+1327 0 obj <<
+/D [1285 0 R /XYZ 56.6929 293.5879 null]
+>> endobj
+1328 0 obj <<
+/D [1285 0 R /XYZ 56.6929 269.5182 null]
+>> endobj
+1329 0 obj <<
+/D [1285 0 R /XYZ 56.6929 263.0843 null]
+>> endobj
+1330 0 obj <<
+/D [1285 0 R /XYZ 56.6929 203.5771 null]
+>> endobj
+1331 0 obj <<
+/D [1285 0 R /XYZ 56.6929 203.5771 null]
+>> endobj
+1332 0 obj <<
+/D [1285 0 R /XYZ 56.6929 203.5771 null]
+>> endobj
+1333 0 obj <<
+/D [1285 0 R /XYZ 56.6929 200.0681 null]
 >> endobj
 582 0 obj <<
-/D [1276 0 R /XYZ 56.6929 159.3692 null]
+/D [1285 0 R /XYZ 56.6929 159.3692 null]
 >> endobj
-1325 0 obj <<
-/D [1276 0 R /XYZ 56.6929 131.475 null]
+1334 0 obj <<
+/D [1285 0 R /XYZ 56.6929 131.475 null]
 >> endobj
-1275 0 obj <<
+1284 0 obj <<
 /Font << /F62 634 0 R /F43 600 0 R /F56 618 0 R /F42 597 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-1328 0 obj <<
+1337 0 obj <<
 /Length 550       
 /Filter /FlateDecode
 >>
 stream
-xÚ¥S]oÚ0}ϯðÛ‚´xן±÷ cT0ȤM”i-4	šº_?;†4´t{˜òbû~œsÏ=!ÌG�˜æ(Ô ¥;Ð�‰�<rÌ	NIA7«Ÿx>IŠ4Ö’J”Üvz)J”l—~4›Å“áø[/ ü÷
pzÄ‹^Jm̆$øýqÿz<Í£Ùçï®èD“¡»,¾ŽFñ"‰�×y
Ç“‘I!½UråÅIK»;
f9ÿô–+@[3ᕘi%Ð/s
L´¦hçqÁ°àŒ�^
-oá}iv¢Mé%©SX(^ЊSDÖBÐ3±„Æ’QæÄ2*°^@ÀH4­ï³½rX¦‡]öPWG7å¡vÇþØèbævÝ9f\6Ý
°&ºi;Ïn³}ö�fÕ›
˜ÿÇöŸ“Ü@¬³|Â4¦¡Pm+¼$«—ˆD
-�UÈÄæpb<EAø뇭=È®H]Æ’c­Ì2›ª÷®f¶>®(*6yýû¬“ðû<ý‘Õ.ã:?Ø*ÂýAùø´Ïïîk‹‚Hh,À¹²6
p‹M>áü€bc}ã”NÞ�1̪„b
+xÚ¥S]oÚ0}ϯðÛ‚´x×_‰½·
+‹u^ÿ:ë$ÜÁ>OdµÍ¸Í¦ŠpwP>½ìó‡ÇÚ  hp.�M
 endobj
-1327 0 obj <<
+1336 0 obj <<
 /Type /Page
-/Contents 1328 0 R
-/Resources 1326 0 R
+/Contents 1337 0 R
+/Resources 1335 0 R
 /MediaBox [0 0 595.2756 841.8898]
-/Parent 1335 0 R
+/Parent 1283 0 R
 >> endobj
-1329 0 obj <<
-/D [1327 0 R /XYZ 85.0394 794.5015 null]
+1338 0 obj <<
+/D [1336 0 R /XYZ 85.0394 794.5015 null]
 >> endobj
 586 0 obj <<
-/D [1327 0 R /XYZ 85.0394 769.5949 null]
+/D [1336 0 R /XYZ 85.0394 769.5949 null]
 >> endobj
-1330 0 obj <<
-/D [1327 0 R /XYZ 85.0394 752.4085 null]
+1339 0 obj <<
+/D [1336 0 R /XYZ 85.0394 752.4085 null]
 >> endobj
-1331 0 obj <<
-/D [1327 0 R /XYZ 85.0394 717.7086 null]
+1340 0 obj <<
+/D [1336 0 R /XYZ 85.0394 717.7086 null]
 >> endobj
-1332 0 obj <<
-/D [1327 0 R /XYZ 85.0394 717.7086 null]
+1341 0 obj <<
+/D [1336 0 R /XYZ 85.0394 717.7086 null]
 >> endobj
-1333 0 obj <<
-/D [1327 0 R /XYZ 85.0394 717.7086 null]
+1342 0 obj <<
+/D [1336 0 R /XYZ 85.0394 717.7086 null]
 >> endobj
-1334 0 obj <<
-/D [1327 0 R /XYZ 85.0394 717.7086 null]
+1343 0 obj <<
+/D [1336 0 R /XYZ 85.0394 717.7086 null]
 >> endobj
-1326 0 obj <<
+1335 0 obj <<
 /Font << /F62 634 0 R /F42 597 0 R /F43 600 0 R /F56 618 0 R /F14 608 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-875 0 obj
+876 0 obj
 [590 0 R /Fit]
 endobj
-1336 0 obj <<
+1344 0 obj <<
 /Type /Encoding
 /Differences [ 0 /.notdef 1/dotaccent/fi/fl/fraction/hungarumlaut/Lslash/lslash/ogonek/ring 10/.notdef 11/breve/minus 13/.notdef 14/Zcaron/zcaron/caron/dotlessi/dotlessj/ff/ffi/ffl/notequal/infinity/lessequal/greaterequal/partialdiff/summation/product/pi/grave/quotesingle/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 127/.notdef 128/Euro/integral/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE/Omega/radical/approxequal 144/.notdef 147/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe/Delta/lozenge/Ydieresis 160/.notdef 161/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]
 >> endobj
-1180 0 obj <<
+1189 0 obj <<
 /Length1 1628
 /Length2 8040
 /Length3 532
@@ -5271,7 +5332,7 @@ endobj
 stream
 xÚíte\Ôí¶6Ò ˆtÃÐÝÝÝÝ¡Ä000Ì ÝÝÝÝ’‚R"‚´t	ÒÈ‹>ïÞûüž³?�³?½¿w¾Ìÿ^×Z׺î7�¶‡Œ5Ü
 ¬‡¹rðpr‹t�´�P(ÐWç�…C­
�f
L9g0ЇÉ]Á¢
-Äü{fXE
+Äü{fXE
 0Üú÷äè¹aÖ�ÃöOÃoäæìüØã?ûÿxýœÿŒ=ì	a.ÌÁAb¡ö™9Y®
Ä£ò/z{x�Âœ*Þè—ÖÁ»2#×Dj,ïêÃ8›ÇEµyÍî;Ýoª²n
öA™ºÓÁß‹(üèX>ã.3v±ms™W`gÅúϨ¯"›
 rn­�êèš—ß¡RŽwð9£_²Ò¹Ð_8=óe4%v>oFÀk(Ù?`LÙ½¼`êú4ð±ûåÃ&9[~ƒ˜;26cLà«|r)Sƒj…×Íl(ßÛ
 b¬Å7ÎßÊçÏVð™h9�Žù,¢I‚°RÊ• e®äß·RÆ%=²ìÙ
êt›œ(†Ì%³LÇ�î)®Ž>1Ù¥‘„µ…^Ñ2¼éˆO£Ý	%õ‰>•pjÕr{2–Âw�Í<–g¬™-j—!3cäáakIè,AŒ$ÁLˆÇÆ‹J¯³nöùU»Ïm›Þ‰D3
@@ -5294,261 +5355,275 @@ $O�íœàÅ€DÈ
 t�‡Í=žÝbóÆÃwî6ß"£“˵?�”JËOP2RÐoQo+†â1)©w†¦ÜèådîI½ÈZ¿VÍ�­(e÷åû È
"QÔüFØs(úF�$'‘qL ®/¶!õÔ
¤HvkÖ‰Œh¼È‰¬ê؉á¶o?Ùa:Šÿ±qêcŒ°gã!_QÇ~ÏWê¡1üaœ¯UÝGmã§Yñmn%ìRãr9÷¬ß0qˆ5†/‚E…(êÚ“�†,W‚˜$Ù½ï¶åçLxËÎÔ|ú奕£w†Z|ÂV€ãž÷,éOd
 ÞyŠGÝ
 ŽÎ¨Ý3lÍ4©¿Î\×T2Zª½Ag—.7Ù#ÏPæï™v¼eŦQLÞ»±Oþ¼Ô\’	¬ÿĵJÅñ¾(š3Ç].Å*,MÎ>ÛBx�(ÃSÃó|D³uû‚Þ¡ï†{:Ò‘Á¨2G9¡Cê{É•<|?�ÒK áéá@F)Ø,êw÷ó?�È ¸¢Ëa„Çh%Ù±o^Œñ{‹6™Ý@¥-«ä%
Å~jÉwXjz1�îi´·î¬%uÕ3^¿±g�¸`d+ÎK[ŽDe—„]âò†Yè�ÖýÇ?Ï>£³HjË,èkѸÍhÔ8Š”™v_Å
[ªJÖ®²9m=·�âú?\‹k>¼à¬‡¤*³Ñ³ž,Y
ê<‹ý¹uÓZ/ZV$S·é#ƒmNOš¨5M@¿§rãÝ0Hõ7¬&7[àçŽAØñêOõƧÈêÚ5±pE6~d»Ž^.x¨T1¬µ¤$£Í7¿ÿ4òÆêüj§‹G1¬èípoóÌ3³QýÐZ:œNÍÆéç,0½‹Š‡Zg‹ðâ£à)‹Q©¯³‹X""œÛÆ0�ÏÁ¾äBvFA‚)Y9(ÎYÖý…ì¬S…|¸Ôü¾“qbæÇN.LÔX§…_�ï‚¿œ%�%½¥åŒìé|°
D>W²7}C–Í#—ZR¸
­$º`bÛGο…a¿9gÝS%\”Á/œîñ�hC|�?s§Ø…šg¯ÎÙÈ)ª¬m}ÐvÖËk†Ÿ.bÉ&O
 üõí+uqfº`Îa‡„°£â,I§ã¯½/‘�˜÷�ÇÝ›Á¤'P6ߢH‚
Ú?÷›½šÙ¹˜Žà9¦ŠmHr7:pMRYŸ#£ 'æW¥¿ðKCß|-¡mWÝ躖nᲶË0–«ÞÐ3äÛÙ=j’
¸Ë-,n–³e±€¢üb½iÙ;‘˜Hâ°l<)žL.ßÐYÖÿ°Ú·)�wL=(‚Œ£± L|�)=å'ÀÆ-Å@²öò¾µ<ÃNrä³6îµEôʃ3±d¶kÓ»¬ÿ‹%ôµøü·(kD~ô(¬_yñ‡Í;¯åä²fùOî{&*‰äyÒ¯9Û�B±T¨d>è.<Sâ¢éX3p7«Á~ª"럽Ÿ“lË´ÍÔDQÿfŒ°Ì
-*s"}Y
;Ò‰¢ú{YÌÝÇí]p¶Òݯ€Ž¶Xo³êÙ}
+*s"}Y
;Ò‰¢ú{YÌÝÇí]p¶Òݯ€Ž¶Xo³êÙ}
 endobj
-1181 0 obj <<
+1190 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 67
 /LastChar 85
-/Widths 1337 0 R
-/BaseFont /SPHEIW+URWPalladioL-Bold-Slant_167
-/FontDescriptor 1179 0 R
+/Widths 1345 0 R
+/BaseFont /AHLCOA+URWPalladioL-Bold-Slant_167
+/FontDescriptor 1188 0 R
 >> endobj
-1179 0 obj <<
+1188 0 obj <<
 /Ascent 708
 /CapHeight 672
 /Descent -266
-/FontName /SPHEIW+URWPalladioL-Bold-Slant_167
+/FontName /AHLCOA+URWPalladioL-Bold-Slant_167
 /ItalicAngle -9
 /StemV 123
 /XHeight 471
 /FontBBox [-152 -301 1000 935]
 /Flags 4
 /CharSet (/C/D/E/H/I/O/R/S/T/U)
-/FontFile 1180 0 R
+/FontFile 1189 0 R
 >> endobj
-1337 0 obj
+1345 0 obj
 [722 833 611 0 0 833 389 0 0 0 0 0 833 0 0 722 611 667 778 ]
 endobj
-979 0 obj <<
+1156 0 obj <<
+/Length1 771
+/Length2 1151
+/Length3 532
+/Length 1713      
+/Filter /FlateDecode
+>>
+stream
+xÚíRkTSW‘ª¡¬òRIÕzX%2yj	 b(šð’‡ÄÜrKr/½Ü@Ò
+Àæy+„<>…‚±tŽ¤ª	àLŸ$ñ�HãˆR�©‚PÃZ²†R¡
2L‰À„�	D
X7y#¬ƒ3`<†˜@ˆ’
+CˆN;=+!D)BS50`pV2Ù+ßâHF(¢‡¡(„Pª�J¡É€§p…¦+!ý›ÒÁŠ‡Èã#½ÿÚ©d”A	¹!ì?ØS1ç�˜4	Gô �Íd³9$‘ÜïNIÓš‰Q%!h*àò|€Ç
+9DdÄF@PÖXO*f1QŒ ¯
+gÖܺùêInÚ¦Ž>«Ã×�çP	%©ìÌš½pÌ?ï]�x†UaÖêËó÷?s}m¥¶ÞéN»íh˜Ê¤v7Ìþ/ç°ézU…s m±5®T°Z&œ½ÐçzL¹Ø|èïaŽhnŠ�þ:{ ‹.ð0¿ß-ÉÏ)	�•D�.8V᢬Y ñ«¦ÚÂõ­ë[´
èÅ‚Áúµù.iõ�\ÿbNzã^Úº”ñW´ß–ìœù4éÅ‹ÞçoLÔ–‡J£‡�û‰±Þ¾3½¼‡éílªýµ/,ñ
+õW÷Q`x¯Ã*S›öï�ýÙÍcR'¸‘çvóèžV.å¾p\»¯üoÒõÞß6Yö$Šõ6‚øKèÇý•�þu©Åt€›œÐ›rV~ËûrmÃ…ª×Ú‚™I–¦ÐЪ%M³±ž� ù
®ýæ:‰å@½Ëz±[_ô@}.Û…71¾è¸Ðç`÷K¿¡ŸJ¢-�#G|åÚmY�¶‹ù@¾Üèû«ÝùˆÚC§oíIË�ó–íƒäÙŒµûÒŽ×DÔl×æì=&¨ı+Ï>÷TÔôƒª/u^›ž-§·Ñ6\©}L8E½¨Laâñ�g[ZQ<1nÌäžýdÏ/1õuwÀ‘u‡ª�»7=||kå¢(B‡þž

5]üyIî›­£=a:gqS{‚½wÌ|çÇ>D0°åÜ!g�§Ü7KZ¨uþ1¶j-ƒë¬’ÙšxïBÛþ	Ô\©­u£Anƒ—ƒ©^Vw‹Ôõ{ÉSwÔÒœnÚJп:YUÃÊìYuÊǃX3V)DeK%§5ËmfÜ™9ö¤Ä}ð¾ùàµp~Cù.(ðvEÔúÑŠ	ÿ»]º<×+#…¿œY!UIß$Èö¦ÌWeô�󲚺J8•ëƒ^[Ï|bü’ûÕiSãf›yx¤$
+úÎVݾýºëÕðG-gK¬@Ï}~4®#ßîýœÂÕTêg¨iiݘ~]xé`ßÑ�—²¢?,°ÜõŠq/—¼¶��©j·-K<̺4*ëM{.V;~£	ÆKåùʶÛÉ[VKëNìvØÁ9¤Î.îš[Ð<káÎÍ?»=^–)«øz}Ày~~f̹P^_àœï=©	(9çäP‘¸ú`ê=qOxöóÀ>€Þ³]ò$ö¬¹°àÅ º÷Œoy±døJ§èVëZm—¦©º´`�tn�ˆ÷Âœ·_^sòßÝ^ÜÎû¬mœºŒxù:áÔr·o
)Eœ�nÓ£°–5Yz¤qŒìmtidæå‰JƒºnìQ'7t\/Ëû�–5P'ÚªöÏáDç±Úfá‹v³ît5þóïRªùcÄ-I×z¾]»“ÿҚĢ'1ĪnÞ<ëƧYQ‡ó«¨µýìÿpQþ_ࢀR+pÓ*ð4Ê¿
?Œ¬endstream
+endobj
+1157 0 obj <<
+/Type /Font
+/Subtype /Type1
+/Encoding 1346 0 R
+/FirstChar 60
+/LastChar 62
+/Widths 1347 0 R
+/BaseFont /XEDTYN+CMMI10
+/FontDescriptor 1155 0 R
+>> endobj
+1155 0 obj <<
+/Ascent 694
+/CapHeight 683
+/Descent -194
+/FontName /XEDTYN+CMMI10
+/ItalicAngle -14.04
+/StemV 72
+/XHeight 431
+/FontBBox [-32 -250 1048 750]
+/Flags 4
+/CharSet (/less/greater)
+/FontFile 1156 0 R
+>> endobj
+1347 0 obj
+[778 0 778 ]
+endobj
+1346 0 obj <<
+/Type /Encoding
+/Differences [ 0 /.notdef 60/less 61/.notdef 62/greater 63/.notdef]
+>> endobj
+976 0 obj <<
 /Length1 1608
 /Length2 6751
 /Length3 532
-/Length 7596      
+/Length 7597      
 /Filter /FlateDecode
 >>
 stream
-xÚítuTÔíÖ6Ò’J �Cw·ô€ 
-3383´t‡ ”´„ÒÝ 
ÒÒ-%)!)ˆä‡>ï9ç]Ïwþzßó×·¾YkÖúí¸¯}í}íûfg1
-€RRRDì
-fg�
p™™róòòýËó;`ãþ�ÈÍI4Ì
à¸ùp�‘NŽPæâ|…0öP€-¨è<ÖÒÓ
-ö‡†3†°û>
-jg�‚À¡hô
Ì
öïéü«OÀëÞÚÉ	îþç4òOÖ?9À0h(ÜV€(|SŒ¹©mC	þ^-„-
-Äé
-rÊ­4~Ÿå[‚lñI]’*|vQ$P5(}Uï>±åt¹ªÍ³ÖÓJçlI€îf2x±q·eÝ�çø(Á»æ/h•Kš´mé¹7®³ˆk..ôhí뀡‘UÎãàGÁÞOn_6—,_ª'Nw¼Áo+¢©É«°(ʲ·¶9b¿ý<áììíîúÔrp»m•ž7=š�]Æ—”#Â÷E:½‚¹I¡ç+›`lgI\kp›	—Èüô
Mõ¢À|ƒ°²
-œ…›±Ø§Ï«Fc³}m½}ä®V‡6Gr\> "KªY�Ió½1Ÿ·²Ÿ÷9Qg††1„K<O›ÎQî,,ÿxtä’3¹ÂtÐ#¦»è+Õ8+ìǤÈF¾‚¡Ëñê>¬”(æ33óÞ5±§Kí9uæêMæŶ¯’–÷O÷‘™÷Å㣛Rð�sZ1ÆŒ^&}ÐùQ íívRæXnú
v�†e^êÛ¤J³T×_+'wßsšßÚ&ŽŸjUH§¹ÿ0Ä~QzNÂí#(êyžJéêAB¢]±\ꞚǼû¼Å‰#¢
-»øã}y{ꔣx$�󙹕Ä7ì)	–/ˆ„³Îé4»×c§zœ�ïÈjYÔRy°©ûJæ—V‹V¦wß“ó
ÚÞÆdêˆô÷Ô·³0øò…i°sOí?¡Ðd˜¹ò@ÏéÞcxL
-çÚ“9q93š¹“Ù10Îd6NÞ”QáW}Þi¢ioRŠäqY"ã¿›	&Ù‹²'IU{ö+º#Phq"�!Ô}q§t°<>J*KIý s]/wûW3´¡Îú㌜LgŒq~2Ê΃U.{òªÄþ²Ô²LPšPPn
-%5èëÖ,»;e9øüNŠY‘
vÅ—/<<vǨqA%EªŠ�·Y
-GáÊCÚÅ*¼ä7/*§Åín‹+¤½oèg¼cèÿ jÇ7^96Ü@xÕÙf}¡ñÂSµË¸õh‚AF—GÌ‘ÿZÙx~åÓ‹ú®2OBëðғͦ´z+! v2gÅÜ‹†‡´©h³+®,:®1wJ:ŒéÜÊ�éxK‰ûž�q³¾êüX¢'ßV �IUm;³ª€‡HS@ž=T_ê ÙöHWçËm_åè˜#hcWÂWF– ©R
8O°rD›ö
-­¯Àäzú~ø£<)¸4<~v
-é‘XÜ…AÉ/½3JÈ…–ÆÊ¥íÆ„›€ˆÅèažÜ‹[òú6!C“�KZvââ‰Ê¨\ïFfþÌIòÅê ”×½]’À"ÒÖ0ìª:ðžD¢Â�“P•7vîÙú¶ß‘Øݬ��¢š³›Å1]»õ¢[Æ0áë¥z‹Þ°3éØ)ÏuµO"n`·¥(mèž<p=i9:
sPSk_A8ãÀ¯Ì4د¼#tH$Á›¥®k—f¿‡§7'2̃æä¢XañîÖ:ô”ä¦ò[ãDäfU½•Íß«š²�íYóå/õ$´PìHK׋~(¢‹E÷I9)°I­4áüÕæ=©Œã5öVQìºÒ
-hY$7U3~ñ4päáÕLÔ
-U¿ÍChùLð(+G ÞNÒ±˜¸åyB{v€SÐjñpÅʦDÀ�ú´ÐFˆå¬ÞõËþÝ�ýKxŠ|¢[ô‘tU¯™ÞUgkÿ*C‰wt{®Áå;»ïöøͪÍ%ç‚Ý'×k®DzÓ	±ri;Ìi/[ˆ?–¡zí¾ï‡÷$ƵèÜi“¤Ï�+õÎqM­ÆJ:¯V£#NWßÕ}èõ˜{¤lŽ­.NPGIÀ}5ÙéŸ8rè“2–î±"`ÅîpMûspÏ~ÉŸr Õ[âÜ+\øv»•èkIʦEæÑØ./îœN3ÅEÒlÜ9‡f�²AÊ“!ü¢µö<qÕ§>›¹Jjÿ˜¸{…öÚ1U÷¼05§lî¸:—ŠÕ­¸”ä&ö
ƒÝ]Ôßû%gÀŠ%ÉëO¶LK¹]ŠT”I¹eÓõ–FAh]A·Ã/@Ú>Pw"d:¹.ë”19M¦àÑ£ðs?Ù¢––~§wøÆÌ°£_ÙVŽÏ^¯ÓåÝ_ì#ê97¸›6!”UñuŠÞE(ÚÃkj't…×É¿è9ÑSLy¥Ïyîqk·s»ùµ¾Á’yˆFQù¤	[Üëĉåûæ‘>s\N«:òܵ„Ø™³=7ZQØ··B¿gð*ù�&¯½Œ}^&¾óDžgçµ|ÿODKoââÕ¯Oþƒ¤£j¤óÅʬ~Ö³Œ_ñ�ådNT_/üd¥×’ÙH�*$hç¤2/û-0Òó)Ëÿ¸’(4æd‰nÿœLõIÊ=·ŠQª¢|kA89Ç»=¯°ãá>kŠv3ROn&Àñ‰ô9DÖ<}£º‚P³Õœ2~„û¸¶wÑ·Q±@HfÝÑ=RUˆ`¹”~k+³x˜’x·Š}Ì;a—r‘­2`å-Å0{ªÎ817™†Ý€)2hô»}hïëõÔÚ+W/5¼zæÖm(³ìxÿ›tŽú9B*«tË[p{•¾ò3\>ŽJï,ä6>à•ð좒
-É7)¬G»ýØѱ†ùÛ#3/éµåhÈM
-Z²Û¢:
äL²%T1ãͨ—¥^‹?BAI_ì¹øŠ\3&Â…§Í-0�ÙySŠ¨W³4¬«·;çæ±û«ˆk	U,~уû�áNp¾÷�Uê¶]RÏìŒ{g|õóÒî8,-’-ë÷síKiØíÒ_zQP¢Y§Ï>3Y«ËÍgAg(æ)„ºkß-µE¤çÂuŠ¨émº.?}&í;!æ&B)ž(;H…uz\J.‡”
é²ìQ·óˬŸÑËM:Û{gjÜt|ï¦Öz½ÚŒyfE.:ð�“+ÿŠ~z=ŽóJñ¼Á@ÔHÈ:Âû¬º,À:¶ìâ5ôê¾]Ø�‡ðI[í2ñêá×n­Þ/5mêÉ«¸¿-Êä’8\ëã“ãÌȺ)ÓIsN~{ØE§Ÿ)n[,÷Úix„Ci?éÍÿ)ãTâëu|SÃ5^¦V²…÷èû ü¨HÖ°GîxWÖ"/‹Uí®lF³“ƒ™¨Îý@ÝZ{¤ë;
!‘›	±À]¾�dOÉ›ñ«²àýa0ØÇ««â}£@Ýä§oºtÍJF:ܺ²8Ê^œ1‘ûl�§ªæEéRûošD?÷®=¼»=ÓX#ô
-]‹g<V³-£¦ŒrœBBÅ–ù°�\DÍ`>k
h ¢.@3‰\§NýVró²C#Ô?Ö¿`죋žÚªJò‘
-꧛qÚüw…£·ñb
-Ðj¥×‰"̨"Œ 'ËÑ7úׯ‡Ø:�W¼¤Fü¤H®b¹j†CV¿UÜLzßìÕ‡OSS\�W$?KÍX	uçP(îVš#ÒîøÇÌv¶×{ª'Z‰=ìx©oïUë*^„Í›Ú\^OiJdXÜÛÖoQy>lÞ)ˆö�ó(ÏXäãè÷[nÔGÑ‹®ÝWèq±ÎÿÍ‹³n/²1EÅlæqéF0Ÿ‚õ—¦ìk#BÕibÅÓ‰h>ª
-ʃsdLðén4r¼™¼
Á=äÖ<º<@Úúšg×ʶÉÆ‘*<ã#
bowP›$ÖÌç»ÂËlöh¼ŸrevVMRMÐ�8t=jÀhqí»±¼bGP¹Cú•32°AöÍf»ïQ)‰•5W¤¹¶ÙŽà×¾€ ½>î‚ÒäÔC.ýR÷f‰9sï,çë„
: ~±+2ö$5è)ª8vM_wç¾Äè>ÉJˆûNn‚”ëäkƒ
ãÀb6²F=kJÿÃÉ%1%c”oYfðkxÒ¶ZzhÛ~¡bÈÚô‘­’ó͈7VÒ®Óìç¢j0·Š«qW;éKsF‡·ÚZ;�25߆o›�2Ü�KÉMšyh|µµÞ˜{JæÀT\]·B�/âfÇ@xP™�‡ò|d1£z†Žî›Seå]MtÞSø:WRÊ*ÊŽØ[cñ�Žð"àPE?îk'
ÚÓÆêù

²ŒHûÀ#²²£×G®–®/5¿âiËÑÓP[ñ¹Û?1ðßÁm“·»×@ks)j[Q¡1bD"¯‹[kbî%Ö”àbéÞ¾ÄLwðžî–“écʽ¾ÍÝÉÈQî"å$×3Ѓuq²wžõ$GM³þßviJ¾ÔË×d=5g»S–¦þÃsÒ;êiYŽÃý…Rnä®&nÇô�;\·ªLÙqÄü�˜²Ir™˜íµ½5e¶f""Áµj£èÓÒãdÂFÆט)ûó§¸ïôeQ™²ÏºùH{u׎ÈzÝsš…0æ=q<¨œ\¤Z©ÇûR‡\¾óc;™)‚ƒpt`
õV«c�‚pãøf“€6�0±‚]%]çtv�…~ýͨ‚¢$ÙÔpœSõÃÐÍéóÂ7mgíq‚�2ì¹yßÚ±œL“­ªr	ªÁ~y³Û
†o¼ú
îå~ácìðd�ùÊö�æÕ«“B¨U/‡¬S¬è
=g×
-v
-Åõn`ÑSd)-Š…ÕY¤Ch§ÕÍt%-�‡ÃÊ
-ãFaàÁHœ1a™ŒƒÍ°.Ç®üØí*¹Ô0y‰FÝ
-Ï6Ý_Uô]#ó±ä
-ŠŽt39‡nßh˜ãÀÑ0½1¢|=FL§d’æsÙ_Ù£“-"¦‹Ï*³8/©h…—¨ÃçäLrÏ¢·rb¥{›±\&®¼jÌ	I_¾l�‰Ï¯ÔB² �2Ýݪ'Þô\E–j“Ðò͈?Kåd—¡·–Î#·È÷!t%)G¬”�–Ò¼çF–ß?ϸˆ¼'ùY3{Ä&v(£ÑÅòÌïPA¨¦,‹vä@)!~®RìõôÉ7ЙF®è”{¸ûäº2™ vFéä9�"¹nqx§Ä
4þ5;G\tHê!2ìM)­Ä‚E,vµæ-ô¿üý€ÿ'
-ƒt´F='ú?ö-žKendstream
+xÚítuTÔíÖ6Ò)H©ä
+ÀÆý‘듸ÀuýáC œaHì5Äÿø `ía
+âü»¥?±k˜ë(Gb
+Ç8!Àî×µ¯ÁœÐð?4œ1p¤Ý¿ðÐ0;0Š€a0×0×Ø¿§ó¯>
ÿ­{°“ÂýÏiÔŸ¬r€c10„­ )Päº&{]ÛŽ$ú½(ÚH[
+{]Àó?SYð?'ò@âÿˆÀÿyÿwâþ]£ÿv‰ÿ·÷ùïÐ΄>Øñz
þz`
+"è�˜’„-»ý¶{Píq{+¯;È)·Òä]–o	ªÅ'1tIºðéyi�`Õ�Ìe½û§M§‹U�ûk½­ôî–ØN&“o[Ö­y®’|kþBÖ¹I[f‘ž»º‹øÂ×¾[çœ2}EïþäõåpÉò¥½wìtÓò¦"š®‘ª
+‡º,{s‹+öëÏcîξžî®–}‚¶UF¾ôhNY|
+®ßç錊¦…ž/mr€±�%q­Ám¦<¢óÓûôÕ‹¢
+Ë~¯¸Þ¢¯ô
+±ªç+„ˆ?
Úvp—Öý1TA:í¤Ÿwñ¥³M�½ßÉ1Áï~õ3Zb¨~pÿ‡kiÃû‚ôÞ_�ý£ý �®ìx‡CÏJ™­”)9ˆd=A…¨&‰�å6oÓ×ÊÈç\OègÔBAúßÙ"b#³Ó·l†´ýôÝDXR¢>±¼;2\GgæËÖ˜SYp&'
tikY…ÑO¼fFE§‡BÇ6ÔH¡³½ËÍY…ýÚ‡�ïY-MQitÛ î%¶÷«‚c,†z)c=Ò¹$v‰T‹ì´Kÿ2ÍÜñ-4wæƒj!òd
¯çñl9S]·i.‡‰�{Õä²ÊbvpÂØjc‰`
èJU¦À‘šÐV�À'ìW‘«ð«µ-w�¼¹�÷µ›î±1?ÌʸòÔ¢Æs2ò
7Ž½ËœÝÏ�hy%´™`<ˆ	òeÃ![©-»äa¹ýÚ8(él¾âòPwKdIïbelU®‰71­Çè)Ë?z˜vÏìø^³éˆÆTýZÀF�Ïoi˜Ç¡ÌÜX%ƒ@¾øÀz5{1õ‡›4nñ‡»
+öt)‡ñ(çSkɯ¸S’lŸ‘	§�Óiv¯ÆOô¹ݔӶ¬¥õàÐð’Ê)­«Lï¹1.ï´µ…ÍÔè­ogcòåÓää�ÚyL­Å4?zé�™Ó»Ãôˆ>Á³+{$êrj<s3³cp‚Å|‚ª)£Â¯ú¬ÓTËÞ´uße‰RàV&„|7Êž<Uýé¯èŽ@áÅO	L¡î‹Û¥Cå)ˆ1ZàpYJúHè{ÝËèzy‚§P|­Ð†:ð‡yÙΓüT”�»|ö<ôe‰ýE©U™�,¡ ÜFa8 Þ£UvkÊjèÙÍÊ"ÜŠÏ1^„„6¢œŽQBÊJ´9o²
+Mñ·àŠ™´Õ¶3«Š„È4Eàé�¥�m¯Lu¾üÖeŽ®…	òvŒãJøÊè,U:
+€ñ"r³ª^�ÉåïÖOÙÆö®ù
+”z’X*u¤¥ëG?ÕÃaèRI
+lR/M8{ùíŽtÆÑg«n]i€ƒ,EG³h‡Ò¶²Ö ¿–öª+ö³L›L¨–¦5Á¼T%7%ã˜hqA;dÕ'Öâ8Š.‘ð9Ô,sR¯Ì¿NRpz
»âàŒLí›,Ûdúö'q¿¶Lm¨t¶À<þ¢•G/µÁ3ûêv›˜ ›~š¾eïf[R¡úZÊ}zhäÛ7w˜I9¸€kºë–<š†¸b¤”å!çã–/Ÿh£—L\S¦HúR]÷qÕ'®ÈoÇ
+GéFH@){þ»DÀÓ1Ynê_—f»Iw«Ù¶GÇ|ã–Qg7ÍXá�‡/·>öh6A³–@ºÅ¡!`ä.³OxâP»2<ÌŒb8nýôºSƒª:Êì±C�agoÓ^ûöF•ÌÂeùm&›g8Å#£yg<
+fô\U'Ê÷$_§ô¶�z×
ïôî�ƒ*%¼¦%�"Ô¥ïw»"ÏzTÏŸj%?\õÎlœ©5ŽAØwnàÑEîkÓ&O£ºµR‹¬Î×ÏÓ‚Xô'x°ø$á~káùó�€ºÕÕ¦ÙûrW@Ë¢¹©Zñ‹'�£.g¢Vh¤éÀ2¨§B‡Y9‚ñvRŽÅd-§¨cúØÓ}¼‚VË+Ö6%‚~t'…6Âl§õ®Ÿ÷nmì] RÝ¢eªúÌõ/;[V™J¼£Ûs]ˆOiÞÚ}·'jV«h.9ê9¾òXs%ÕŸNˆµ”OÛfM{ÑBö¡tä3í+÷=?ÂÇ1®EgNßÈûx‚Ño×Ôk¬eòj5;âô\݇_�ûqöCËæ8êâ„t•ÝW“ý‘þ‰£>)ãé+‚ÖœW·ízƒ /Rö¥ûJœûD
+ßlµ’~Éâ"Oùf™y8¾Ã‡?§ÛL}ž4wÆ¥U§b˜òx˜¨(B½=OJ{Ó©ßf®’NÖ?&îN¡½NLÕ¯l
×	‡;~µî…Ru+>
•©}ÀP�a7Ý÷�ÁE©ˆ’fIòúãM³Rd·íù
T
+IeÕtµ©YÂPÐãð�¶Ôû2�\—uÂœœ&[ðü>éÃÈ3?¹Ò––
§·D&¬ðÃ_ÙÖŽO_¯3äÝ]ì'í=³¼•öI8«âË£‹p´‡×Ôvè
+;¾“Ñ3Ò'ØòJŸ³Ü£Öçv‹+Ã%‹Í¢òISJŽ¸W‰Ÿ–ïZDúÌqñ8­ê*XòÖ’àfÎ>ðÜhEãl†~ÏàSöK^{û¬Lbû±ÂýíW
+§÷#Zú/uùQŒ©SÌ«°û�ƒg™¿& ˆË)�h¼ZøÉÎh$»‘=\HÜ4ÁHe^"ó[`	däWQ0ùp©ð@xÜÉ
+Óþ1™¶KÚ3·ŠU®¢ycI29Ç·5¯¸íá>k†q3ÖHn&Æó‰ö;DÖí?y­¶‚T·Õš2yˆÿ¨¶oÑ·Q©@XvÝÑ=RM˜x¹”qs3³x„†l§ŠsÜ7a‡f‘£2`å
õgªî/¥¦Ý *hì»4ch•ðËÝÔÚKW/¢zæ
ŒUnbàu:Wý	1-œ]&ƒí
¤½Ê@å)>?׊?�wj‹ðRdvQY
+4¦-‰P¸H¶åקKp÷Ö)1ü*ÃkúÉ=‘}4ÅxwD!¦šÅfH©Ý
+ÛCgÀÚ^ÿÉmöw¦ÌðÆ}àg¥úT¼½æÚ©B(³îeßEŠ˜=t½Ôѯ{Sz	ú9O=zÅ2V†T~pÐCüðôBè‹Di'a
¶	ÒŸ“|8P¾ÂÐâ�ÓÍjˬ%«§˜P±i1",Q3EÄ^
+äëW8¿$ØX,Íóf†“Œ‚X¬…¸=¦ÏÀËû)g°Ÿ”*Ór>�/Ùóƒ!¿©£#™·€×îœ/ÌKñ:#ƒÌ‰YDêÃQ”
Á3%CŸÖx½ØÂ…§Ò,¿Kp~ûƒ79“oÒ×y%±ÉdZÜ‚¼ã/ãòköWUñ¬CÍÚÊ6rºá|;ç\pK3PÊŽÎ
+ö—Ⱦ«WúµlçŸm•ç|ùhÃä÷þ‰pc¼�aiç'ôÁÒaÚxµÕ¬�E
+P‡Ã“^,ŒZÚßSô.¡âjsX*T¬ŸnÆkcò߉Þ"Œ)À¨—^%Š²¢‹°BÜl‡__½æè<Zñf’aõ“N ¿Œiä©	YýZq=é=ó—ﻦ¦4÷y­H}”ž±î)ΡV�_®4G¤Ýô�ÙŸíl¯÷ÔH´ÐñÂÀÞ«ÖU¢—/µ¹¼žÆŒÔ¨"¸¯mÀ²òlÄ¢Sã;çQž±ÈÏ5à·ܨ�b[»«Øëþ|]à«wÝndcŠªùÌ£Ò�`5û/-¹WÆ$jÓdJ'Ÿ¢ùiÌfú¤MZ)+gýYÇ6´g†^ju¹`ç~â—öváØÓ©)/,¾—?_ѺÔã›|¬ñµüPœbÅ<Cݲˆî ”ÊIM)Xi(Zóµ§çGù¹Ë€p;�d&Ròª–d1¤/·;÷YŒøË!Æ>¥Á‚xÊÃÖ­ñUÏ’Ÿ[Ï8
+|•DfèGÎt	Õî”çÈš14r½ž$€âðž
_ì£l}͈‹³kåÚäâ(TŸòSq¶;¨O’iåó_f6{4ÞM¹4?­&¯&îI>Ž³`¶¼òÝX^±»
P½Iñ…;2°AÓ¶Íf«ÿa)¹5˜'ÒBÇ|[èK@Ðn?oAirê
�A©©{³äœ…w–óUÂ�¨�Ì{œô]»f ·}Wrl�|%Ä};7AÚuò•á I`1e£>˜‹Æÿ`rI\Ùí[–<Åž´¥ž^
Ú²ßCª±7} Ã¨æ|5æ‹•²ë4ÿ¹¨Œ÷¾bßzÂÕNæ‚œÙá�ŽööÃL­7á[æ w“R*Óæûô¾:ÚoŠ-<¥ràj
®®›¡&çq³ã Â{èÌÎ~Ê÷�A�Q½Ã
‡w-h³ò.?uÞQü2WRÊ.ƉÜ]có�Žð"àRCš<êo'‡Ùߎ58ôä˜Qö�ïGåäÆ®]­\ß]h}!Ô‘g¤§±
+âw·l8è¿�ߦ`w§á¶Í…˜mE…æ¨1¹‚~q¬©…—xS‚‹•{û+Ãþ;†·8Nf�hvûß7÷$£BÄx‹T’\OA÷Ö%(ßzÖ“6ÍúÝ¡/ùþ~H?_‹ýÄ‚UüfYšÆÏmhߘ§U9[\ôgùÑ[ZøÓ7oòܨ2ãÄ“PdòÿulÑe“ä"úi¶ßRìÆ”ùš©¨$Ϫ�’OK¯“)%c¦ÜÏŸ¾ÓE
”*>ëÚT£íitE<çx¢ëuÏèÂXw%aòò‘ê¥ïJFñøG-ŽØ¸ìe§ˆ÷Ã1�t›­Ž5Š"�ßšuè��‰œªéº'³ClŒë¯Ç¬‘Ô%ÉfF“�œò¨FnN¾ê8ëL–á.ÈÏûÖŽGàešnV•ûHÒ
(˜4½ö0¼“{𙟹Ó
î[(ךר>H
+¡S»§4X3’xά
n×&šŒšðRtŸržŸ¿zåFú�.öêµ&�TçÓ`yûŠqÜÇ�GG�w"BBã¥Ì襟G¿€Ý¬œQ}ÚΗRæŸai(h&¤º¯¢–õ<i­ kÔ;;*û¦|8G^£¢Ür˜†½qSaÁ|�œÕ{JvÏןô½.d&%"Ý,þ·Ú5m�åÏÔ³‹�Ïu枨�Ç‚]fÙ°8ç©;GUüúuÚRE¡(÷£?´J±XꆺZ‘ÊÎý‰Â<÷—/ÌtfÒg5X[¢tqTïuxƦjÕ÷·Õ8ßÞÕñ¨·ð¹/úø‰]ífÙ~1=
‰æiAo™ ïíM‡�õÛÝLH
•œ	
í´¦›eßéA�£mkE8˜Çùnq{nmžKT»W­RÖÔî>h*Ø&Ã5.x;Ûõ¤¶èÝÞ¹?nãzd±´ÏOõèNë`�ÁlZžàè˜:õ”�tÔÛ¾‹^¥ð¹öUP¤Pé
N2ü§PzG£—/éÓU9{¤�„Ã-ÕnÞ#÷ruÂO–]gJÀ�,lØ.ü7P¸�ÃH�¥¼(Vg™½=¥¤¾h®'e%ˆ:QQ¬˜0ƒå@ãLHÊdlFô¸vÆ	ªäSÃ$õ*<Ûôr|ÕLU1·Œ-žÇfP)*9î3ÌäT¸}u g�/€HFÃõÇIó-õ™±�RIZÏä~Ed�M¶8ˆš->­ÌþQ༤ª^¢�˜“7Í=�^Ü̉•ékÆqùté½XPcAÌLñâEëœh|~¥6Š
U”íéQ;öfä)²RŸÜ؇•‹xþ³tH!@nvcé,r“jÊP’rÈNÓh%Ãwflõýã̾‹è;ŠÑŸ5³‡â²šÝlOý…kʲn�î+'ÄÏUŠ¿š>þ
+:ÕÌ›rwŸ\W¡Â
ãÁ œ<§ÑT£W-oõ‚x�&¿fçÈŠ(<DG¼id”ÙpÈÄ/×¼…ÿ—?Òÿðÿ
 endobj
-980 0 obj <<
+977 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 36
 /LastChar 121
-/Widths 1338 0 R
-/BaseFont /GEALIJ+NimbusSanL-Bold
-/FontDescriptor 978 0 R
+/Widths 1348 0 R
+/BaseFont /SAUPMU+NimbusSanL-Bold
+/FontDescriptor 975 0 R
 >> endobj
-978 0 obj <<
+975 0 obj <<
 /Ascent 722
 /CapHeight 722
 /Descent -217
-/FontName /GEALIJ+NimbusSanL-Bold
+/FontName /SAUPMU+NimbusSanL-Bold
 /ItalicAngle 0
 /StemV 141
 /XHeight 532
 /FontBBox [-173 -307 1003 949]
 /Flags 4
 /CharSet (/dollar/hyphen/C/D/E/G/I/L/N/O/R/U/a/c/d/e/f/g/i/l/n/o/p/q/r/s/t/u/y)
-/FontFile 979 0 R
+/FontFile 976 0 R
 >> endobj
-1338 0 obj
+1348 0 obj
 [556 0 0 0 0 0 0 0 0 333 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 722 722 667 0 778 0 278 0 0 611 0 722 778 0 0 722 0 0 722 0 0 0 0 0 0 0 0 0 0 0 556 0 556 611 556 333 611 0 278 0 0 278 0 611 611 611 611 389 556 333 611 0 0 0 556 ]
 endobj
-847 0 obj <<
+796 0 obj <<
 /Length1 1166
-/Length2 7568
+/Length2 7700
 /Length3 544
-/Length 8381      
+/Length 8516      
 /Filter /FlateDecode
 >>
 stream
-xÚízU\›Ûömq§Å‚+(îZ(ÅŠ $8Å-îÖâîRÜÝŠ(ZŠC”â.åÒ½ÿûì{ö9÷é¾ÝßM¾µæ˜ß˜sŽ5ÖÛÇʨ©Ã-v´„<s„»póñ
- —{\×Ö B
-¿‡­\ pW''Ö† ]V¤Àú¾³ÿ¬
-�wtòD@ml]
-$Ôx|¿pƒÀ�~Wº§P‚À!ˆû¦Á¿s5­AŠ`¨Ëïq
ì¶..Nb¼¼NÖ È}Œi͇¸ðrÜ7ªË;:ü&@âþÖL
Š€XÝåÉûOÝìáŽîpïÿ[Cáà?F»:ñêÁ¡Î®�ç
-ÿ“|Âý;fq
ù�¢@~
-ññþß�ßáòñ
ÀP+€%Äæþþf¿C¬ÿÜ«�\PÀK È
-ï]sÿàû¯–ú7ü¿ëŸ5ž¹Â`¨Âþ§€{=�
-w~ÆÑJüµÝ‡×­U²4îÜ›cO{„ôÎî\p#a(ë<¨Ýê”öÅ4Ù§"‰é
-šÃ¶R/ÑÔÐPBbh#…ÝíEåÚx°ˆI‚‰Q•C©wyj$ÔÅð°ÙÇ�=Ô±”É™ÛòžýÊûŒ¥gF¬Rò£Ä:!Žd~tÆß·œ50ièKsËq4¶f8Dɯ÷4”a¾Zb˜SCí
-@»À7Éx*õ—l*Æxõ»ç$åmÄÓ3½r‚~S!J¸.,iŒŠ…ÅÚG;ø¯lKZ¬¯ª†œrUžš:-<éË„×ÏÚ~¯‹˜oå²÷%ÂŒï+Š´ÅCÄ,S%­7VH0“"ü/:æúñdõ´�l¨2ÔÚ”OOkžÑ÷¨¸‘>�_©QÓë×F™3LÀÉ›l´¨WuÎõÚŽdc×{¾j‡Cëš}Ú$<<® åß5‰r:x
°¶ø'Ç|î†Ô0ˆ“jj?sSª\
Ow“®ØhF§‰èÙî½ì0Ôíö8\Q2±Ø’úüTñqø&/_]4�ç��–@”·¯ÎÔ[Þúxù¶’-_å³-
-�Ÿw?P®œÓ�3ñbO©µtª•‰•R"½
…zK�¶Mç”|²²z”®¢æbÓÀ�^:*ÌÑ)ª!v×¥^x4ÆðÔ\ý¯³[¹i½ZJ¬ïÐÄð
©žñVóàãœëÇ =£›çf¶=Vtg@ù4I,Ô¬}®.ôéEkÚBÎ>¨<>§I®8Ô›jßhC&˜¶)#tðÍ�åm†ßÛSõ—]sÔæ­NÐ@M?Û¬ëK*¼ò@Ö‚ã�•ü—­J{¢ÖþôOæ�éá+k›¿|Yß^JJ©ó§}cšP«xµ¦_dâåËÅ~{sR˜ƒýÑ|?S<QN‰�ç‹„·äèí°þÝŠ¸Ð‚�nºZ¿O‘;'/’“lÉÆ”Ÿ¸;r@o}œÌÎÝû””ˆ³eC˜s8y6H™d5øaÌئ|mçûÕma¹�”Æ�#87½“Ff»Sφäö
-P‰®|Z‰ÆBÒõ:ð}ûK\|?T<©ánÒÅ_[	Œå:ÓM[Hn¹<ø"—V<hUÏ!‹¬KPÐû®d
Ø£5?¬ë=j 	VþŠÓáw4Q�]ºËY±�I@ÉÙVó·Ÿms0hë„;f&u5R–Y‰—‘6ºÅEÍW²ÿñO´9-èjÙ¤ýÆ…t1SB€�P I”†j)y
-%;³}«Õ!�ù˜R"ÑãMä“´Þ¥O,7-32ŠGbG#á–ôüΖX‚C]´ŒÖ#iý?uŒ£ž
-Ìxª1”)‘>Æc¢ˆ2¤ ¯ Qž¸õ©4mO¸6u˜¸9[ØŸTq®@۪РMMØi#r™±§žÉ!Ð��r�tèõGÓŧvsíõ>8­¡gGÅP0Ynˆb쟣z]¢xÍ"ÍH´äX<öLfòú�"Uγ",,Dø¶ÊúUåÉδæÎt
š�˜¼:Þuß½‘°¸[®]�汎 çÒ0@ˆFÚ<‹ëŒœ^PéxѼ¹²±k°0íî|È–&,
&£$ô'ÙfÒ§m2WHéfÜßùVGºH8Ci¦cZW‹/)R#ĵ¤1ôíA›ì:žþ\4wmIεGcØh‚çôÖ8(ôòã|¿DÍp)B:[™LjÔ¡pkTÀFÕUNšÍéü†Î –kP‘U
'#Ëz9b„�œ/E7[èÛ‹(VÚÅ%ÑH‘R'Gj½ÞXsÇ=io"I&ñ£”8`ÅFјúÏ‹Ö±(Aé3úè:È‚�ýÖä†9kévˆØ8Í+{U˜NEsS9¬�)ÓUâ•/´›vU`c¦jVb¬+64¡…#ò†å®m§gôXj0�F§ÎNÑvÚï«Jí8?|ü	Ñl[]טf~@Í­RÐdíyS²øÂç€ê
-•0ž²Ü™÷.U:„{&�û¤?xJ›ZTHHô\¼2Q¼y¹EÆPÔ‰ãÓþʘ¥éµX²›æ(m
-7sïTîTÒ­_2æ%~Ä©kÖÜ3Œ: ZGíÞ•–sœ	±óéš(cœe¬2X.3¹qo"â}-ÂßȃϬò…¸`%v—ºþB’´ªL0Õ†çöõ7¼/Áó²ª0–ÜçŸiq.ítðÅ…º1w¢s:ÜÍLË»D�\h1qYÇÑ�‹ ÚÞ4€kÂ�¾—!7_S�ϘV?“¼#p}í>ãß)BO&´ƒrƒË7Ÿ)¡&Ô&²Ëõåuv/ÑÅÅkéWŒeoG2¤(RôºlÛ¿²Ø2Kn¥*ƒ9Õ
Bžõ¼×¶©x¤ŸßUû=œ•p#úŸN&“p÷Iƒ;ï»Dk Cá!aºÝÍ$ŠÞó5Í(BIÉñÏ8¾·ä¨¶Ëy}'œúÊi"º¬Z>�‡+Øv®Ç¯‚ÊEM­Ñ±¹EEª¬�%ÅŠ†Q¢UÊÒÒ‹èÓ…^%T‹ç¾Ð¨fýf¨³Œ1ùVGA«@`ÇJ–‹ßÓET²‡äzR…¨ro�-nùŸwódËÍ æ“•¼“Õ-ˆ–÷Œ¼F“TåŒ{*éöFA×r GœWçÐÛ2	¹xiaq
:Oê.«<U�6i9�#ñæS‹»
"W»ú€FŸ¡’:fZän†äŸ®cŒk˜údªl†­;¡†Ñµ{xµ	8XWuMÚÔ$Ï™œ´ã¸âoMN®2ž3MS”:]}:¨Ê~ב—L|årýJrtp¢1½ð«O/¾4HÝÝ_ñ—�Õj<ª]h£¬µëHø£˜¨ŠE~u‹ZEýÓtÀ
-ʉŸ¸Ã¾ÌܳBÑ'ŒVÞ¥‚½þ¾øECÉunŠ”|Q!RsÍÅ~bP˜œ¢ÊÁ]UQÿî Ãý^-“@E ÐÉËwÆ%R£1ù³
��*õͨ”²u)ˉ}šˆÐ"îž²u0”i�J%�JÓqc^GÝrTâÅ£YTìo­N½æBµ'¦Àүʶ­®4ïü˜ÔД’Ÿ¡_(ó¥ƒI�òœÖüŸú¾[�
‹O³(Áûc3‚á(&™a—`.qÓm·]ðS\ÞÁãlòX'Æ0eSË«¿µ
-'ÞÁÝ%·TœnKMõòw-Vקª�¯ß‰”s[¶Û½åÕµý9ÜŠÆ2v‡z¸
-Ø�F”oýBtM®',ql|J
-S&WÑ-‹Qc”É°¯ˆ"ã±�¨¬:¹ïÁ2ØV·l°!r!¼Ô™ÖG§¡d7çâ"Ù1$–õDÇ\[ÓjøQxg]õ^áˆZ=fÑJ¹£
Qð${÷­û"Ýз+ü„
VpHÒ‚ûìb�äÿÊCÔVpÒz~)oôã\<£vö¥›ŒKwB;€æôöF]®×mHVíà7H°?–ŠÒ�ÿU–ãk¨
-ü•èÚz0B_­,èPÏ?þL@Ê
-шèA*aÑaö蹋¢£”<±àOUv;Œxé9¯Ûû¬EïÑ�è%¢®h”ƒ­gÞ|‡aV28„Za”äJœŸÞ�Ü-bëÝÝžAvþ”|#ï³eVC�ØŒƒ´�:dâŸÊZ	Ö@©WvŸVnS›ègÍlÙÐ0p»¦^iÍ^¦¢•]äœïC@¶/œýiì•zZ§>¦8Ñx�Ôåb*“³íh-ö�0Bcåipù¸Nœæ¾ tLç&D•¿iÀ¿‘ª‡[øBttj°�t’>®µJy7$áò\+KÒ�Õn0úƒ$E˜ÏEÿ�)V!€¿,¬íÔž?Œ]�­×_ëÔ£2Ôëúp—±‰<M0–XÎ
‹‘ÿFƒ3®Y“t#%e(Î~¹Ùÿ%
xÈ^/^2ª|ŽjƒåZiA¸ªðLÍÝf®”è5ÅÁïj“ö—daEx¦Ò8è5˜ñ�^�aà÷5DÁ¯TK—EÓ†˜3ö
-kEtº›‹b
-r“ƒá?ÄwÍÏŠo>ò¯”)<jìò˜¸ )÷‹pÑG¹ØŒ‹Nœ3»n�·îkÌ¡°øDu¦…¡ÎºT¤	ˆ|�d›LN}45A[“bœFŒ^&±ñ,�äQ~«Æ‰L2rrdw="á!·‹ÃšK}|‘·puù5aƃ‰ý5Á2:–5êÆqÕ{2wˆ²#}@‰—±Âøö@‡OüŒå¸
�ô-){’TòkàbTŠx^ÖRØJ%�~tÒ^©¡ý�å¦�	s›ç�0?&%Ÿð—ÔœžFSõÑDóhd±.wvV€Ç›ËMl=įRÂÙçûõ—§4”\q¡É Ë”Éˈ|iöò9øÖÝ+׺doç3îùµà·æÆ›T<Î
*‘ž�åÏFÊ™ÇUvÈÄJ3y’?�È(6è?ñ3ÛdÊO³+—Csuî“æ>pxÏfã0Ô­X®fÚSm±ú$²î‰5·¬�¼ë_µÓ¡|ª?WÃKå‡Z+5@Ê"Ùèð_¼û²¼*j_´:¯y¹Ø-÷†Œêk-[)SüŽmЮØÞEÄê¬rê[S`–)¾™�Ћñ§WÏuò‘9°w"3àŽÇFGôÞßgFÚÀBîÇ&×"CkjÃ?½®Èk@™¹É&ŒÇä�[ûcI2™§
-]ª>úÀ”¤þÛE1Ûyô½Iåjë$�aÐDx!}2ŠÍrÇ`úZL’F—­àí¯–0±—t?{G
ˆ¦õ^ðª¢Þ¡P|1;p]cÔ£_¼þ~ÌKÞ~å¹’%^§Èüq„ñ3¸Ä´³Æ…Ï­VÅo£õ‰Áƒ—8H˜-ߥ5ZÛ‘ÎÙš#žü]“n4˜t=‹
“ôÁ[Jï((ñ˜|Õî~úÔ&¶µ=Oèå	wx°üOßTû>zÚƘÆñTņÊí‡Ç Ï
-2U*¢
+xÚízUX\[Ö-A‚Cp‡Â�*<¸Kî
+(¤€Â]�`�àÜ	îî4AƒKð× —sú?Ý·O÷}ºo÷»{?ìµæ˜{Ì9Çû¡¾¯iÕµ8¥¬œ,ÀòNP7Nn.�0@âháîªeUæÔÛ¸ž‚ü挌Ú7ðÀO€lîq‚Êš»=áÚ¶î
+ós?­A¼%:Á„
ê0ˆ£“@ì†9@ O�¬“¥»#ê¦åîìì
+†=5mõG®ºµ¹œÄí�q
,¶nnÎÂ@ ³µ9ø)ÆåjÍ»
YŸ•ƒZÉ89þAàŠñ‡f²Øòi(oàßu³‡:yB}ÿ#l
�Zý9’•»3P
+qq¿’ýŸä§Æ¿b6`7
+bé°
+ñóþ�ñŸZü¥ÃŸQusÈÿô	úå+¨µ@èã<éø×H`˜ë“7
,Ú˜ðïüªNnK0€å_Ö1ñƒž\óôàþ¯–ú7ü¿ëï5äÝþT…år
+jãðO™ ®ò/°•:ÄÍÒövùKe«?¿C°º“+ä�/ÀÉÍÏý7LÛbi»º>�ÅŸjõ·’rPK'+Ô åöäJs˜Õ?À–î0Ø“<ÐÓ»í­!O
‚Á^`KŒ…Y'K‘0»š°¶ë*)
+OÎã¼½:—�î4|1Ï6¹{TIíK(ør.^&}’Uÿb+^ñIéYx<…\Œ §½�t;*>Á[|DÅHòC®ZQUa¬c4–ÉP/ù‡hÒ”¬=ï
Å#Ú²KFq™1|­p'¢@ªkÃ�]µçÔeyåèj»³¬BÄ·!¿Ô4„ŸOwÈ‚ìB"R0•:¦n˜•1¯ÊÛñÍffû¤±ù§Ã0ÜjŽ-(J…;Æ:ynmK[­o«†�óø•x��9úó
+úhvœRÑNvŸ_d—ì"Úöä
+˜’Iêãýèƒøl êR³ŠÿÞ·‰ë«ÀäU‚bå¼°n‚‘Kj�…s�äqÂûHˆ¯¸ÁEûLné„5ˆÑ[¯l½�1�
+òÑRʤ�KuT·û]æƒIaM+ÅÐ]¢™Û̓÷i(0¦"	cé“q«¹ÐÏЯtã‘äÉ„8émÏä<ižM|ÅhѼR˜xý‘¾˜{De^ž˜Û,]i�FöË`Kò-esfäPÄ�Å}fà»Õ7Ýzóä¦mÎ�T@?Å
+„ÎÈÄ7#V
5f^gaHØŽ8/ÊE1ÇÊI’Vàæú.ªÅ)6vÿE÷qMD`Ñ_û“4Ò€±'Е�hÅƘ¿'fPgs’ÈÎÓ÷‚�­uK�íKÊ\¨"Áú[Üøñ2u]ë{‚Òû©M#£èw}_
L§å‡¥"âÝú·á�‡ÒéÄ
+(u¨©à¨åìÖÆÚXùÀ#"p©
_Li½9þ.
/²l`•B{«�]Ø—^ºê�×Nü¢í;¦'f¥¸„Þx:U�VvÈV±õ›”­½öÆ
+Dj5mGãñ�Üåf²4˜�Ë“•
+�
—B¡ÀJ8ÇHH Å
+’ŒÅ�-|n
í–Ò‡Åbæ.GYÂYÖŠößwšÅÍ­zÖ/ï£õÎÞ9“ø“g–”£8am’×óç¯xÝ‚<4{óF·Tî_v;WÍ…\ô!õ—ä»Óˆì$»š]'iHtf„ÎÄ„ä›TÇœ|ÔñDejDãR潑Ítœ½Î:3hù°Ø=Ä䧾ÿù0Ù«WâdZ„x®™ß²w‰Žì__v̓đsÕAGZÍŽ¿y¼�šš
}‹â{Ñh
+Éøhª›4È©³§i|è1?î�Ÿû�©±Û߶š2ZÈ^â5í«�\L¨!o7U"e¡·o³<¡2W…%yEÄpÀûV&ïZg·$åN…OG£ß[Pgò¸X òvSÒZ�Â~jƾâ[(ôÕW¡ù¬@È„IG«OB]A 8u^iÜññ·! ´ÓÈÃÅÌþ¼Šm
Ò^…inFƒ�^ã:5æÑ£M¿2�v•E…H¿Ð¢Ö=�/‡ÓNæÙëÔ8o æÄÆ“ÐYm	¡]!úÜ<ó™s5¡! Ñ�¦aðúe4{œßÏï£t•
eÈd@ÁòUÔ­*Oq¡4u¡jTA?èÓ™Þó!jö¸Z?¶Çe�LÍ®¦Š±‘O芙YTê|ÝòcmëPï(xÆÓå„!
+.(gEDŠD°G§KÙl*›ÚC{´¿]Ox‚3Kj¢e\_‡%ö²V€}Emx¡]jSw>Ž³®4÷·WSÔX#ŒëâÞ04òfda@´öKL"G‘H|,
+›­½ïJ—_ûã@!Ù�ÕV‘³›ÄZ²av"
¤þp\¤_·_ëÕGZï—ÄÍs‚ÚLUš¯$í¦òîSWá“
+
+LjwrSui�„C…RçL¶+
+
‘”¶XDçj!¾��!Ø&w¯p•8¿„�ñü~ƲÛbåpP_áè}©©s5ñ΂Éyk?Ây̤XêrÕ˜§tÕ#rÆ°x$×ëÅÌåàŒÒï#U Ð¹Ù®á/*¶±Û=
+È“\
Yg†6°×°Ÿ®‚ë)®¿ž{˜¹0Vìôí
+ØŽ–
áH…©,±R¿¥h‘3ñ‚£ÍÝÿ+ƒp³7®L0�´Õw€âª:VÙ€§Ð¾œOT¸\ÓU¾t‰^¸ njùÐV�ÏF
+~þô•cŒù˜ü½ÊÓåH2·rC56…˜EY]V�•-éì|ÜÎI�øpç&òq1‘ŽàäÔ¨øó‚’£áJdVµyâË
+¼OïÎ
dV«	¸ÉXê%‡+—¹oÛ‰ŸÏŸ|W­6ÃJç¨@j2Ý¿õ§zóQ‰ÏËI¾Á[á'gÖ±Ñ*ê%WÐW’æÞ.
+ÝG¼òÎÂAlWÆI´c‰Á‘~ç½´�âÏ¿:d2ñù@k¶ª¸¹Ñ¾àÚ¨i›…mšoQp6Uí,v†ÓT露ıMk„Ê];kÇåQÍqÃ�êÀêùN¶4MN
+ú\¡ó^挟hŠ¤#ùl\“!3ÈZuI°V+¹}4€lEˆ¹É·ÐŸ›„
+�úº—s}âs9«TšH“§?Pk%¹šûíT_ f�òûÅO¬ÁZŸq	%ßÚÅ°.†.	YáÕV=\�¤ßØetpÉÑÍévàìúÉÇ¡":uƒ©õžÙV«Èk7ÐÌf\=wqÁ*!KˆvLÊ(û±“Z³DÅl"Iö£ÇâýAoþ�<ÙDæ�"üíÎóFžþüQÙ¼œ ží,åøÈ·ð/ÖE\�]'	è\««=­é{$R��Ãð‰uLãÞ_�9}ò¯›’ÓfÒ¾Ú·7K#Qr¦|¿Ôß0lx¨³×ƒ,
¶ñK”c™ôõ�àPœ³Š	QÆ4ð+SÕŸÏu€Pôû�ðè,ÁvÞ˜!Rn+äwªy
¡£(Ÿ¿ÝR”}�ÈÊ»w�&!ÚtÌäÕütM«¢™wH®‚Ø÷Oi;~ã©‚1½Ñ-YeÛ/ED9üW˜À’3¨×Ò5²AbIÏ'E�$ý¹'˜‡ÐÑ‘½.Ž`/
¯ì9î{0š§à#ˆ½luØUAÏ[-Z%—ô6‡®:³—€ËA)†é”~uŠáÈY:?Åþ-QaðdÓÙìU¿~–·†±ž¼f’ë
Öîû‡#œuj[Õe
+V”ˆªùÎn-J’5~£h넘
+šÀ–V"Ã6%Ò&2wëš*HôjÚ1�ëE£J2çF³ÝFô›1Åqýši™Â±‹B’SÔ­Nÿˆ))$²²Á¶·R¹ýaM¤³C>Øn’RÁæneé!_6¶ÊöáA€Í뜯» \®{:Úô_?[nS8«H³ý2g1£P}ZEºRT¹é­ýŠjùewñûÂ>µÚ}^f
+Ú†Xæ—˜Ãè¨ÂM3áÇ»ŸèÍÚ:ýSðȦÏÆó¤[ÛИRËs7…EŠ”wbp`Áw¤ÐÑKìPç
+o¡È‘¾É1mõÂOF({Ä!1ª
R®Ýq;á¦W²‚E¸)ö©–«h!\)ï�†(ß\ Nýˆ;áˆþp¢d¹§â&‚-»ŠT8lXƒ>•¿!L§—’‚Äü›ò‡±ÌRÆðq†‰”^vRÞ²ó¯„|_
$¸>#ñôyO(ô“Ï4Z—g$BIM�1ãÇúû‡=òèX°4Ucc6$�+Õ‡=ð-uT»X?мˆ£WX
íx&ÒŸ»™Ïâ-³bUó·ì,OÄÀÆïQõS«�G(á@ƒ¦MtçhÊü†VÔåµU–Ö%±—`ž(µ9M¿«ëژݘè*ÛéΞ¨t³{›@“9ôÀ݃O G"4oV7ØéàÜߌ½œ™�‰Vç[º‰^t^p×Òm¿êÈ#O¯­8ô+¥(Ú›ôFî°ÊynØ£"	õ ¸QbëmÖU‡‘v¼'øÜ«‡![Ú{ƒ.1]8Ûò~bÉ[Ç{Kèýʸ­g‡ý¼;†¶ºÒð5
¬ì­kN†Xbwî§ÉÀ¡ÊKÍE62ÈêÎ$ÎZ΄mò϶NÜá$‘^­7}&ÔmIz1WZæ0üÎèü%fð/€Ú´g3ÅôÞœ-­‘jÅÍ!M¶¥[YÅÖ„‘qÝ›£â�ùøoz9ÖÜù=FÍ�ãˆÒ!Ï°
+´Ù66¾‡F|:i+H¸íè>Š!L¹b(·ÆVÁ©lå+m<ùøØèô2Ú¬�À	‘RYgŸÆ:\{^Ù  Ë´Úyßrl¼r@‡Í
¶5`ŒZ€tsΘæÅNu8å–·¼¿lìxùº:l	>Ì"Ó
Kc—Lç²�y’ÓhÈ÷•—Ž
ä•ŠT•>y?p;u²¥”°éAŒ=¯à_à/F±Ø==!êö¤	Ýg–
+’±]_¤$Ù«|ÿ8Ã'9e«	.Ú—¿dÖM·�$
?ÞWËÿx\ËGŠé¢‡¥~²:‰‡ÖgÀ¡˜Jz£�ï×p5�¢�Ò·�òµòb™&ß�ÙçÛ΋ç&P.·J1½r

+úmLù…cK³"ƒ›y>1­4l=˜ÑY_Yaï=+u“i$�YQÚ7pè¿¥cé÷ó%cŽÞãÀhÒm<€öÈZÁ¹QŽ	(y,—ù–P§ 5´À|y©F„CôbAíÙãTzÅJJZ
+%à]µIíùŽäÍi(;ðü%‚Ï׳‘ß×:ÚUŽ%C$¦q”k‘hHEîÚ#lñÚ6{=š·_ÞJî]„V§AvæáCÁNbd£C÷sá§ÇËERv4îrpÈh8Íh´'+Ák�‹X:ÉøÓ€“2`6�¾ì¯Ô/6i#Í~õþVS"‘æîrŒØÜÐ.œkÏj3rÛØÜ8F7Ü›Q¼$X©µ´�!.³ýåöÜåXM¤,ôg¢‚{ø¤˜úí;„ynKÏ°ù¹°ïMh$I]Ìäèò!>FÔöÐÆÍm>fð÷#͘ŽŽú`<½¹ï[ûÉùôn]8ß±J2|ns/åÌÖõÙ_Ž½saè²�™a=H_Ñ"‚Øž¾Îx¹ÖØÚCVêý�ÄéÉ�ÔPÚËè’_¾¬ª[„½} {ÓGg Y³[
•O·Þ]Å
¯YÕ¿ÅŒ·/[|hÑ>ìºG�q\b�ÎðÓj.W°Kþ¾�qÿ(¬h&ç÷îsÎo¿Á«M—¼®xiZ÷�ZÂ�ÓáÐ|Üð7YÎ4V
œ#±
ú€w7CïÔ
+át¸ƒC2Óëzz¼h³ÜÕæNýdÛ)ãEQ¹·¼ÉÐ8J󽓥‘qæä%m×ïFr�‚Kñ-ßp”	aÓõÒ»Î,ÜQuIâ˜Ï”ÛK’
¬Žs‹ýŽ>èñ¸Oß- 3n9D'Ä”¨¹4AfhÊÿ4ß=4[õæÌfR»æjÏ댸Q}%
§�æKSá±(¾Ìiw-óà˜™þ¾ü‰[k×5œ³¨g¹øßX¡( �Hoë&DB˜c+G »ÐI@Dö²FÌâŽ6÷ñJÁç�˜V�fÆxL‚öûþncfÏÙ>YÕÇüZWÁgpRj4Sf¿ûÞÌè,ñöQ,”QQ~ßpX¡LüÅï,Ò¯–ùô¾ŒxëÎ7w��yç·Ìûó[L̈öþhÌcUöt�RJDôèñå³>ª®…i ¹]DÁ&ŸS
+b Œð¶W+ènK‰•ÖçÆ*ñkûL"ŠÛ¢*N¯ûÁYrÇ€%<•+!¬›ûÏú©âêÏR…®8R~7=Çœ"£t9ZÙ˜Ô»{5‰’¿
ey`$4ÖìÙ¡„Ùê¡“‡z*yÓý>În_aDôElŸ~(
+¹E•IÈ“SQlj"ˆÕ¼Ô¶³t¶ø”în0š¾7À¦%ãM�ã×ÛŸ¾ö;Hè'ª‹ìmÝOúì7%¡–•B]yúâ${¦Ñ°4ðgJ]óÉܹ	yœÔ¬­‘�G«"¶àCS{ÌP47ÒœÅô_tLàw¿Àoôá%S/±ð•Q±ÑÆÄÐt®]’ì|´Ž•Ó7Š§§ÕêÄ©Ü*á“­Z2^kÝÓ"%ÎûXä<glÆbYqý^Ï,…v-×¾á2}’…´E)ÆÈð!eð-~ )¢†f0±3Xº]N*þvC¢1³*û¦`ÄBÇúó2•Iß‚ðñžé'Rìfœš�œÛÊ|1Gô¸~ 9Ô•ÙPÆdä½Ð÷Ί‡­�ƒŠmµu
çIÚÃ4%­Zû‹WœnלG’’%ËmÆ
+༤㖞�Á
+•bÉýñ;>îJ9ÈŸG¨ÏÑ?`:é¬åE]›Îþ:éo˜#ÅbžÃ¡|^‚ôóuít‚²$yä¿­ì¾Zê—ø©¤Õ+cµ±J÷‰uQŠ¯O.«Òì{Ý6»àƒŽXeìeŒ•DÉ7̹ÎÝšëÊ‹P¹³ãÞrG¼U?¦~Å«ÛlÖ-£¯èK–÷<˜+ñ÷ð
WŸºï(j{’!:ϪºŽ#{ÁöÐÚÕÕXÍï§<L\ýÀä›­—ï_’´„%J°	N'š»Y´Z£Ð
-‚¯s2íuÜ95´ì–ÍÏL>
1-œÔ.ÂÇuV6ZÓ\¼JjʰΊ›OÆ~§Ñ²íÄO(^¥"Ð�8ðÂÇYé_ 2çª"ëåu1yo’Ãb¿gŬ#ÈÔJd@‡í€›ø?éwh	˜1hg%�oY¨lH2:	­J¦_˜9i˜�¾�ÁOŒž Žå¡Ý>ëÅ[d`àd¿åe2´Ì
+™&F¤íÿÆšlתï©k—Ýë	?@,Æ‘â8ÌxÞ2<Î|¤_Tò¦\M³’ë·ioïOÝ4i„î7}œï¿%ö6Û³öK߉mŠýè"¢ÄZO=óÇY“Lï´Yƿ݇WS;uÚó.¬£¥¼£«‡¡€¡åLԔˡ�ÓµwžìéÈGÚšž×¯‹Ö iªëÒïC™Û…è]HÊ_?›ÎÜH¸÷Y	ÇÇÈêpY›’Jñ¯yÑL€à¸×õ«¼39 cUêŠÚ
¹ä×ÈÚeÙyœM•2#ØÏö€}ºþ5Ì
Þ¢×Ur`܇^¢ñ¸¸2=
+?ȇÜ$äÌYå;÷êƒ68wÁ–î³deÄû´þÇï&
QÈž†jOpöK‡‹mú?—9&CÒàý=‡Œåì’dF¥})‰L^M½JÀ6\r¡ÁœÎÎîÌ‹“n”ÿÑ‹QÎaZË9A^<®ëžïö
+ï| öSg�/}_�··í–sÐTfZ¨ù³ÊæßHYìr3"ü$h
+÷&W	 9)€±*‰êÁZ!žÔxïÙú‡I
¢,áYšå½¥ÔúÅgäu¬/Qu�½+ÉT.Ô†?«ÂZžGŸs6?ëØï·2Dèþ¥C(�
›­4æ¸íËÂç"`tx®aQ°jÀ•ÌxOãK¶¸HE1äÑ2Ñ‹oüXáiN‹y?ž¦¥Ü£›±ƒØ�¬4áša,BÕI2®–¢ –õ·ä‚?ýê[øaÆþÆšëñ!;áá`·ÐŒz‡“¾×¤´9œýó~>³� Jæ4Óôyaü‚ÿ',Àæ07'Gs˜=†/ìêæûã_,ÿ­–êŽendstream
 endobj
-848 0 obj <<
+797 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 2
 /LastChar 148
-/Widths 1339 0 R
-/BaseFont /VLBJNQ+NimbusSanL-Regu
-/FontDescriptor 846 0 R
+/Widths 1349 0 R
+/BaseFont /TZWGJG+NimbusSanL-Regu
+/FontDescriptor 795 0 R
 >> endobj
-846 0 obj <<
+795 0 obj <<
 /Ascent 712
 /CapHeight 712
 /Descent -213
-/FontName /VLBJNQ+NimbusSanL-Regu
+/FontName /TZWGJG+NimbusSanL-Regu
 /ItalicAngle 0
 /StemV 85
 /XHeight 523
 /FontBBox [-174 -285 1001 953]
 /Flags 4
-/CharSet (/fi/quoteright/parenleft/parenright/comma/hyphen/period/zero/one/three/five/nine/semicolon/B/C/D/F/I/N/P/R/S/T/U/Y/quoteleft/a/b/c/d/e/f/g/h/i/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/quotedblright)
-/FontFile 847 0 R
+/CharSet (/fi/quoteright/parenleft/parenright/comma/hyphen/period/zero/one/two/three/five/nine/semicolon/B/C/D/F/I/N/P/R/S/T/U/Y/quoteleft/a/b/c/d/e/f/g/h/i/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/quotedblright)
+/FontFile 796 0 R
 >> endobj
-1339 0 obj
-[500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 222 333 333 0 0 278 333 278 0 556 556 0 556 0 556 0 0 0 556 0 278 0 0 0 0 0 0 667 722 722 0 611 0 0 278 0 0 0 0 722 0 667 0 722 667 611 722 0 0 0 667 0 0 0 0 0 0 222 556 556 500 556 556 278 556 556 222 0 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 333 ]
-endobj
-784 0 obj <<
-/Length1 771
-/Length2 1151
-/Length3 532
-/Length 1712      
-/Filter /FlateDecode
->>
-stream
-xÚíRkTSW‘ª¡¬òRIÕzX%2yj	 b,Þ/‰¹7ä–ä^z¹�¤
D|PIU–EltÉST”
-«Š@} Ô«0|‘V†°©Z
_sÁººJÎüš5çü9ûÛßÙû;ßÙ4�HCaáP%&G‚¥R	‡
È3›M¡Ñ‚qXN "'`!à>`µV
¸+
-9
-¤rBkÈ
-¹È0z&©Õ`ýä�L°΄ñ,bR8
-l„Ó”šÔ$A•à¿…!mÆ»TŒg’¢€×”L: EBªÖVRXk1²LjùoÈš^<T«V¯•k&ËO9õ—¼\ƒ¨õ¿30M†–€q Å G§Scá·â¤0„h5Ó³B®F"4M
g%“½ò-Žd†":ŠD…
-(åêLx
-‡QhºÒ¿)¬8qB\¬Ìû÷¯�JFÊ”ˆÒgÀ€ý{*æü“&áˆ$²™l6‡$’ûÝ)yZ31ªÀ M\ž�ã¸\O!‡ˆŒxÀÀ

-Á:
-¿­Ÿî;½½6O\ÝuÌžž¹ÐtdkÇùm§L~Ìá>?—ëxÓOQðG¿9osþ9îT:ñ
Ròú©§E9fƒŒµ­×ÙìèF¯Ü/›õP1œ”2ãry{Ûšƒ;îY[3š¼þìùìnÖyûú5÷9ü*êHÑÌÚ[7_=ÉKßÔÙoqøò*¥$—ŸY³ŽùçÝâ«°jÌRsy~Òþg®¯-Ô¶;=é·Mc¹Ôî†Éÿå6]§è¤p¤/¶Ä•	VË„³ú\�©0
›ý=Lq
-ÍÒ_gvÓƒ¦÷{$¹¥á±’èÑÇ*]µÔþa5T[¸¡-¡U€^,´6¬+pIoèâú—p2šöÒÖ§Ž¿¢ý¶dç̧É/^ô=c¤¶>T<lÜÖõö=˜åå=Lï`Sí¯}aöˆ—«¾ºGˆÃûVÛ5Èi“‚8Á�|·›G¿ð´p)÷…ãš}“&xÛlÞ“$ÖÙâ/¡T=ú×¥Vã
nJhpb_êÙ¨[Þ—ë/T‡¸ÖÎL67‡†V/iž�õÍ÷p]è7×I”d�ª]–‹=ºâªs9.¼‰ñEÇ…>{^ú
ýTmn9â³(Ï~hË‚ô]ÌQË
¾¿Ú��¨KÕwùÖ�4ÿ8oÙ>(*‡±n_úñÚˆÚíýcÁœ½Ç
�8v9瞊šP–ãÅ Þ+bÓ³åôvÚ†+u�	§âÈU©L<>ðlkŠ£Öã†,îÙO6ðü’Ò^÷Y¨Æ°{ÓÃÇ·V.Ú±�"tèP3ÄŸ—æ½Ù:Ú¦up7w$ZÐ{ÇLw~ìGƒ[ÎrÖzúÇ}³4 •Zác«Ö1¸ÎÊ([ï]d;0AƒZª4un4ÈÍz9Hžæeq7K]¿—<uGÍ-Æí¡íð«“Õ¥1¬<kïªS>Äš±*!*[*9­^n3ãÎ̱'¥îÖgøæƒ×Âù�» ÀÛ•‘	£•þw»'´ù®WFŠ:9³Bª”¾I”íM�¯ÌÖëºæe7w—-pªÐ3¼¶žùÄð%÷«ÓƦÍ6óðµ’Hè;[UÇöë®WÃc5œ-±÷ùѸλ÷s‹VS©Ÿ¡Æ¥õcºýõáeÖþ£;/eGXh¾ëã^&.}mS?Ôa[žt˜+tiR45÷\¬*qü8FŒ—E(Úo§lY=,­o<±Ûaç�*§¤{naˬ…;7ÿìöxY–¬òë„€óü‚¬˜s¡¼þÀ9ß{..VPJîÉ¡bqÍÁ´{âÞðœç�?|
-endobj
-785 0 obj <<
-/Type /Font
-/Subtype /Type1
-/Encoding 1340 0 R
-/FirstChar 60
-/LastChar 62
-/Widths 1341 0 R
-/BaseFont /XEZXWS+CMMI10
-/FontDescriptor 783 0 R
->> endobj
-783 0 obj <<
-/Ascent 694
-/CapHeight 683
-/Descent -194
-/FontName /XEZXWS+CMMI10
-/ItalicAngle -14.04
-/StemV 72
-/XHeight 431
-/FontBBox [-32 -250 1048 750]
-/Flags 4
-/CharSet (/less/greater)
-/FontFile 784 0 R
->> endobj
-1341 0 obj
-[778 0 778 ]
+1349 0 obj
+[500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 222 333 333 0 0 278 333 278 0 556 556 556 556 0 556 0 0 0 556 0 278 0 0 0 0 0 0 667 722 722 0 611 0 0 278 0 0 0 0 722 0 667 0 722 667 611 722 0 0 0 667 0 0 0 0 0 0 222 556 556 500 556 556 278 556 556 222 0 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 333 ]
 endobj
-1340 0 obj <<
-/Type /Encoding
-/Differences [ 0 /.notdef 60/less 61/.notdef 62/greater 63/.notdef]
->> endobj
 710 0 obj <<
 /Length1 1624
 /Length2 5655
 /Length3 532
-/Length 6501      
+/Length 6500      
 /Filter /FlateDecode
 >>
 stream
-xÚíWgP“붦ˆH•Þ…€
é½ÒA¤W
��„$$¡ƒô^¤
)*½Ez¯
-"]št¥H“"Üè¾ûì3ûž_÷œ_wnf’ùÞ÷YëYåYßš	»¾‘€aQGÀ1"‚²
-Ä@d
f0@ˆŠDdddˆ¹
-êàˆ
Ü114ãåç¿û×Í/€�ןÖ
u€¸±îé�c°ÿkG#€q„
-
-�µpÁbX2}ƒ¡ H
-…U÷÷›�-úÏóï�‡@<! âéO�\ˆSzf¦Š>§÷�ªeg»~o(²°Öøe~@¢Í?=bQ¦Ôö¢2T°nXöò­×Äòç—|«ýít0ž¶TÈN‹ßmÞŽ|Êyî&)þÕ !ëB²Œm³ŸÝ�®YH
-›®.½30´.¸¸~k¸Iuc÷„7à¶{~
-ä÷wvÇ«éRèJV¡e’ìr¼9ùâ‚œô0˜"Än%Ÿ•MsÒºYìÎUBu¨9‡çͪ�¸qæÍì}ÍlÓ}|e±ŸrºE©?G‚ü¯’ÍóEK0&•’O®&œ¾TÒ3©¢—]™7F�=«Æo¬ÌS
-8O,llH?I76µTèXD œö³Sè.NwiçD8T¥2u¼Á
ÏÔÈCi�ÂUЛAJéTH®gÜöI”1MëM`*o•æ¾ÐbÔõô©¹,V-u4ý†ýCÝÑUOKz‚—âÛë—ëÄä5~%šct]­§h¤²ÛNå¹öÿ Ûö’ñ?‰�·ÏÊ*åI“y[qo.oZqO—f4!OòìC'=[b°ëL‡\ö¬WK+õîI¢
-0…Ødgç•771ô|Ÿ¢‹y¾ÌõºbÓü–u0Æ_røªvùMc®ç¹ÃBÅ\n}HòýÇHyðîµ³p%Èuë@k+…–ß×ÏÔ\|©bû¬�ç´ËOª?XçsË,[Õ©EWJaoD’ןÚªÙ‚(eT"Œµ6¼AhÒ7Y*¿é½|8ÍÒäÒx5Ámê#)ѹ å€n_7¯Ë,f™·­ž³ö-üæ��S17É1I©wŠ—&ÍÄ°}ðnñô«ù\
t§kôaLs(‹‰Ó�³ÅÇ?=1òJ8¹¬_Ãkvy˪7—‹´nK°°=içé0Â!O³v£þ@ë¬QueniÊ<¾³ÕµÑ”ÒÂIm¶ŽìQ#wœïa8ú<�z/gÈlŠår¢g4t&*ÀD‘@(-=V›HÑü"§�KÀF§kìqDœ4F—î>á‹
ï¶ù´eöä—ñsç•2´9µrœ%´5“Å%:ø”rBSÛÔ†Çàš¶/BÄ)¯o�½ÑäNÜèÖ|ÂvthùL—XÿUš^ðöá÷FŽy
-ÀÛËÏ›ë"±¦­\E‚ñ<\þìa#®0G£Í¾ìÑž÷š¶˜œ ƧW3K2aØ•Ê/Õn$¦y½–î•Þ�ç�ùÊ1(µVÓ"bª�ùº©:¢OÃOò†Ÿ–Å°.(±Šb}ç”i¢Â˜¬ÿqî‡É{+_V®�¸Ä´$¥¢P_[QeYjçWZo—¡ÀŠæUYþÇ»®i):q #ÏÙ@öN­³…sèw^—”ŠÖ¬®I)kæ¤Å‘s˲QMµd9^bU·ü½çw£
-÷oŽC
Ò^ï'‰¶>ù
-ßX?zóä½ãÁÊñF—òû\šµæ–­ÎÆ:Û}|í.Mœ“îL#Ø*ê>~CÊ<Æ“¸R芧æxê2¾D0ùÜšãæ­Üh<U±n\n:K›øš`9X£9§K@Ø4½` ?‹x;˜"’L�œùñb¯T�íhSþºÖ©"/xý¹\ƒsûÈQÒZ#d¶(ùX@/ÍïŠ.jf#ÏÕùÕõŒ	ƒÈ¸Ñ�D/ù	$³s_H|�óÔyû­æëä³ë*åµÛÞ!›…9KçdäÌó¸ñoÒ>—gIè0�Û„^áÒ%	ÃéRÃ~îïQñE¸È~R<™¯—ÆksRÜx¦õ4«œßg‰½V?^ `ÚÖݪ3G6PøAb+aDoU¯ïN—íhø
h.�Ó FPïÉÃàFñä"}†ü»Š— á º㜒žêHÿG¯2‡Ä
*e&è°Ôóå[CVÆk´ø“ìtùÊœo$ô‡ÄÓ¯­ûÐ< ¯ZÁéEºð.œd¤˜]KȮ۰ūe«úž\¤�ãó.¥õ—ïæ :@Ú55,g|ßæö7úh;6XÄ/>¶"ynö#®¼QóÀ�<³{5”–SÐ/8*У‹‹GO	JøL©‚¼�EzÆÄǪµR¥xÂ]åÁ½œÎ+ñ6ý§ƒ÷ÎÆ`�bINÇQˆƒ›§ôý6†�„øågÑåîp&Ã8”ËöaKÚdagØ[Ä~¢�ÇS/e:¯|¯ñÞ昮¡»œY¶šÄÐî«�ŒLnc¶{ÂÏzõ/+åæ_9@irø˜crûó—?VpK[´Áúùp÷ãÌ�Wâi{m¶Ý�šÍš^¯ƒkBlïøôô¾™™úN‰¼·9˜¶Ë8ƒØdX'E?Šª!6œi<Á·
-MwY}6ŽûV¶Œ—n:÷ymO}€KQNUÁÆ®2¾)õ¼‘A”ɼÆÅ­…H?òês9úóØ‘)ª¦Ïý¥�¼O8â­‰`ù�£4ýÌÍͽ"/㬂ìÂ>ÂÇfSgL,D Ï\¤¶â2íÓ8MÇÇB3£[
~„ûðü¡í)9ú{N»\˜"¯¬ê9AäÍÜBvLœ¿xa1ýÐÙ‡?¦•J§®2ˆÄ‹"]¥ø4wLôn´¼lûÚ¡ï§.|‚ ³®2èEs^Þ=ÒNQã·;\Ð2>“»ÕWl�ª”›
-ÉZI²L%g}W
�f±½‘¸»=ñLù’óZۉ׎¬fž6‡û|vØz½¨ê¤Ù›«™œç«R};·C:)†æ½QßÈ›x» ¾ˆhQ	¤Ç¹Z&âþ±þ6(Õ†i”U·À·³•>ÖõðpÉúP9w1Oêë@Œ#Ú¢Ð\Â�H´èÅ“ˆ²]WúÔùýÁ�—¨£ÐtGÓÑ{£ˆÜ
-/%É =Þ0gè‚ž•/Š³=K%äØï˜méð©_8êZr1�OIE¯}}FºæÙ÷Qí0
-ÓKd÷5>£FÇíêN^)+&yä¬>Ki?bKÃþÂ5Ih\ðpX1„¦ ;ñ OÁµýËw•¢:ÙÔãoŽgX÷‘5XË2R²‹£ŸöŒ¼Ôö· ¾9ëȶÇ@‹këtÛ�6~lŠlÖúÊ›§29BÍÊS$ÔÑд¢Ý!œ_�4ÿ’‹Ó§GÂXH×rcbé>U&tã”%…àJ6ìdÌ$�V{
-ßѦ
-o>‡…~¼GYøüÈuQâ*³AÙŸK ¾ôµ‹«ñ–Åad
|KtY;…Ü©_–èe
5ÍŸˆ¾#�¾ïE’Ô{Éq;_þZˆ
�1ÔQ;—›ÎªD=!avhzìâ°l#<~á>Y×w<öì[oçü*Ö�s·ìûä(î·Æk*gÉç:]¢'�‰!%y]¦ZdTŸšnS Uß\&xyu%S–9²�îƒ'"šÇ†\ááº*ùx8"Üé÷žäæ
G»éÊB;âÊ(â
-¥~-1ßÊ·Sí·ÃÔ:�Ö©—JZFß�”-¦
âJ²FDDµ©�›¹�â1ËîÓHâÌäÅÖÓ�~ì†Þr·ÂCÅS#\iŸ5뫃O�Ë=iåw—3v0|¯†FHFú®Q…k<Œ"X1Ë”vuÔ4–¼¶uèSŒöÀ�îÛ
-Ú#ÎÝÅ)šjÀMs¤ârruRb&�l^5!Í¢W#
-¼RK·=Ž–ùóoú©G–c£m¨f�k
-³Ÿ“öÐ^£²P¶yWmnÏÄÄ�T‹Ë^­ZïÚ]:Ê>9mTl´ô£i¥OäáàÑýlú±Ê�(À•ªûjÊ,µrAAx-fLjpŒ
>¬ŽÐþÐ3ú¾3êÔ
-yîoÜlŒ�à㹶_ µ'Õ ÍO.׸µ6}¾Â£×˜^N!Ý´�’»ÒvµA±çþ�ð
kOg
-�Ówí2ëƒ'Î`p+p	¬ã�™CÏ?dÃÉ!¸äëõé)§»Å8Ë÷Ó»nübçG®ú•u™€ùw¾jaŸKè\¨§*A
䦢3$ÚˆåúŸád‡9�ðÖB¶€Á5
³m({ôTá{~·sF'[‹»zèêæ±Hží:¼“þ"2ÉaÊ�øàý´ƒ¸KðÒ‹,—‚aQú²¤þ+¿9PáÝÄúÈMU:‰b2Ù	œÂ�áÆ–€œÉ§mle,sm&,Võ£r—�“Gf—nÇßí¥ú2ÑÅu´SEÈŒÀKG9éìT\?µì/8—ù
-—
-IÃ%¢§¸ÁMÏ­W[öÉ%ä¢*¿gš]T›®æÅÖX=„~í�uÊÌ»Ñi©Xp
ÓYÂaE´=pÃõ{ó­›óŽ¾™É"ö÷¥	F8
4ÒL”ÆÙžÌ[;ôé‹�åŽ~¼ãl¸jä!@šjUâŸs5ÌÃO‘Å7o­\)ÄÈ’±0øzi*‘ƒu[ä	Ùxm3È!5œˆ£x‚
+xÚíWgP“붦ˆt¤w! E@z/‚4
•^B ’�„Ò{‘Þ‘¢Ò{Q¤÷ª  Ò¥IWŠ4)Â�î»Ï>³ïùuÏùuçf&™ï}ŸµžUžõ­™psè
+*ƒ¶�û8FPTHD u¶uEk#à�U0°®-
+À’$Üܪ(EÀÕ€ˆÀ¨A@
+Á\Á¿ÀÞÛ!~'„D!°ÎXK¦‡@cÐ ‰
`£ê©Ýÿ#OŒó+6Š…
;¬%
rýUÒoKƒE1@(
À@<0¿bÙB
+d'�Õ÷_G>Õ<O“´Àj °U!yú¶i´÷îÇG×Ì¥DLV—ÞéX\\¿9Ü$Ž"Ú=áó¿å–ïOËuŒ¤x
+J­yF×LY‡C]õbk›'qã䘷{ ¯·§mŸ ã‹ÀógÄÜòn×Èy¢ü]ž³(™—zGp)ªQ‘Z&*sÎz“?�p“ÅeŸ•ÐÏ=¢-fƒU¤ÄG.Ò*RZêÞní×d9ÄáZ¤šûOø¨†…�»n/¿|Ù»Çsª©Îp/&j¾¶x÷9Ÿ_
+ÔŠˆœ�\¢ùéÇŽÇ%‹÷}:¾¢¹8­c
+ø99ŽãÕt)v%©Ò1Ku9ܘ|qAAvDl»’ÏÆ®9iÕ,~û*¾:ÄŒÓãFÕ�`ì8K�fö¾f¶É¾9¾ŠøOy�¢‚”Ÿ#�~WIfùb%ãJ©§WŽ_*˜ÕÐË.,›?#Ï2ªñ+ó�¡¹–¤ÏˆÛ³øX.nVqY
·Š;•ÇÓ›F‹g¤Íü‹¤”8‰>àªWˆ;N³Üe¯ij»IµnjCë&æñ˜2І¶av�NÅN?Ô2VMç£ZHÉÂkq”Vçw«öÙ;uÒÒu�esAe†F¥DÍ¡B”¬ë¯k©O¸ÙX'ÍL‚Pí$Çvéø?»ê˜’âcŠ?ß7�€ww¢RÝ"vÏL|ô
’‚>Á¾«}ß(rzRË6d¯—^Ù0;nã5ªˆóÔÜÚšì“ÌpcSK…¶y8Âq1;™þât—nN”SM:SÛìŸq¿€"„î(L-²¨œF�äÎà±K¤ŠnZwoS{©6÷…£®§Mͽ`
·äl©£í7èꎪzVÒ´ÇÔöD¯¤X;:¯ñ+ñ¬8“Ëj=eã µí†0p*/Ð¥ÿù¶§¬ßILœ]úPV)oªìÛŠ»syÓz‹{:´£ñyRg:ùØ‚¼Ùf:œár7ñ`½ZZ)wNá$³ìž¡¸M6†e=íW¶×k’õVÝLkÑ/UOwì+ª®R¹øÈÝó$[»´ó˜µxä¡À,>[/½¸ኬÙZcTwÚ””ìÜãž”S­qÆ/qžýòn„ë›­�ôÖ„uqÇ;!u¾3%wy;ó…=sHY½($�õò±�w~kÁ�È�-”¿	Ä:;;¯¼¹‰±çû}ôóeî×›f7­‚0~RÃWµ«Èos=ÏíÒñ(çr냓î=y@Æû€oG¸�•;^¾[Z[)¼ü¾>h¦æâKûgå ÿ<Ç]
2½Á:ï›&`¹ª¦•HúRJ;CÒ¼þä�VÍD)Ó 2aŒ•
¡qßd©Â¦×òá,4K“HãMä�‰·”dç‚`¤»?º}ݬ.³˜uÞB¬zÎÊGh´ð›+4fNÕÌh$Ç8¹Þ1N†L,ÃþÁ/¨Å÷æs58À�¾Ñ›)Õ¾,:V/ÖÿhôÄDØ3þä²~
¯Ùeä-›î\.ÒZ¤-ÞÜæ¤�·Ã‡"ÕÊ•æ�“JxÕ•™…	ËøÎV×FSr+$¥Ù*¢G�Âa¾‡ñèó@ÊÝœ!Ó)ÖˉžÑ�™Hc%áÔ´˜‡¼@Êæ9}Ü‚ÖÚ]¦�#dÑ:ô÷_kxµÍ§.s$½Œ›;¯”¥Ë©-�ç*¡«™,î(ÑƧ’žÚ¦18×´}&I~}kì�&OÂF·æSö£C‹½W©ºAÛ‡�Þ:ä
¸Ú›TŸ¦æn×Q3Ÿ¼
Ç-ÈÖbYÉ
+ó6X??î~¬)RòJ"u¯Í¦ûR³ù@ÓóuPM°
ÓmŸ�žÞ—Á3SßI"�w7Sw™f›ŒëdèÇ‘5$3�'ø–!iΫã¸oåŠÁxi&sŸ×öîp+É«)ZÛVÆ5¥œ72Š1›Õ8»¶ëE\}.G;2HÑô¾·ô‘ï)gœ1L#¡}”ª—¹¹¹Wäi”U�}¸CPÂoMøÄtꌙ•ôy€›ÌFBV£}§éøXxæ`tËß—poŒ?´=%Ïp×q—Sä™U='„¼‘[È�‰õÓ
+|:[‚`]�—¬Uró¤¿D;€ -ŠÍ%ˆó^Ü1Éa›uåO�ß_yŠ)3	OwT1½7Ïõ´Ìî¾> Z­¡ÞaˆŒk¿ßä›g©ïpµŒË‰ZMS¨ßt›�¤)<ÞWSnå h
+
'æe}RÝØ.;¦’ÀA8"×MÚrëÌOùr<BåzŠ&D‹7èe免P”«áô\úú…Ê=T~©èæEþ¶l?©úKÈk%ŠƒÁTCTå(õ`¿<!oz/÷ÛI¿ûk‰.ƒ¶‰ïÏã|Ä»DœÃðÂÍL�Št¹»¦²II&(ß´ôâœÝ»,6!8ÛΪ¨¿‰Ç:¸z×�ŠËSÔú¶F»Ø#>»*úâTJÄ2}õ‘ÇÑ—C„×\U¨ùSLñ_qóÈ|y´”9gž](HùF�/ýÆŒ5;³r¾.™¤W¤o+åR5á¿yùrع:‘]å48
+0fÍ%Ù¨,Øyz6mÇ2èµØ|ñA!mX@àI½Çet[’ ±.‰ÿšÈšô¥´n,ä\‘aÆæ[Uô%Õ3ùöýªòç8q|ï2+¾ùtòñ.Uákðc—EÉ«Ì?nÁ¸Ò×Î.F[æ‡y�ðM±
\dír§~Y²—-Ä$"ê¶$úž#IZï)Ïãtùh.|<ÆXGãTn2«ù””ž鉳ýr�µÈø-„çd]ÏáØ£o½�ë«x?Î�²ï“£Ü¸ß¯©ž%�kw‰�4&—ä…w™h‘/PjºE‰TuxsïéÙ•DUæÀ1ºžorv€Û‡é¨æãáˆò¤Ý}š›í¦/éˆ-£jˆœ°†š+x³˜e‘ZäöSÉÞHæõ/_Á9 ¿%c•cȸ1 ËºFìž:"¬™âÖ&‹ÜÚ»‹½¼¿ÉAkÓ¹.ÑI%ñÚ¶ú VFê}³*IJô£ Ê䧭¸IùdYÙÔ¼2�WÀiéùô\Súç=ÝEWäN1
fqñ1åÅusüI¤kE¦Ç§œª5Ï®só³<OVGŒ�•Âj�V,›ý”¥pKO£Ýç2#ka¶{&IëÝÍ)¦yk»G#;ea:N�øj×à8q(kwnïÔ€‘²òP
N•–Οv…ƒµ2”m•`^Ûð)ò¦Ï/&L_eN³ïÄH°ëDé•\äõ<|á¶L€p¢º#xKkáÒýNÚ”¸ýó—νS_�Ì‚Ä‹ˆw-¤Ç¥–EO½ìYÁ¢ã}ï�ȘN‰jé¦.´KËŸQ*÷k‰;ûT¾�j¿ªÞi¸N³TÒ2ún¦b>­[’5"*ö�¸™ ½ì6]�ô&ÉLZl=ýèËaà%Ó?,dP"%Ü….£1Hï>øô¸ÜƒNaw9}cÎÿjh„t¤ïu˜†þ“€H‚ñL½A#©k[‡ÞÅhwÜé¾­À=’Ü]ü—2!)ú<´GªÎ'W'%¦‚IfU£á2¬º5‚ Z²ç]#­Œ",mK
z`å”V„÷éæÉÕŽ Ô5.ù :xhV™"FŸhŠ¦ü“[é³U”ë1£Š’-JÑ.Úêî†ê%ªÕŽ�SõVM¤Ç
+³mêÑLˆ×\f~x2«t*ºÔ¡uê×2¾wgyÌþõ±s$λv½¦çx‘@ûÞ;Ž¿ƒh5ÓeVz¸âìT²�Ø�•¡UáÊj»Î!
+APó"e ùÓÚ±4up¥‘Èá
+Þµ‰Ö”�á‡@¢:?|g�×T®J¡öa#~<N°!‹¦¾e�•£êä
UfÕÒÖZa˜îžYôkÏ@wlöÇd9.óuù´
+ˆ¯„d
xXñ*å{8ou£}\9ðßšL¶Hx�iÒj®³æín­–°}ºqçˆ21ôG‰‰Tå“0 hx
+i.»ª|;÷�¹ž=¼ÉIÈ9°²š#Ë�S~9Hþ Z¬¼}?³GÕ¥l.o°jcÔô¸uœ©ñtËÐKåêm§
µžOŠ¾“kò†¯\â¥q«½ð=ÕÏRS±QÏïÛjd¢ËhȪ�ñçÔLÕÅ;‹ê‚¢[’ÊnÍR\âÑ-ATøz¾úáLèÇ
+H)î–îƒ.©²Røwî^ÓŸÇt¿€ãn]Ïôuýrº%ø>úAç"áØòÄRpŠëu˜‡ˆ]â+_^©'�ÛGÉþù7ý©ôc‹±Ñ6T³Æ5€ê9‘™ûÛ×\——çŒV¼õÉCíædÜ®Q[ªX¿«6³cfæI¬Åå¨V«wé.嘜6,6\úÑ´Ò'zˆ°wïΘ>C¬
+ 
+p¥…ë>†˜°H¯œCDQ>óã#ýƒÏ„«#t?t
¿ïŒ:6
+-ùx~zÆåf>ÎúýôŽ«€8Æ鱋^e]z&`þ��zèçzgšiÅJ�?…‰Ø©äCD�JýÏŽ0òÃœ
+—Ä8èõðÑñwÂ…1üÕ>ˉÅÄá±SÜ ¦çV«-{�åãsQ•_�2M/ªMVóbk,A¿vKÄ8fæuE(\Ãt–°…[oÏù¹|o¾ycÞÁ'3IRÔîÞ¢Á€V†™Ê(Ûƒek‡!m±³ÜÁ—‘¯cœW�"H[­Fòs®†eøY!²øÆÍ•+Åh9rVF_BOMe
+°N‹!;ŸÍ`:¤æ�#±AT
o  ‰Lhþvï|¼ÁÐu-þ¨f jrÊm™É-¤=›*·7^Ãà¿b-íƒÝ—�‘Îûò|T/8Ѹ»�»ÁÍêå	¶Û
+0¦Ý.ý·Ò°‹ëϸԺIæ÷Ðs”s$ßwDÏ—^{ÿLá‘üls;•¼ª³Çè¡ð6a9«öà™þÈRÖKçF›ö
eç‡5õ¸V­Ç;~d_½z_ä¦yª,ŽûH—l^Œ¹<J{æçSÕÌpY4¦S±îª×J‘h�R;±‹ã¸vH­Ù‰ü›’ÿ'ø?A
 endobj
 711 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 46
 /LastChar 122
-/Widths 1342 0 R
-/BaseFont /BFFAIL+NimbusMonL-BoldObli
+/Widths 1350 0 R
+/BaseFont /VAGMBM+NimbusMonL-BoldObli
 /FontDescriptor 709 0 R
 >> endobj
 709 0 obj <<
 /Ascent 624
 /CapHeight 552
 /Descent -126
-/FontName /BFFAIL+NimbusMonL-BoldObli
+/FontName /VAGMBM+NimbusMonL-BoldObli
 /ItalicAngle -12
 /StemV 103
 /XHeight 439
@@ -5557,7 +5632,7 @@ endobj
 /CharSet (/period/a/c/e/i/l/m/n/o/s/v/w/z)
 /FontFile 710 0 R
 >> endobj
-1342 0 obj
+1350 0 obj
 [600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 0 600 0 600 0 0 0 600 0 0 600 600 600 600 0 0 0 600 0 0 600 600 0 0 600 ]
 endobj
 702 0 obj <<
@@ -5569,7 +5644,7 @@ endobj
 >>
 stream
 xÚíwePœí²-î®ÁNpww‡à>ÀÀ
-h
àà
+h
àà
 ºÃ¡¿ŽpÊ!Õ×®ðŽdÚ�©Û£ˆëIÌå1ñ:–¹M	!LŸ+ÏS·×Ö:çñkÏñù È[œÒ¡±�Tlü+Û¿-ë•øET�×—mÚ<oR[¼Óf0ïw&±½‰2eé²G$QnXß´gÕíÂ_ÙM0¿³­Ë]ûÛv¢�^íH•%Ü’(ª»Mðîïp[¸x³ŒÎ¶imæéú‡¿ë'
Ú„ÔEÛ¬Ó]ö~!�þãømý­g­Rj$¸¤g2¤’Ä¿ïßæ�BýôQ2í¡8¹�ò*Ö!rEºg²Y颺.€ú¡Yœày¢f°‚mÆ™¹@aæ�t˺—�X[Y¶˦’åA$o,çí„Ùš”ÜÝU—w3&´|!|—
Ã8¸XÁ⨡	
 µÚ4‹î§AmëÁ$‘u]žœ¢¤é{þé
o)¯v­zÞ·þ°ŠÇ~”0†S¶_EÑä¿XA^Àe#Ì”ŒCš¹þv৭
 ýƒ¹`Z¤†.,¡®Çsõ*haç"¿ñíéâ2üE2î$ÏOt:Š«
ŸÛ¨C™`öQÄ–ìëñçO¤¶"æ$:lþa8§}îsž©j“vå°yD±^¦ã z—FŽÝ†ˆ©DÏ®Bcvg�Ö5XØwχ,Ðiu–ŸòD~i|Ó²DR8T‘ð³ý@(åÚþ{7ŽvŽa±�Ñz]|vJUånÖ7ý°z -’„Q¡¨o�3mïønò¶ÿõò"±ë«Ä(,XF�µÞ.¸�qK0I4îÇîÄ{¾4{_(ÓLéfÉIˆ*aGÏ]¬]¬jaáv…õªø²!�]J
@@ -5604,23 +5679,23 @@ B–y´S,¯K.Œ¾ÄJ�'7Z¤Ýiõ•®G@QÀn•?—‰†Í_#ppÚ“úëslg°ˆ!PB0ŽÇ0!)ô	j«ïY:FŒ›|ƒY
 GŽ—z�¥YƹQëкtšI–X˜‡1·Ee#§r}›áŸz±g˜$>ÈÕ­&)׬H1ì¶SdrvëOËx0P(îée¬-ÒM`¢!03ðÜW‰M^®#Yâ
 .„²5ÚþÈÖñ^ž/|†Saï½	ô»ØIvê
 Ý»ê}­€‘D=Tÿéâö·½‡žëÑG]#ÂâuöñçP2ÀÂ,
-ï:/ÿ©Aàéžµ@vô®ž å—þA·žÈFàQ=á'ê²_Z»ÔÙÄη+YS1¹Êƒ”ÞTRcÖì`Q�œú�}V›v1g1�ÒŒŠ$|OIq
@Ýsêç?ú¾óã°!¾,»Ö.qðŠ×þeËŠ”l~a;$gõ…<¾9K„‹DüÆ©8®À¶IÁI3ýSÈ�±$FïßûBßP5åqÏ' KÇ|µˆ€€
‰¥ÿî`Ëf_>´«Í@MãSì7nDAðù�g·u{<úzoáiC&‘RÊVçÇTA¿
Wb-Î�ŸØ]2PÉ™Ð.8ÙËÍÙ.ò¯j|ƒz�]÷ÞkZlü!½989Ÿðd¶aw¨É¾ ŽµQ
1ŸŒ¸9ŸTv2@&*•šíùAùÿÿOX€�fήŽöfÎv(ÿgbjendstream
+ï:/ÿ©Aàéžµ@vô®ž å—þA·žÈFàQ=á'ê²_Z»ÔÙÄη+YS1¹Êƒ”ÞTRcÖì`Q�œú�}V›v1g1�ÒŒŠ$|OIq
@Ýsêç?ú¾óã°!¾,»Ö.qðŠ×þeËŠ”l~a;$gõ…<¾9K„‹DüÆ©8®À¶IÁI3ýSÈ�±$FïßûBßP5åqÏ' KÇ|µˆ€€
‰¥ÿî`Ëf_>´«Í@MãSì7nDAðù�g·u{<úzoáiC&‘RÊVçÇTA¿
Wb-Î�ŸØ]2PÉ™Ð.8ÙËÍÙ.ò¯j|ƒz�]÷ÞkZlü!½989Ÿðd¶aw¨É¾ ŽµQ
1ŸŒ¸9ŸTv2@&*•šíùAùÿÿOX€�fήŽöfÎv(ÿûŠbLendstream
 endobj
 703 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 40
 /LastChar 122
-/Widths 1343 0 R
-/BaseFont /RKTXHV+NimbusMonL-ReguObli
+/Widths 1351 0 R
+/BaseFont /ANMOJT+NimbusMonL-ReguObli
 /FontDescriptor 701 0 R
 >> endobj
 701 0 obj <<
 /Ascent 625
 /CapHeight 557
 /Descent -147
-/FontName /RKTXHV+NimbusMonL-ReguObli
+/FontName /ANMOJT+NimbusMonL-ReguObli
 /ItalicAngle -12
 /StemV 43
 /XHeight 426
@@ -5629,7 +5704,7 @@ endobj
 /CharSet (/parenleft/parenright/hyphen/a/c/d/e/f/g/h/i/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z)
 /FontFile 702 0 R
 >> endobj
-1343 0 obj
+1351 0 obj
 [600 600 0 0 0 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 0 600 600 600 600 600 600 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 ]
 endobj
 633 0 obj <<
@@ -5642,7 +5717,7 @@ endobj
 stream
 xÚí¹UT¤]“%Œ»kቻ;îîîNâZ¸»»;…»»»;…»Z¸ÃÔûõt÷¬ž¹šé«ýy“ω±#Nì8çY¹’œXQ…^ÈÔÞØLÜÞÎ…ž™�‰ ¦¬¡hdccd
 ´—¥W¶·5ü5³Ã‘“‹8™¹
-rp²ÿëaûûK¦hïìâlâtp
üͪ(*þouºX¹ü“ÛøØ›ÿõ4µ7qýgKÿÂþÒüE]Œ€vÎ
+rp²ÿëaûûK¦hïìâlâtp
üͪ(*þouºX¹ü“ÛøØ›ÿõ4µ7qýgKÿÂþÒüE]Œ€vÎ
 ±ªVõ¶ý^Nc_ñõiÜ�¬æ§•Q¿ÑŠÔ+«ñïP�Y
ŸÌôZ#Ûõ½¼6SºßS7Cç0ÂþD¶X>ªO¯Æ¶aÕl¾JüÁøÒŠuwßùöüh¨ÁŽ7n-	ª}»›ËÏì¯ò[ùwµ gïèÕËä‡× †¸ºŽïÛ­�IZR
» ˜Yâu#1¯›t,’‹¤×CMMW•M�¬îÓ–$�IÁ]•Ð}}™ß×(+�X{—üÓHï=s]Ô�½í<›Øáb57U
‘Ct¸¹# ¹@
²KCúFúØì¸5Ö0ë
 ƒŽÊ©ˆtÝÊNõ‹æíùu§TþÝ4F¯ä‚™ϸý§:Ù0Ìîz2.‡8Á¤¥"ð�@b¹ð:Í(o`Ô¿kM.Z’#ï£2GYŠ
nplwÌÙm݆øf[8³")Ý-Ì>ØÐÀ"¤¹ú,�ï6çš#±VEÿú4Í ÙTÙ	ƒ˜êççX}×¹�F; yhȱ½ýx˜!:Á<œ?-p©yó�>sd³aEG2 ‰iħØä¢_,Ì:ý¡ÒI“
 Èú€èç“.ª¡Ü^ó!Ozü(~”@½ð¤Ê¨JïŽ	÷(ù)I¡É’!Ë[í¿7O’0	™(Öê/Êó#?ŸòtssÕï“wÏgWWÂù;í
@@ -5714,23 +5789,23 @@ PпÜ ¼ST
 ªjDÒG�@œ=ù¢0Vþ23qð8@R‚¢Sx†€ÀˆQšk>Ö˜IÛ»åÆnÕ@ Šœ+7ƒ¥	#xA&
 V°î2»“u=œÕÏ"¨¡
¥}ŨRpÔG0Ò|Ëÿ°Á÷v¯×ã#Ði¹j3ÍTâè(3Z÷†]ö‰6$áHý.ù2rä"Šñ.Q}Œ[ô(~áa¼ô|·g7LÜëèi	GÕzBƒ¤�ìò°ôÉy,<ri5¢Ó<øQ°–"ß@X1páJ9¥œÜ{5ÖXOù!Òâ™DŒŸ-ƒÞÒ{ßî|¥Þ‹|õÈ”…;°ßUÃFrEþ÷÷>£–¢€%ÝÞû.îcäG�3*Ùºr¢ê.ûÝS²Z°¶¯Üi𥰛‰àò"ë8׊Ê[¬oœæiªÈtB!N²Ma3_#”Ö‘3?z25Q«û%Tb÷‹ºðƒS‰\	”Ë`�DðÌø¹Õ"†Ò»K$šù‘ W»P-$Ô"taâ5í.§œi�"2a îÎEg|鞢³‹O-,Œ'²Æ¤ùp|’Ì”‹Ò7rž´­‘€µ‘‹Üä!ðvƒŸÖß0ÕBöy\åqýXkÊ€XƒÆ;my»”(~aŸ›{á|±ob’ØÏÖ­Ùxœ=†¤…` Ö罦(h
ö˜85]‰„C¬…ù×UÎu×ÞÃ4
  ?0
-tâï¯tãq·˜þ?pÿ?Áÿ'LlÌŒœ\ìm�œ¬áþ”Þendstream
+tâï¯tãq·˜þ?pÿ?Áÿ'LlÌŒœ\ìm�œ¬áþÚ%õendstream
 endobj
 634 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 40
 /LastChar 90
-/Widths 1344 0 R
-/BaseFont /XTDQTY+URWPalladioL-Roma-Slant_167
+/Widths 1352 0 R
+/BaseFont /WUTSZX+URWPalladioL-Roma-Slant_167
 /FontDescriptor 632 0 R
 >> endobj
 632 0 obj <<
 /Ascent 715
 /CapHeight 680
 /Descent -282
-/FontName /XTDQTY+URWPalladioL-Roma-Slant_167
+/FontName /WUTSZX+URWPalladioL-Roma-Slant_167
 /ItalicAngle -9
 /StemV 84
 /XHeight 469
@@ -5739,7 +5814,7 @@ endobj
 /CharSet (/parenleft/parenright/period/one/two/three/four/five/six/seven/eight/nine/A/B/C/D/E/F/G/H/I/K/L/M/N/O/P/Q/R/S/T/U/V/X/Y/Z)
 /FontFile 633 0 R
 >> endobj
-1344 0 obj
+1352 0 obj
 [333 333 0 0 0 0 250 0 0 500 500 500 500 500 500 500 500 500 0 0 0 0 0 0 0 778 611 709 774 611 556 763 832 337 0 726 611 946 831 786 604 786 668 525 613 778 722 0 667 667 667 ]
 endobj
 626 0 obj <<
@@ -5755,7 +5830,7 @@ xÚí·ePeݲ%
 øk䀣 u9ƒìlÅŒœ�¼
 ’
 tüWƒ¨ÿ™š¿$ŒLíl­=
-F6àßàï
c�üsÇü¿b�l@Öÿ›èÿ¨
ü7Ãÿˆ´³Ñß6Ûšÿ•‚™‘ùßF�“Èhúälb
03²þÛ£ÙÕlM�ŽÖ [à_-ÿÕF
+F6àßàï
c�üsÇü¿b�l@Öÿ›èÿ¨
ü7Ãÿˆ´³Ñß6Ûšÿ•‚™‘ùßF�“Èhúälb
03²þÛ£ÙÕlM�ŽÖ [à_-ÿÕF
 ñ½¿Ý¡$ý6;›˜ ½S‘F�‡‡9Lq®÷#7ùºÞAæOy�«Æk™¬0\™òã�)àÚŠ¯Põýè_°ÏÈ𸯪+WX½À4�qW%¸3A	pÇ‚yçNјŠhÙFƒ´¼òàH«Qûv¡;±0p•]ßt’~xd,Š‹÷xÂÍ6m$ˆ¤bŽè›a»èýa–Qº ÅZCE{˜Í¸V>$zytg�C¿ Ëûž~^üZ΢ë—'¿4vÌ¢€œQ(߈¼ÚóE$9�>RÛòvJr—Ž!V•�Qê-¦ 
ç]kˆ«#L¹)N[
 Y'L
 Ml%£:Tid„‡
@@ -5800,23 +5875,23 @@ SþÅ•ù°�?UÆh´ÛÆ~‹Ü­³µ´��FŽ̽¨
÷`2�±Í¾ø_ÑÛ¥¥†%º%B\aáPbs�–�’´¯xÛŠÍ�Pßí"2¸'�\sïa
 �--˜TÎÁ?åשּׁ~Ig.äs#IR³1Þdà0säÐl„ë¤)wÜ�ÔC‚5ZêD¡˜A|aK]¾öQŒ)ŠÑ�ßÛ¥fÜ-6wâœÌn¿Ô‘ëZ¬×ñÂe²€KQÊÉ!qäl†ä Ã;¼Â`¯ˆ«Ýjƒ"àFd’(�ñ¹%Ð¥åŸ¤­:ìKÐÙÖ�»ûúj?ã0GLÝå/—�‡ÕsÉmtèŠ7@F.°vš\õ`òƒ_¨à@�ó+ß­'9/þ´îQöñ;*œî~¿ˆ\Ý‚°¥ù
"@Ãw¥>
 �«ñh²°�þ;f&õÏýtYPXÉ(ÄÑ—îÿ*ìRâ͋MI.riAÛ�³eBapX,&L˜”FÄqOÕi/zÌ-JîÙŽX!|½ôÔ{/¥Êl“”2êL¦›$ôéy¶r×òètA3È׸„–MT•˹#“Ÿ_«ê±C˜Ä%3(ØBN®fMݱd[ï0i®§�¬Þe˜nùÃ,2†•�³>Q~Eó“l¤Ñ‡d�¥K
 È	¿X¤ô��	á€S¥M†kh_v.ÊZ°X�Y–×~dŠZ£þq z3„=pÔÍ*SÈá£�.rYÎ8xz¡ªm:è«íƒÂfkl®õ3V°yÇݪ"|pA´q+K¯ìñÄ5ÄÆòX”ñ3³S“K¸8”Xgúy6VœOÉÒÀn‹|@aµ»§Õÿþ\1-óò$jô½·Yâ6I�ÞåQˆÿ¨Û.†î†!ÿ"	Žíë½#kÒŸ@nüšÂ.MV5âÒžpɾT	“L$*jsK�€kU3P"¢÷ÇÇ‚“\e,Ѷ™ßUeÅATIˆ
¼Š#DRÏãþfž‡ïDŒ4ùä;¬«"_u´©+E¸8å´•È.
a«MçeÉ™¸m»ÝbîBß_S¨�—,ò5žL(Áœ½¼«lè„OÞÐë³,­ÜV"éˆeÛæÅ—¶‡~,¡¸ŸÆü€¾µ¦gq8¿¯Z‹—Å}á/Å'laÿ†SÙq³t‡º¶^H·âœNwÌútaES<hpFEž u‹F,p?º°8*ü²z"¼ñ…>«¬¾lfœêð~,¯±Ni`—…Ï�gCž@2|§ãÓ>ú6.ûW˜ï>µ½Ø“M¿+Ÿ
$g;µÆñGïÞ—Æ
øE×®Ú§qkERãÒÆc{…ŽZ²ÊZd;_Pº·t‡Èû/QOûIàÏg»�–�%E:)‰7‰‹zz÷Ÿt¸ZúŠ
-É9û×ÖN¨Ó©Þ¶Gn‚‰å”÷,Œó¹ñ:Ÿ5Å=©x¹=Z©¥…»Qò‚Gc]qŒð_¿³�—«º'í(åDZþ´î€J®­‚Iç'«_ßÂ:ŸÇHjDõlÝå„,©qØ`G¾¬†\È@éø¦‚œ—éܪðX¢ÈQ<Ñi8ºÄ|#ñ°Åò­õ›O(m£mŸ8½7¸r¯já—"Tày¨
Zì|AúßPqéí
[ÈÃù3Vìlî¾
™
VÉlb¼¤.ÛžF
ûoŸJ�¶ô
+É9û×ÖN¨Ó©Þ¶Gn‚‰å”÷,Œó¹ñ:Ÿ5Å=©x¹=Z©¥…»Qò‚Gc]qŒð_¿³�—«º'í(åDZþ´î€J®­‚Iç'«_ßÂ:ŸÇHjDõlÝå„,©qØ`G¾¬†\È@éø¦‚œ—éܪðX¢ÈQ<Ñi8ºÄ|#ñ°Åò­õ›O(m£mŸ8½7¸r¯já—"Tày¨
Zì|AúßPqéí
[ÈÃù3Vìlî¾
™
VÉlb¼¤.ÛžF
ûoŸJ�¶ô
 endobj
 627 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 34
 /LastChar 125
-/Widths 1345 0 R
-/BaseFont /EGFRJS+NimbusMonL-Bold
+/Widths 1353 0 R
+/BaseFont /JZJOBS+NimbusMonL-Bold
 /FontDescriptor 625 0 R
 >> endobj
 625 0 obj <<
 /Ascent 624
 /CapHeight 552
 /Descent -126
-/FontName /EGFRJS+NimbusMonL-Bold
+/FontName /JZJOBS+NimbusMonL-Bold
 /ItalicAngle 0
 /StemV 101
 /XHeight 439
@@ -5825,122 +5900,118 @@ endobj
 /CharSet (/quotedbl/hyphen/period/slash/zero/one/two/five/six/seven/eight/semicolon/A/B/E/F/G/H/K/M/N/O/R/S/T/W/Z/bracketleft/bracketright/a/b/c/d/e/f/g/h/i/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright)
 /FontFile 626 0 R
 >> endobj
-1345 0 obj
+1353 0 obj
 [600 0 0 0 0 0 0 0 0 0 0 600 600 600 600 600 600 0 0 600 600 600 600 0 0 600 0 0 0 0 0 600 600 0 0 600 600 600 600 0 0 600 0 600 600 600 0 0 600 600 600 0 0 600 0 0 600 600 0 600 0 0 0 600 600 600 600 600 600 600 600 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 ]
 endobj
 623 0 obj <<
 /Length1 1612
-/Length2 18185
+/Length2 18545
 /Length3 532
-/Length 19104     
+/Length 19457     
 /Filter /FlateDecode
 >>
 stream
-xÚ¬·eT^ÝÒ%Š» øƒ»www÷÷w‚»»w‚»»w‚ww½yÏéî¯Ç¹}ÿôý~ì1öªª5kVÍZkìMA¢¤Ê læ`”p°wa`adæ
(XÙ™¸‚äìåT€®€¿Fv
-
-Qg ±‹•ƒ½˜±� 	4ˆ
M
¬¬
-€¨ƒ£§³•…¥€Z]E“†ŽŽþ¿,ÿ„
-ähkìù7÷_0Gg«ÑpYÙ[üz€3ÐÂØÙÌý…ù‹ýOwþ«NÀÿV½±££­ç¿v;ü+êq°r

mÍXXÿæ4uù›ÛÂÊ�éŸA‘¶7w
-$aå
4S²r1µ˜ÛþíÔ¿ìêöf@g[+{à_EÿÕL
-pÊÅÔQ¯ôŽ �ÉhB¿n¿ü Öìö6È£ Ç#�´“{Q²È_³o—{K†ÎhäK’w–jÝ«Ò¾š›ŠâNšâžýñ¹îJ!Âák"øÔ3cC4�[O4|qEÝ
-÷®µûIûÒ‡òc~dZ¹³´Þ½f�‚™a$µ
-E´ÕD᥷,"k	|+Ë	·�K|XÐ4áïè�µ©9•3û¡ï\›õU‰ñ¤9ì븉£Ð¸ñZlà—ÜpPÓ•ŽÂ„Yñ©²g‡ßE”[?>yB¹ÜK”–.buúSc©zg‹Ü¼Úcòhwqj›%þbpŽ8¹wR8y<
-¶É|öx˜îçÉÀa¦Ç¦=Fzåq ×q¨ë 6)ÂÌ|!0à‚‰§"ŸÜVØN«hˆ©ƒ²â¶ùQë[M,Oy*ILM±ÓëÈø*ÊTv8_ v´AhÇ*‚^ƒ=;ÃÞxÞÓ<©¿ó´Í«î¸Íó0
-¤Š˜B_g&î­çxL¢±rd´«	Þ’ÄÅ\�I¡?YÔLÆ$ë
hø0¸á´ðæ�(#©Í/’ëII*É/%Ž`åÍÞMJ͘]£í…ø
½Í,Ž
-jýÊDAD›oʺ´ÆdüË”zj.�ÃZ8^KïJ9xí–j-`Ûcõ1Î�zÉÀ¨cw]Û
¶mžÇ£HB²‘¼{™™Û
-Ç¡¢ßÇ
-Ÿ¯‚T¾ÒK©M^
o…Å+e‡»kñ'æj BÔÌ[ÒôÁÓùGv¬Åië'�fMçÜÔ­µ¦4/íûOÂeu÷yIýC‹F~Œ—hYÇiJÚ«�ÞtB$HÎDÈ89ÆÞ¾J»Æ1.rÑ©¾j‡~Žïb
-@ì
œËîÙ‘SÊÞW4^vF­ñ Å›`ã¢Q–wëÙdæÍ_DqWÕFv´±.ä	¦xû˜e5eËl!•�ð_�Ü)_öSNðâ+¿CUFøØ‘P²I'�£X}Õƒ›
žR1^T{o£Ù5O§ÁX?—2ïL @Ë­²&µ”UD­¿|ïÊD 2z3ôx!ìn\Ó„ó>4¥ž;Txé)7xr>o�m&äØœq$�#z“T·²ŽË	&QQ2_`ôÍbo~kh̾Õòœù
-B�1â+$ê .7f˜Ïv󎋸ì\¦ÞòÖÌ&†±Ê½€‚q9ÝS…ÆyðX¤¨«•IÝÜûz®üa=‘-Éc'µ<?†�á¯ôü•Èõ\â;†Kgœ‘á
“[Ÿî12+ç;†dÕˆ3ñ¼n
-þSÙR÷ex±$z¹„Äg\Ïpuã÷[áÅYUEãÓœGÆÝ}À¼;LÅ•\tUÇ’Óâ3íAà’àÙ:Æ‚¸©ØÞàµ�#.ùz]^¡¯¦ÔT¼½	OB¥Ì%KoÉÍd1Ø»
[Mq	7u¨£<“KRÀ1¥j-²Ÿ”Lx�Ô;Î'Š¬ŽºbîU^¤óÛ§Uq72q€yОô‡r2-î@˜­<š=Ñ×¹îåIÁ/³íõ<W| {‰/‰-´é61¼­»ªv	?è,TÐŽÊ„=ŋȱڎ+xöFáµÇ5kû`ŒªTæ+–¹lb³Š}Ö¬ü‡ÚÎlËZ´„-½#¸HаyÈ%;¾Š™ï#ÏEl�0w\ôð䊫¥Í‚a ÜÓ\·ÜQH\?§ÀÞ5N¿8VVÈ&E\Nw?¬‰â|˜Wú³l?ÑÛùÏÂcwæ.�LÀëojÐ	s„†å^¡£~ÁwŽº:�eÕš,A’¿>3éSúÔ»&ŒvÊô«Òî¯ÓkQÓðêF¬6}»	Š�„üíÞÈÕ¼û£í>d	;ˆ›¶j¨š)æñ1š}16§¢rzsµ™
-ðóOÈÌ€ºö3ÊòsFdÐàÏêþÀöïÎtº[ëqõŒQ v$yÖÙbw
-_Õ'ÙW/t¥)³Bkl@ÒuoY‘$�žÆ�ybP¤ÉˆÑinµdè—ô{Uþ6ÕËôÁ½¸ðLǼ«‰ð¯™ÄmÐFZ¯Ôçt5ìÁÉjqTW�eec±²¯�nB=´ŽÚÍkV7�pê¬I�Äu=ø€}~	µ}–ò%UUz&�á꬯ræ^…+"£‹8ízƶ õìù4Þ‡ºq’ÎŽqÈêA1jäáŠU ÂAi<)釭“ïÓÉ3ëÂSU#ìœdÅçsÄò17ÛbÉøÙ÷5°®;ºì’L•z]õ»ð…)}
-3_^‡¶š. ’‚…)ÉçŠá£�ùbK�§„pNšÿ
-9’þ!î8IÑ›C	r-ÿs[{�œP–óe›&~b«I¨/÷­cG@X«â}Q%´ÚkV{=¼{<IÛÙ
-Ú?q�Ÿ6B˜zÐÓ�jõDqÍë`ãçy3:*íHAvfÉF ênÐMêŠ]T€w1FUe/»ª|¯S¥ç‘äÉçÐV?�—x¤ ¦D7&é¦F!Ò%cqdK�ÚsYÒëÉå-ÊYÞ}Ӈђ,øQ´Û¯Àú—m-ßµ†O6}—í¬pùÝ<ý)Ûb²Ï�àš#*yp,só0ƒÅÞxU€f\±µrü¶…5j«÷WmºÍåV†¯Q²Ÿ4®¾ü™^
7½Ä˜o‡g¨ÓŸDÙÑ—æ!ÎÓI_'üx벉—gŒY…-µ}";}xí
{”l½ÓˆÆ"Ä(ЯNÞ¨(i@M‘{0ûPåø›E¹b‹ñºÛÂeûà¸ý·²·Šâ9§O½P²Ù�
Ç«›®§Ã³Øn¢ÍMÉ´šöÀ 1ÕʪgIÃý…ýó’\îKÊ·ƒBætÞ¬0Ö’Bë13ѽSÝü§žsõ‰™0ñUU¢��H§:ÁV8§Þ¥�(#>H÷0ü	"ahâx‘[Z0EvøæzÍÀ¯	qi#Q&û¬i$€?Á^,rP-j&b’ŠÊ‚q	Ø•¡1à03œÏÞ7ñbäzI¬|�â·Öß­G÷?ï=�´�÷B�`�Øm€ŸDÇ6}0i:ÆeÃùUpgŒ-}-§¼~`[ç=BbW;’«š)FâuÆ,D9ýÂ4Z�ÅæÈúü±ËêŠ_5¾ó¥£74�ª™ö4M¯w#íç�NW51ª-?îÅò†Ÿ£�+ߎ!±iëêxÐIUñôvdBYB½‰”×
-,°ãzy—øg;Šy¹}ÂÿÌø±UûF¥’­k'Ú¤#È3¾^*
-•W½Š
�1W\ÁMÞ7ì’)Ò”Èã=ß�›¥Ùµ·`º¬e
 ŠAÿú‡g¬µ¥ê˜'(¯Æ¨¼H¿
V€zà´
-R*F/qY ¶Ã÷¼ö"A±yjat�_ȧÅfTEJ}�Œ;íUý�Êe„s—Dà¾Átµ
-Lþ#ú%L4VWm.„½dlŒ‡`uÜ~¬;K|ì�Wwºˆ¿B¢ýàqŸ�ÉL,Õà¹ê2âÛDOä¤Ï…ŠªÜï?FôÅ6ɘª$37T:΄M”Ü|û*FÄ‹#b
Î-Âç{ýÛ…#CˆÂmbË:V÷Ê`ÏMFSNó|N2y]"cPiY
-w.LKuûzrsàv� YõLk�ôÊx¼Í!	ðgÞzW	7)QâM¦°Ü8i�¥ÔaëJn’Óó�Ì
-<à°ƒ>LUÆ4 ¤�f�pÚZ6½M®�'{6üÝ
ühÎv¾sñ–7`ô>â�'Ec©ËçÔ8�Œ)ŒvND–·;Ó1µ¬Ðô«€1 lœiL‡?FßÞìj`ŒÓ/DX*›úMH•|ª¶xíK:"ñ�œœ†ýúH™J$¾‘ËV­d|¼’{‡äZ©¬ÐðSÿ;Ü®Ý9îÒc)»âÁ|Qžn^KLæBuîû¬£Òî–“0ü,¤Ðï‚›¹Ÿ�òJÍ^½¬}	ÁÅL"wEV+*…–:óohåZ—àøÛ;Òl„Éñ£½zŸY åŒ¼«}Ñ¡ç–‰¨O†xBùQŽºÏÅ*‡Ö<nWw"¬�&ˆD^ªEÑ׶!‚‹oû@bô¤V–‰µÌ‚u‰æ„s¹ž5[èµÒ¸¼ÇM×æÉÛÉêTþTÙ#±¤ãlÑXÄqÂûÁìرl=þûôÁ<Ȳ˜ý! ²ÇŽákz:¹o~·ƒÛŠ>+µ÷—¯žX"þ�›B©Oi¬a
-«UìúªAŒßDÌü(Ç€5QR«ÒÛ™^ý-5vò×Ëb„º`§[î¢JÎêKÛm-o“%Saã¿sáÐÿÞZÃö¡�|œ^ŠþÊã9ŒR´k%¨X³i‰ºpó›å�ö	WÌXÈô‘›¦£5~ôHá(•VnWï�ç½~ÎÙ…Cî�_Fh6“ŠüУD;0OW~½	¥0^wyr÷Oü­U>?ò»ÌICÔ„üôjC{p“tÿÐôDIåö­Q‚—ê!J¹iBÒ
”„–—0)òÊ4w}QjL!=;Îi5”§Ìô>%÷³|jÊ)ÍY%Úß}Vñvï‰
!sfƒÁñ½ý�ÐùDÒ�-(œOw™	ÆöúèÞ]m(ïâ<଩ªeÝ_ ~k§~¤ùLÇGxø_w™£×B‹'ØÁT“íY2%‚ÏÔG@ßçRÏ;üݶ²“¥4ÔŠ/he_q
-.6Š¯AýoÆ�%ßð‘+�‘©gœˆÀÛ²ØÅ4%f­æËP1
-½ÉA=Å
-	sE]©‰`ò6™=>î8é%ÂÐs>N´žô08òî~ÿµûcUð¤¾Á.5Æ��Ä*¬ó8/¤zWt÷
-}r/öewÿ¬É¶וqk鿾ä**'âqùypaˆ'-K?¯ÙÀ–ƒÁØwMA»+²ÒA)u…uô1¬Ÿn…0ĉ»)¾TZ•§^ÐõbØJVíbsÑ`®¢•óäµ>–`$I(�qÌø÷Ï¥CÍÝbÊ¥§Å.öBŽð¶/Ø×™Õ¢ß(²-aþ
-¹—¥Ž²*?ŒO,âîN¿$Ý#
-�Û{Í6˜«¾·í'ÍÇ°8ÿšŠèK�Oå¬eŠ3«Ñ
�[s …¡Áà<‰–Ï´œt`Húýëu¯ÜØÊ�_kŠ	Ñaöç{­²\óJ$¢ÀmáþùKÒÁ†×~×ïâ¬H,ã§d.ý‘Þê÷ÉË%ú¤™s Öµû+uJõšÐÓ@×^#;¸�r„
TÔ…šÝ¸?†sˆ«2ã`ñ
-J½Èðo˜Ðæy‰‚áˆÛ¡9dõváïv¸ü:²Ã¾ÊISc…öQ1}¤u¢Ш¤×©õ©º¾Ô,#mõp<>ÞGìa
F™c›ßß*
‚¿ØÁVÙh4gÅçÃj·¥FÂtšöÞ‰á¿+ÑÚ0§Ï~Ì»ž&±k²àæ‘éoÌø–Öæ(?ÝãäjÍÞè)Ü�æ!,^š
-Îj�ªN§Ì‚¡êZ/(âiÓiÍmáú‡�E´r•¿Þ`]©	«Ô†-UuܼMøIA
ÔæDr)|ò¥9Zvw¢¾2lÕÈ¥⨡gÍfs2ë�éÅV|gÐØìÓo³’›ÌŠÎ}Žk:åw�éf—FÞ´{çªÙÂ@Vžf#ÙU�Þúµ¬Šˆj+�·[i!ÊÁG1-¶5\{”ôã0Ò­…ü¦ôÝÖæêëùd”­Hæ Ò	·)Õjëy#�ñj5¸ôŸ’LÒèÎQÚA�£ug㞥iE7^å‰òæØo¡Hã…B€úÙÚë¥éëуk’)Iï>Á2CeN£©e¾hwLñ‹WI$5>íU£n2úé�+çLR'CßF¾]¬¼ÍªŽ”ùÀø¸
-ÓÇr„>›jì‚é‰é‡f´¸ñ°ëí
–Í„Z‰uk&0¯NRÒXÃã'c¤­û~­?…ÖÛ½2q´ûº7E)‡þ¸ÖjƒéÞ$YêƒkÕ”	—äJAŸM)9€ÅíñÍ jd.ÇöÓ>±8‘~« kÏP¬ío­ÎP‚»+læY"áñ·8pó
-”±v“²Žk@9â¡i"›¾8üäs5q|±µ¸ ,´£êú5X_Ǹò õA²‹‘ŠâðpøQÛ+é[¢ëù³ªüÈqêõBo�>�‘îðŽ„©u§¼�^ F¹èó«z[(�<J…3Öoòˆ®v‹Þž(0YN3£ÂcçÍ‹Ç'fG$’:“eww
Ë6A¥8ƒÿâ%ÿµLöî�T‘
-›½6(t(³rM¯ÆpŽ®Kg�EMIúbëv%6bKA,ôI0ü!Ð=ÃNîÐyjÚÇ:`¼‰ŽêÀYS§ýKñ[ýêþ˸ƒG6°Éðáu_ŒÔ &DI�{ÚÛú�Eƒ™º%É“€Óäê+žiàÄ|FÉ^u˜æÒ¨ú	((T!wì­;/A
-~_Êó-’wûH�`ŠÛ
-36ë�ánˆQyÖ‹ëôrˆû}¡ÓeG;ž[äRÂtCHó,5[ô‡p}sÍÝé†áV(VŽïeXöDò�õ(DðOèR~ëCž ~gGòiڽ߾_‰¦:·™×ûŠÈ÷—¿ºéö¨ßĶ•`ìýìëñöÂBÅëׄ€G)zŠ;¥1­ò·ò|–†ŒYëÏég$ôI)wËäVbY©V Õ>]Ú&øK<ä„æpðW+xO*c.SÒa”}“œ‘þþF)J~)m‚P^1Þk Tù1¿{_ ];‰‘5¨Sù‹Üâã�ãjð[â™cûMË·têÌ!ªpÓzSª3y<0âß-iÔ|ò–œ%_oU°~7¥XíÎ,ÊÇÂ�Úv�S_}Ü]LçŽ°½¿zÈ=®ûêšmjæj³'ø‰²•ždZí|ø.²$Õ@=‰ùå–ˆÌw
-ØÚÝ®-ñX¿?¾‘}ÑEµÞÄ)¦…‡!Ö†Žü™³&Âù-èo.‰ånUbÒHV›rjúx¥ÒP´^1,´àõd%%3ƽ.|<Ô�çgÓI˜Û+<§0ƒ5ÛVЗu™¨¡t?ÿ2ö‡Qü!‰@ú,cq!e¸èX:¿6°^ŠÌ¹¾e%eG&Ù&4.³Ž{[Š8u^Þ¼ÿcÉöI¬1¾‰Sã+�&wTwe®Fa…ÿJC`‡üjtË ¦zÄétø·^â¹ãX
­.mP®ÆÏ°àòÑ×IÓÎ�$þq[M¥%;fH)Þ&•Ž7¥fjúV�½Iо�2K0^AloH€k9Ùõ.œZÀȻ褴{¤?\„*&¥¢Ñ¡cò�#{Ä�uÈsuÑ`©Ïœø‰3£¼iÉÓ®™CÁÀ¥³o[;Š
,mÍ1é?)r·ä£_0žžž~M¦ÔD�þò�ŒoP"XúI‚ø<ªŽÄš¶•4Qr±Ñ—YW7¯�Zä*Ÿ?5T†¸EÉ¥+�ÓÙV%Ù@ØdÅeÑ-M7êë®D¾¾$ÁÿE_h/Sìžul<8E¢]'0JüzzÌj:йf\ÖÐøpu”V!ùäT?î—ûò!Öî)êaäùÁîÇát3{íüÐþI»äÙ3¥eµ{^l&vãIÊ>Á«£v“ÖýÃ^–¾M_.@«˜*Æ€áM*DJwˆ}¯8þ”I»A¼¥Aî;­Ü(áT¢#¾¥.��ª\bÌJ±¬ô‰d"7NÅ8뿹÷³…ìE$m_8Tâoݨ±ZvQÆ&MŸˆ6cqlê›NU°¸}™µ¥+H§ýðŒxH�Ä„GJ¤JT…Ýξ©Ml}@=ÁV&rP‰’Ë™bäN_Ê-€}�xŠñYpèŸÔEWÇ
8í]eE³-d�
mÏhC†ýÛj=ÿè(3
®–>é¦K #N
-Ópà>¼àèÉL¦!JÂ|?$°Ë h‘`G0oä´ÖÈ9Èý•í¢o†yI€û¥œ^i0+V+z¾'0óT*))ôòzßy�ׄfË£R>•
-ßìàÝ'­³ÝBû¢ÉEyc;8ÂVl®?'Å|T¼GÒp´˜´eååD×Ò÷4îˆ-JG‚…L†ëAù¦ÌáUe~­æŸwƉÙ”4Ønf‡ª×&‚êÚ‰„ÑÌ	Ó4m!Dbô£û
¡šX𰚴߃¨E¼½Çü²ƒ1PVQycáÿü`J�¼°i¾"ïSZ¢î`ƒ|LðBú•Q¥f°ZæØ2o¿
;ø�éžK•½x8ÊÙ_v6^¥5R{C0ã&¨Sæ§,Y�Ht=­z!§­:|aÿ�°JüÅá�
-¤òøïlÑ×ù>Tq­@»È:…~Öõ2Ry”ά­Ù÷A”µs¿oÍ8¿™Õ)w€C
pÜÓt“ûηwÉÜQáÄè-Äl)á
ŒyO7¥væÏö±0âª2/‰O–ßù†ô¥¢–¿¹dÕ…*\Vȉ\‰H*´Ëœ‡Ã‰D²¿™9\
Qš‘ƒÖ碴�›ö¶MÚ[éÓ�umMU[ú©î²Þ~
p:LDË~bŒãŽ¦²§OäYC餤2¼¡böC„í¡ÑÐçYT9´Å3Wx«Žbhø“79ˆˆ"x|:ø€ØàO7—_Ö ×´
-/9mö'z´H¤ò «xMö+­qÊ×C15{‡)äxŽ!£/ñó�kÅPºÜ_Rá�ÖÝ�ÁÉMYTA?¢-=?ƉPßó{¥¸DZÕmëM9Ä+1¾´Æêõw0û,š£D›BhL‡T)ó˜Öº’wMŠ»pê/æp…;ÙuË×q(*È¡âµÁàÙòyÃEË#	Càž4°Bíø"pèT^Óèœt¤©§²«TãÃI;†ö–à“5ö…	•8?¨�Puãgs¶yXOt7ï€Þ’tÙåñÅ&%�l‹Ç{õÅOІ”óù²”®'Ø9ðùW#Rã¥�V+SlF¡zEi�¡8š¨é¦v�F"qIø|ÒpÜ7:O•ZöN›Wö¤R1O´
±ÂA—Š˜òÃr»U>µvXW^Ë9·ô"d‚õe›Ö‚´®–ÎWO+©��ÃU1{´–à/íw¶[¯ìKô¤Ú”ªÛ&¤�ñnœ7úv_˜n
rŠæ+¦”Þæb"éÆg6Ï“öÝñ¬Kà-'Fšá£K·šès§ñ¥7x\,S¥¦1ERÍçŠ}-j9V®ùu©‰I÷�ÝßDó¦!=dt·PìKÆg(ÿ€þF‚%'ɤ^»WñŽI÷´¢ÂÓV"	áÁu»¦T
­	ný‚kpqƒOr“\é*9Õé=–ø»}ô”ÔÈ…jÝâ3Ö×»"›`~Ÿ®u àÙÇä�¿¶ICNè1ÌÂT8¡'Ž–¯½Ú–äæŒ`ê§ùNj“[–ÁÉ0Ããgá÷IJ6†RÒ-;8sµ±�x‘?¶Jœ
Lü¾�°ß
-`ž·»IÃ^6ìì F!Z§éý&Ø­Ï:6’—(ü²6ÙŠ¯pÖól’²^Zgié^íèéÓ_ÉfñýI lnŒ´«ˆ7T^®O¦–ÝX7Bˆ|ý.k¯cò®õ
-5,	u\âuºS˜©G
-¦3\磈[°élµ(G
Ïã©Sø#Bgñyn©>³}?źæ9gœ©¬‹Ýªµ;Vö¦PìöîxÀÓŒw.éWÕØrÅEYÞS&¶p;N~銤€4·§jòN
-|ÓØÍ	Q
Þl�£
-çK±le‡MD¥ú¦—ƒG!úÇu5Wå’,:µöùÒ�Ék6ßx
%LÑ·'ëœt/ÄCçäœ�¿râ!•Ò-Á—:–ío£3mg±F�8E<>pÂkÜâHn[yÖ€‚Œ=«zÅÙ©êg=:�$bÛ&°§Œ.

-3•˜pÑܲWö‡0ÃüÂÌì£VäZÏ^„Ì΄|¸œ�Å¡§` ô/_ò,fwµ«�¿]îÄ·ú…àüû0 ¶pc9쮶�|Ú[5ðX*Œ‘tUJ¯¶Í�kÖć¾ob–3ÎYEÎ{Çç¼	‹†ã„7ÉtíX¥0ÕŽmÐÂxÕ†ö÷Ó	Ü¢Â[Ö7`ÌC¬³i¯Ù‰Úµ�
-ÏY‹}ÿà¯ÈCÚ5¢8¥>$Þ uh©@[ÿ8­•®êLíjûÐþîbømWò,_ÁÿöÜ×·•&#û%k_º¥êÏ©–$¶6Ôcä®Ä“ÊQ†)w€aÐ)üÖ–èóŃ5:•°Hf(NÙva‚ð/byÒó
é|ýï'§°˜ýæLyk¦ÅÌßô4M(2™Ë:ó"÷–D&› ©š‘½Ù}~e&œòU•[Ö4É‚92åôBG(¬2ÁÙ;°4¸‚Jp¶66Óž¹X¨Ã�€Un[кCaÐNdÆ4£ËüÇI”¬~fä½\¤†øö×æxò¥ÞÓñb,Šó7:ܘ�‚Î/ó„¤ÉÁ�:_¸|hfp”ëÞO³ÿ~î:
·�·Gû_<–âé䧷—Rr”¿œ 'æ+Ð8ÿZ</$ò=ĸUoßèz©lZÏl®êÁ‡-iÁ*Á«s+�ið÷>"ÖÕ+À¾Fz‘@\æCȃyèȹì ïŠd[…=ßõCÓb ®™Ø@<¸ºñ;*Í’Ug ›.h"+DÜýJ
-¿®îÁùª]=þð>+û§ tEŒ%üQ8v$
3 ;øüñÍ¡0 Ÿ(%ã¨ÑóGßõ#~ˆ?ef ò½Óù=EoGKñ�=™
-¥Bõ&ä"ÝûipÈ[9l{6¨C˜•*ݳ¸
-é&»ÜÂoø0]þS*(:‚‰Îüí'mn¡ÝòÕWnÉ
|Ur²30£à¼Ä¡tI•ßö›m0l×o§©QLÔR,óècʳ‰/Õ>‡QÉcöYU�Ûãw‰à;•žöz µ½Ží›'çð¿}
©Ÿa8Œò’ŠPQß‘·Ïý4‡Bឧ5nD'­7ÜmݹJÅ«¬Ä¦9cìa„à^”T
P)¯ÍNÊê!¶k*H{RwÃ!-
-“jÿQ$6]ÂÎ׻،õU…ÙI´Ú ÑLÌÎQEÒýwu’å OËôiwïèc¨ä<^_®•XÌx÷ñoù6âZiÿMmþ†Ÿùå”áƒ_³ÇšÐ~8¬ëÊ	eSœb�DƒüÄ¡ð»<¦Ý„¡´ï‹ö|·Û"#ŠR:¨¸�ŠŠ´`•HÞ:ë×(¤
=ô!üˆ ímpéçö+ÂzL!â<èÚ¬bÐJÑ8¸NŽPÝ8û‚aðŽ
-5{V¼ƒëÁ¤}bªyñEg(+TÍúïA/ö1å Œrâ-ôeÅø<¨YÄ&ú²:¶j´Õ@ß$Å
[?z®
²ÇáÅ9í)DÖa{t:7¾"eÑÜØ¥¬î|<ü‚,þ$²©î»ÜÏv,�’"?Ç1èÀ3J."Ì|ý‰ÖO>�ü4?m$¨¾™Òêb	‘­åàV¥— ž¯v_¶ÞQÞºÙ,�‹y›Lñ2™¶b‰‘´}�•VõÆÞÁFBv•¹ý&ò!‡U„Y&ÿV#ŽØ_ €Ús.
-ZËNêj̹ØÂF‚ÍÍSxG\â½»¥]!(Qq#–î	\zË÷šéB4ŸDö3zëCY»lÁ­«z›b%J
}?LDªEÊOÇŽÌ0ÀÙjöDöí¶Dx×›ïí­|moÇÇüAjy˜/QÚ0ÊEÔÓùv›¶ß¼É…¨G|×個ÔÙÓ̘’sø{M,®^.š
-v‹ yIF†ù‡VBcðà-�Òæż8šFaëòØAJ|ÿ=5>ô³}�œ?ÔÒˆ½	XV'ëæ/¾9;kEséjãLÌ|ßã÷;&Ô[û	á®ÂÒ_6B¥E¿Ê®¢wÀ—Õ¼v)£™µWåw‡XO;zpAn…‰Šþ»Ö41ŒO>$,_?¿2’›mÀ4e\Ú¶ÀÝýšSÏa ãåPWbeGWý=‚Ûsõ8ülÁ½]�x†V’²“5!Ù1S€‚7+ý‚œ´X¼RUûôˆz¦Þ¶¤8;-½Ç0"ôv »§ïp.‰Ä×�»B¨õNåyÞÃï§�óE^É«�»ìÅ%çÞèÙ	êÊÕŒâ›çRæ�æ”òïi ¬ML÷É87â诺9�ýèî¤NbÝ2t‹WÝsT{´$8˜ë§òüŸ-ÈRÃtGÓh¥ìÈJUSÉU°Kˆ+.´By`Ö-ŠQ3gföÄêüQCp
-c2
-øJGT˜âÿ§:ÿgÂa
-œÝ£Àá²&<"ê¶v|`PÐr‡•þÉï(*È?$�ºÁt÷ùG¦Ò=“®ÿŒ·õ:Ã,]9Π,2wAÛÍýGu¤Vä{ÿɉÝ…NÂRWÒF­¯;ÙߣˆiϤUqÕyymõtÐЌ͘<d�1b‹ND¥(I�0}oŒ¬O@Ñ)méEåª%5´n¢ÞÙ°â–Ÿ „Ó�•›Ø-Ö¾hiÔÕ§¨”û|)ÈÑnÿ]�:ú›Œ#–À7£“$ž@/4ª\Íy(<Bf¦;z”šSÀ¨×¶ä^3^ö¬ÁýJÁ•6šµ^�
áñ•îór}�µúÍ�£¿ÈFs4™>‘F¿}ÑFÀÛÁ‡J¹º’|µÖ¿¸ðZ»l݇\šµr­ü!NTã“LW
-wZ
éðÑwuɾ{Á÷Ü<
Ëb¼ÖÅÇ'Iª0
-?å¶	÷Ð9ì,ó
-Žµa‚BØÇ)“VÝíµl
-Cp?zõ	ú+¾¬P\þE8v¿DœÇ<ѪñqNš`wÍÑüûkàC¡QP]š°�_œ'ðaÛA<è£y<glÁRÆÊfIg»r$–AÆXEœoŸ{'ÄiÀZÖ´ïX<(£	–²®‘mšŠ7}öÇÿ0\Æ‚ryJgi+‘cׄ=,ð¼{5ͺœGÚ°EuC€	§Ç
-e1ðž6¨ÒT‹‹ìo#ÛS·tЬ3Ã�'ãé7+>kÕ¦� sûÿŒ–Á¿
ˆöꮪ={mÃÅyÁc~ÿ�¶`ÙséÉø9´œßçÀ©2™uIžµ7ˆ�á¶Êu‘ô�Ü/c"çí~_OIïk8{µ¢¤:¸Ýô‡²(š÷\QßZå5(²îÿr¿óÒÆÈÄf4<W=A±æ!�ù$sF¬E‚û$ëz=nÉ}lVJG•�XG²a
-ºr”ýW§F»@1“ÛËí§BßCßMdÁê`É#3綗U-±ÿ5e(¿g%ê‚j�UÙʆŽµÒ½&?QÖú÷Yô
-Q´Oè!Yè…¸‰ý©‹øžÌzA4`(õm —R¾_üÞãW6µÇA�:1<à#EY’‚vª­ÿŠ“ÆlâÁ[–n&ñÇm̱QO·K7ÿðÖ&�0ËázH»/s»éZÄ
-„	0`I™4#pv
-Eàf›ù*f®[u÷z‰¾!9ü6ÌÙ
-CÒ3ÉwÙ_&'€›ÏìA¿.﫸E
�®wð“3e©g±T×ÎŒ!Ý­ÛçC4uº¹už×Å›ý4Þ7’Õœ±¸2¹¿3½¾„c�¶"!4¦ZŸY•›S>Ó¢<€$Lc'occ”÷ÑçgØGwtm†ÉEA�Ë9Ë?,râÃyç…ÁË@ã/€7-PÕYòÄ»¼×HVìçÙ4aý̯ø¼!9²R‡KHàP'áX|Àú[
-]Aîú26û�ZSQûuR‡èᲘ¦)95¹¥#²B=S�\Ƽõ v·CW×¢)&wÉíâÙY]>Fª¤º0F
-üòãVaï‚-Â}‘#Ô–oÞ>ã·8'…SJ6¨î£’s¹5Bùè,͈®x®*
·‘|â¶\T˲PÝ0œB�}±n{ïËPò#í½·/¬o‰.4Vz´cš×ÌÐû_�t§ô–¼’ßÉspãMüƒ
-Âý,š«»omž§t~®»MzEåQÒZEƒ5tUàÓógó´i�N5u}3ïÌì±ONâiZù
-or)vúm˜„Æf|!¥œ*¹Ö~Â’Y]µ|þF¡œV
-îêõ´ì�“&©jå�N[N/¸†³ˆ=õÞ~¸kÆ~?Í¢ðH1{Ì)ê++?<rnþ
›ò�˧{Yb€œ¤ 'é0@¨u–-ä¿øàðDxÃÂ"‚aa
ÀæíÀiendstream
+xÚ¬·c”fÝÒ%š¶Yé'UiVÚ¶m?iÛ¶]i³Ò¶mÛ¨´Ué¼õžÓÝ_�sûþéûýØcìkÆŒ˜±ÖØ›œXA™NÐÄÎ(fgëLÇDÏÈ�³°1rq’µ³•¡Sš¹
+tüWƒ(ÿ™ª¿$Mìl­=
+ÎÆæ
+ÿÏ­tÿFÔÖØÎäŸYQv6´5ù;^ÿËð�ÛØÅÑñ¯ªÿ:ñþŸë
:è4†[[¶3æ¶LËLw®ÅΞÑîïe±/mP)*ð¯¶ëñKßå¬0x¯	¡oœæúlóX:³ÿ8”¢þ=Ú‹eMÑ“
+¼ÊÇ÷!¥ê+@ÝúÞÁNó;�A¯1ý\=ÚëzQfB‹�Qí÷Þ¤¢’^É;ÁtÇG˜ë?Tþ¤®þdOöH¾Æ?ëã0;QAÐjÏο'�üy¢ê¹…ì;ģɉƒ%çv…@üåï�ƒÇ¯¥ZáA•Þ„€wÛ~ýI¤Þí¥—GN†Ki#óª`–¿nÛ.óž™ÞÎÏ“$ë(ÑzX©�u3?Å#˜4Í9—ûµáB.ê„ÍÓ„?Ô7kE4“	]O8üvCÙïîUkSMýÚ‡”»02£ØYZïÖuHÎH7áR‰$ÜjïD"$m|/Ë·�K|ZT7âíè�³ª9—1ÉÕu¬Íü¦@ÖvŠyÚÄVhØx+20%3Ôt£%7!AZ|®èÑá{åÚ�G–PîóÄ¥¡
_•öÀÐXªÚÙ"³ ò'y´»¸
¹Ío)8[”Ì—3	!œ,ž	Ëh!k<Lûëlà8Ã}Û-­â4Àó4Ôe‹nv¡èÅ@�ý+ŸÌZÐF£hˆ¡ãû¯ûæ??jb¹ÊS‰cjŠÞFÆ×�¦³Âyxã°¢õB;^‘átlYéÇóžHü‡ ­Þ´Ç­^†‘À=‘DÌàbx:3pî=Æcàˆ#£],ˆqGÄ®ækŒ
+ýH£f»Ð–Á™�œ†�ƒÎïŽ	Ó“Ú|#9ž$’|SâðWßmMQ$TYÕZQ^‰žPÛLR`ð!Tèþ|Þ„lãlFOª›óS¢gc8FR�îÍéS?ß°�ÌÔl8DNýÞ�Él¶�›Çyøúä4Û­²LŒéK	ø¢Õê’4|EuœÄï´€Þf
+æ¤ÛÇ›¯„P¾Úû]%š¬
+Ö“[ÂçÀl/êf BØÄKÜøÉÃñ¶2ôX‹ÃN5�zMç|.òÎzÓOOÍÇE‚U4·qÝc³F^´×hiû™ïrÔ7ŸûÞÜiÞÎàì«Jðàq2ô½}6�cØdÂ#}!Δîvýl�"rz{N¬
ì+hnY‘ÓŠ[{«j¯û£–¸à"öÕÁFX8(ßË»u¬2òæN¯¢8+k#;Ú˜—ŽòøS¼¼MN2›²¤vÊGxoF¯û¿Opâ	*> +Â}î‹)X¥áË�¯½éÀÌÏ)诪¼vQlšg~BY¾”2îO Aʬ1ñ'µ”ýŠÚx
ìÊ€#4x×÷ã{%èn\W‡ñ:6¦ž?üòÔQlð`Ù
ÙNȶº`K ƒ÷:%®je;•áO¢øÎx…Ö7‡µý£¡1ë^Ãcö›ò¬
O!aQ¹!ÝB–«W\Äuç
+5ðž»f.1ŒYæ´„Ãá‘"4ÎcŸË,EU¥LrèîÑÇcÕ�ÙéOé²,VRËËŸRÜàÕž\a±�ežË`˜4úY)îðw™�™“r‘Spfµ8#�Û'O#æCw>ñÆí͸ø!«<Mm¢ÐĽ“‰1|¹Þßø Ò\yp‚Éß-ìüT‡Á*pMšp OḊ\ׇ~*�äGXû‹!Ø›úU£¿B}‚4%'ÛîŽ?a’‰<ûÍîúû91â³µ\fUà†ë�³å`
®•M_Q~nÖ- KXã©^ê×Õ8xv¸
+é³òb®_j«#ŒÖâ]3}»âeŠÃIé n¿¿‚îçã5ÇþΣr²îµ°ôà¢V)M÷…t‘#¾!©¾EHi3ôŠ°|6µ`{$áDü‚Í#P—sð¶&9
ÂVÁeøÆÆ$zèÅáOD9îò>ß�çùÅÏí#æ“n.g|·�@úDúðé~[Ò$i>Õs+ã_ƉyÈÑDŠhÇL +}_'�ûM¶G<@Æ84;ϯy­%×"Ÿ•äþx5ãÉyiÜqBìú0‚Dü¸°Tû»VOr…<îƒQg´ÐÚþŠ ïZ?/€Ü‘Zd›”¾Zò4¾˜æíFVAò•¡0\Y‡Ž
áµÛµpí¡•:VlgÝîÔ`úuÔ	QaZ­h
+Íqÿͺ›WR:„ºYO
+ˆˆt¦ðZ¡«·ä�J�}GðGw¨[PW[ñý^×Ç4.
I<§`Á´%ù~ÞÂéAH2„)hhä,È˱’-MQ~µou«Âç¨ßn
\sÖ‚¥ÅË
+&ap÷‰…I
+ù⬡ãqï~Ì2€ˆ.©à3z'E�šØÃv1)Í#ŠË"m#]<èõ[©>H¦¿÷˜_BF:˜À­Ç˜A¦‡ˆƒ <�ç�ÀxP;o0دC0Ãáa½sÄÅ#FŽÈžøEk‡Õe(|M—ø·j¡U™Jë`‚¶[˪81äNÌ3�<UzŒVs«9]¿¸ï›SŦ±N†7ÎÕ•GúCMŸ_Í$Nƒ&ÂF…:(¿‹~G¦Pfsˆý ª43“…míLûò±eÔAºH³ªi„CgMj$ŽËÑ×
+~ëã'‡3ñáF³k«é*È™½"éÿ±2]j©óÌþé7@¢-2~jÙãæ*HLx­–ó`£ŸáWÍy‰ƒAÌ–OáKžšdˆ
n�ëB.ç¶JBDÚ2Àó"v8wFÓ.ÒæÛ®³^,�‡¨…s(Eù9­
qîk0
+9S~€Ào�H“U#R�©ºz‰®²óîiÂ÷3GœgK_Àžd�¨ã,EgV)È¥|ï¾ö
+1¡Ä	KƇe˜ø…¥"¦ºÒ·�
f©J€‹¡L`qجòvüðçìçþ–S�­âƒ³ö|T6‘‰†ˆïÂØnpe…1c1Ä\k¾|oI_¤7�t˜V/|åbªeU"óVu<Áƒ¢±“ZQ ´›_;AR�±�B©µé-;¸àÈw™~`$seã'_™ Üøm>{ò¸E ©X–°Žù¥™^–W`‰/–,0¢%ýkèOšÏ£Â¯&Yñ}¸x+°†–RÊä€}ž§w˜rQ"ˆ•Q h=­m„²û3éÜf	çÔ–kç¯À¶	�Þ¥™GTÑ'z01$lÙ—ü\¨"j¨ð”ôl··Ð"¨ãy0GñÜÄÀ53h7iô1‡ºz�
+‘Ùi{¿‘–YÃéÃ=ìd„�Æ ºcpêc£Êôï°óy�‡Nã³FÖ]§™RÙw`Itqî©j‘›|0ñ~%ðÆèg2!­Ž:¾~¤;P¶fãÝ*g}èG‡ðî>(´`á+Ñ
ñ øøjÂ…©=çV©†À{‹ªßÃɾ,˜ÐPhFò³2Š7‘Ò�®7¬Â|ÜK1ÊJ‡Y•å‡�J]؈Ÿ½
+bJ¤pòg“îjä"�Ó—Fvø)=VÄ=Ÿ�ߣeݶݱéÍIƒÿw[áXNY×òܪygÑvYÏ	–?,О³,%{çלPÈ‚bššŽ€è-õÆ+ÔãŠ-ãwÍ,‘[½¾iÒl¯´Ò}‹’þ¢rñáÍÀ÷ô¿ë%B?¾@žØú"ÌŠ¾6
qœIú6áË]—E´"?GgÈ,h®éÙé“À`8ü΂Ö;o(dF„ùæà…Œô3¨.ôb»êT1þ.C^.ßb¸á׶xÝ>8n;ÃéŒè¥$Éî]/�‡h²HåWÀöæªía÷"²Œ“hFu×G<£¢90hˆF±ºæQÒðxeû²,“óšòã¨�ñ•;3Œ¹¤ÐrÌDøð\;ÿ¹çRub6DtM™p`?Ò¡ÎŒ¿Æ¡wy+Ê€ÜÛ-o‚P’(^èžDž¶€±^=à[BÜÏ‘Ž(£ßÌ?‰
{ÁžL2-*F"âòŠüq	GX¡1 P³ì/h^w[ñé"d:IÌ<
¢÷–�‰£¿¿=N4��
 �Xm€ê#5ÂS«>¨ŸZ†eÃù•0îô-}-çܾ ;‹—="7ûâkê)¢u†L„Ùý‚GT
Ŧˆºä¼O¿ÒcWTå¿©ò¤¡64]ªÕ��o"m€751Ê-¹�"yÃ/ÑŽ¹Á÷c,„šÚZ^Ÿ4â„•<G½–_ïBåµ|‹¬8ž^%~YöBAAž®_°ÕéS`;µïQJYÚ6ÂMZü\ã¥| Á/4v�C‚ŠšC›Ô!˜ds¦# _Î#i³×K
+$|Q¾´ó¸Hð�C_ÑF­É»Ðn°*§)¾&A¼Ö:œÑGMòùW®žÑ
ÙÖ?ƒ	 ïw¥“úDëHàp\°*çxÝÎûý!©e]£ôë÷øKœCü,„Ù<âd/Œk… ¶ØÇÃ`Š�§Å$6D
¥Bš‘ÔìnË2•n‹ï¯†VxµÕb}†N�Ûnâï_r#«¾µ:,ˆ\óXø8ÂDV/¶úŒÅ ˆñ†¶¬ô².©„l^OâçäJo:¿ÜÇ\pø·¹ß±>‰§IR"[}î–çÖ¯¼]ƒiV1WÔ€JzýŸ±–æÈ‹cNy5åEºÝ(Ð|¬�çpdÛMÙ+HMa›ƒíi2Œ(e¡‰‹wôïü‚,‹¿†ŸÓÅçÈÏ?nmpR«ØpÎB–\ºù0ÍÍS»–Ôc z_¦%#¾Ä±²äð"b$KeÂu·½fð®œà¥‰gtas§HïsMŒö‰ŠÜ˜³ðv—Bv²'9°v0'QJç¡
Z€‹SÆVÆYX¼rJ•Û¼xÑôííI—h£K]ô¿µ´ùws1Ü
©P—­pö`©ÑñGk¡í	ðÕìmHSÈBPmôŠ÷.
‚nœni׈Ž³ ¨ÅØY^Ô�¿´ˆòNW
2D
+­�r±Ü™ª}mòW÷Ê™~
Zøv�
+·"×`9í¨hM«v1 |"=±n4ý™'¶‘µ1eÒqü"-¢èR™9½Ùì.‚Ÿ	›7“5T\2£9Ó’FZ
“Ò£3žšÏYé!\'¼}­¿mZÎèlF’Ð’¯¬<DÂ%Ï7ó屧Š–¥B…äF…O÷¨ù|?£ü|udgî,B7ˆÇ8êT0æd�­iaµpê«ø ÊBðñ/î„âÙv¤½­cGcRaeŽ»ÌqÀÁÐÔ˜˜ù"ü¤øª˜/—E$�_ñŽÿïɱüº
;*o¬N'îíg6XP³ÙE1«ÜÃjà„/V®Mxy.S9*!èá™
+?$ÚçÅ�ìÈÈ\5×E›×Ð*z";m>TXõèñ÷Ÿˆ¾Ø&)c¥dƆ
+ûÙ°‰’‡‚ßD¹±…,A9…x|Âco7�ÙÒÈ]'v,!cµoôQ¤4ÑeÔ§`³“ÉêéƒBHÊR8s ZªŠX7’›vƒøMªf[$WÇ#`­Ž‰q�Õy]%œ$h„‰whÀrä
¦R»�™pv�TR«°€ãÚ0e)ãdLpX€‚.Š-ÜykÙPXô.™®ôÅp èÉ*ŒõB?úÒ=·ÿècØ1WŠÚB—÷¹!p ]å’�4ï`¶czE®iª€Þ¿lœaD‹7F×Öäf`ŒÝ7DP"‹ò]@™lº¶x#
žè�KFFÍvc¤L)ÏÀy§V<>^Á­C|½TZ`ø¹ÿæ@ˆf‡gùO)«
+üþBQ%®v^KLÆbUÎÇœ½ÂÁŽƒ ì¸ÀfŠ³þÝ|u€¬B³g/s_Bp1ƒPúC‘ŪR¡¹Ö»J¹Æ5(Þî¾$Arüh¯šÎW¦ÓJzÞÍoá¡—–‰¨/ºxÙQ¶º¯'ù\¥cK.×›!æF#ø=¡×*aÔõ]° ðâû>|'3Z‹:óÄZFþºDSºù�šÔZIîÓ¦[ÓäÝdU
+?Š¬üX’q–hL¢8ÁßÁ¬X±,=é~¿iƒ¹¥ÑûCœÊþtßÒ‚ÑÈüPó½Ü•÷^­}D»~óÀòKïÜÞ¥<§²„*¬R²iè«jt¢ÿ!dâû}ì˜n
+ÿÃ�›¦øtsgË›
+üÏÌrô7.�a¤¢~ùšmsäÅ»@,¦'êC
ã?œT­ñ£'r'©Ô2:ïœØS´ºÙWv9¹S(V“vò¼�£O„ûPÏ7¾½	¥Pžy2�ϼ­•Þ¹ù]¦$!*‚òG¾:µ¡=8IÚ{TýþQ9}ëßAKuà%\ÕÁi
++Ëèäyeê>H5Æ`Ç—ÔjŠÓ&:_â¿3½kÊ¿›2‹µ¿/y¯á<éý
ÏžÅóòBæŠIþiAb~ÈH0´ÕEõêjC~åeæKU.ëÆ€ØÔL
üôž‰�p÷»í2-F­…M°�ª":4gHÔ�­Ž8¹Χ^vø¹îd%K¨ó©_QK¿a\mß:Eô¿”üÀC¬
+Ž¡~–>–íÀùpñÿ4øÚÍ1âøÌJ®ëOhóBçc
˜L'cÆäÀa§Ìؼ–©Io€�¢'v‡áRÙk
¢€e€‰g/}îOœªô��UßdœÌŸ[>Þ$œas³Ø¬¹@ž=Š¼FÙ<¾¨³¬Æu¥?B›ûm¹Ë¹‚]]éãJJÓ.¨7°$Æ Ñ÷Ý’S­v|—¸A
ˆ:ùÖM³€bÇÙ]*­‹J†Ñ
-èzÕowJVîbqVc¬¤–ñà¶<c$‰)Ž±ÍúõϧAÌߣˤýŒ]êán_´­3©E)~�g9YFŸ
+y”¦Œ²(?ŽO,âìN»&9Ä'Ùôô]ø1—”–ÄíúJVßÓê*Õé§�Ca$ü²j9èhH²Á¹•Zð×K®Cùïyù5
–~"¦hm
ØÛò·Ú¦Â¥iü–+†ýî‘f^êTL4û ¥®Ó<I^6Bþ^wÕ^AééÍXó
+ûf�&§€bªEß:ã£{ºÑÝ
+Ó¹{±�hµ%ЈBaÂòZ·&Ƭïm«¦úå]W~íñ®˜3Oqd68Áwm0Ó×\ Öðž‘‘ÌI~|;¡ì•[=’ãécN1"<ÎÚbÿ¨u`B”i^�„ç»/ü}ùšt´åù»k³83Óð9™Cw¤7„òcòz™6iöh„véþF™Rµ.ð<ÐuØÈ
+*A£au¥b3î‡æâ¢H?X<@Üs–¢<?ÕÅ*ˆ¦.ïí˜ Ý�Aóû˜¹‰é»NdøtHÓ¼DþpøÝÐlÒz›ð^-éarŸEŤ鱫BÛ¨˜>’:á_�È$·©õ©Ú>”L#mõ0îW\Þ^'¬aþcÛø�ïzaÁ6ЕVjÍ™ñùÐêÅm©‘P�ƽ"x
+ÔVŒisß
+�±UP3ç²Øu@tbÒ©m÷銶YÈLfFç¼Ä5�ó:Cu³J"nÛ|ðaÖì !*ΰ(AîL­(‡Â#[‹áT˜	³ñ�ψìמ$åGº¶�Ý•~X[Ý|»œŒ²ÊD8ã4¦À ´\0p¯R�I«g�DuŒÒ­»÷(ý9PtçYž(kŠõŠ0^(
+kf"7íØ„'z£½A̼™
+v q‡<³Èj+ñ_ýÔÏL$?~‘¶§Ë×ö·V¥+À<Ö¯$Éì°õ^õ/€ÕGГõÙÉXZÂõ�ðÏ@°Sr3òûÈes,ð‰L[}lÝܼwÛf£­|�½V‚f$•æ›QAf:|çöæ©­”ð”Þ[—uÏas‡¤u¥r©î�]•J¥›Í“—¶B‚KÃè0È’Þç;$“r5—=)kÚkd_cÙ=ø)ýÃ#7BÖQ.ظÅl§î”ÞéMd/±Š:»ù‚-*!ï88Ÿ!{WÙ’$TqU£f6Þåi»fé:VkÃX%~ÊúîuoèægZDY°žRYíóc�
+Cõ¬i79Õy@ÜÜÞ.úBŸ¿„�Œ�HË•VR¬�¦jªÊ}ÐÂju›Iæ-”m3Èd¯êwõ¢ 0£Ÿ§Ês�*ywÚÝOòKëô±.èm‹ðm~”´YÐe¯
äŽ!ShÝ·áJ¶
µëš4ü;Ð\'+øCˆ÷Nògc烺æªóe˜ß0aü#ºa¬_«lV׫	A2�•÷ „ :ù¨Ú²ì¦ØšS™&¤¹Ô‰ÛÉCR·OÓhöBiéúÇð_±TõIñšs£ø\ºcr±ô Q¿1Éî�L˜í‹º6ê4eÝ>†lCVeöîè]ª(ƒP3~ôg[ÓΤ3¾2ò9¯µó'o>R 1x
 È‚BK¢Š¢¢¥¢oDh÷AÏ¡c-«º–bæö¨”—VöŽ²óAZuže“ìY� †‡¢Ö•þBèfL=…w>u¤[!âv
Ø<{á	5,ù²
‰ÅŠ$Ó�¸Ê’ãA%áìPáÀ#Ö%;£Ån-ÁÂz…@“˜œ!
+h¨ß6üO¨¸
+{OubÏÍzTÖl`#¬l}XµÇ
Äw�ŒÐ×П:’„[?¬sUTϤvðݶS;ã¢H¾VkÝ»süm¬‘æY¿@D5ÎoðZì¾=°÷¸e³÷|à·8µ©  7OÖhõ[¸†7‚ÚVrØ?„/Ç,ʧY˜‹úfØÇEprã´c2¡)†	™9D 0~ü2m/A¤ k;©oGâ”p¸âlK
ó™ ’ÓÒ=%*8|K¾ÈÉóÑèöõð›Àö§@æ†å¸¬Š©‚}bFMu.ZEˆÝÄ¢ÚÙ¢ÝL­Àýb
+ÖÄ«fRÁT„Ýiæsž‡»ä‰â:-`r	.—¢CôD½ø2
 &BY*Ï%¾«4´Ÿj°{'Û«Sˆ’wsÑ*I
+YHØËÌ¡[x
+t~«ÖZß9ë1“¾Å¬•%ÚsýiPK댑c—æXšE·±R¹[Ñø3þZ8ð¿>e1D+v~ÄÖL,è²<‚˜JžoEˆ3F–#{G8F.‰Ÿ]�Ct)À¼0fÄ×ì+ü;hΨçjë3Ò—�æ
þÂH‰Pð‹Ú)=!êD8€�×Á=-…áL[ÆÕ.	‚èbŽ	|,Wî¸Ic( ñJ
&—ñ~°êp
šQÉa-
éß Jvn ºØ¥b›R»iO–¸sçä!˜8‡Ã½&—Þ;ùlíÄtOž§z
+zÞªgX-*ÍÞ§=ªïOèæ„)Ì´Mí&�
+ó¦ e£÷¼_½ì¯Þ'«ë‰¦ªÚ®À‘ÐMæL/ÁspÞ·ýƒ°¼ltª¶æDÛ1³E@hÆ=œ¼‹âa’“‡É‚j›ÂEtbrBwÛÁÓKÌÝg¼¬ož&‘¼2]7±Ý㎳l¨iHTÕ$’ÇaúÉKŽÝÏ‘è’ÄÏ•á%%Dû¥yƒù
+Àxc늈'z¬¬ÊÝõ:“ìèÙ×L_î%ʲfÌb®Déò~ûºœ•¹{¼'ço;Šûx¡ø,n‹2–¾k˜\ø:"ËßMÑúsË �ºü˜4ÙqSæ½�MŽT
Cs¹´.çºY'wímÁ`§„e{lÖ°–GÚjQ;¢ª'r×3f8K_"ÈÛ.×ÇçåÚ–Ýòä‰\×z[µê뽊½«%6Ê$ü‡ÝA”P�î©âL¸X#�¿Ù5[º_ýOêÎZpJëyq	DÅëK¸A8»!�Üü/!zd©OÏôåá°5³ÖxkRöÞjQ�\xun(5rӻˮ
+�'ÿmƒ4¦Õc¹R¬_}õ“Ù&ÒNÁÙÝxüÓ¢g]DÄ_S¸bèþûW3}l(iIÙn¤ö aT$&êó£ˆT'ÊÎ*Ýñ‡B“ÆS³;tŽ•HñŒ'KÇÚ<äKœ“Κ’ÕÒ}	Ä= õm’ÑÃÂËÂìU/¹õ¹Od5j9´1$êÏJa©MûH¡M|°;ƘìŠñ
+
Å�pB @ómkÇDœFÔ5FS{÷ÑJaÔØG¿Aø
+¨èdc	dˆäá8b”Ê%xüQÌ8K¤�N>"ã-ø/¢xÍûÇú’\ÌŽG\–Þ!
+¹óŠÚÙ‰/‹mŽ�õšl(£!¹�ÚåNžJ¦÷­IG®Ä¡Õ’á9ªÀC¤gœÛD+3‚ââû^m#wN]ŠÂþ´ÆF£´¡”Cûu¦‰3®˜¢ô¼v¾
+»VËñEpÕô&£÷Ö{áo®ÎéèƒÀ¿ŸFýžM©&'jªÙ�Ine%ª1œ5-«ƒêlÐÃÛ–‘9ù%Ôpv±�H*•¡1¬{ž›V¢°Ê­Ó†U¹…f»šY‹ô#TRÈ(¿BKŸÆlݧßdÌøKÀ%ÓÚHG»P%£‰F…ü-‘ÙÙ=µmÓ>&îðcQQû(\›ü{¸S]¬®	Gà/¾!Ôdå!Á¥žgý>×ePka¹ødí
»®u�3žYDÅy©Ìàé'E=�rbM`/-ó7*¿Å"(ýƒÑ¨
iÀ)‹}úÖ/Äo³4ÀÞD–-Pˆµ$�‰/O#]¹ßh*³7ã\Š=�ÜÿD÷¬Ÿþ�cÓ^ÉYK4�æXªL	—‡ƒfô…BÛ÷)H–—ñ-잯<V£�iÌ]*w�°5	�¬]ÿL=~Óˆ¯ËÄlH=ØkŠzϼÂ麳„‚’°÷¡‚ìøÄyb6WÿÒ¢¦ÇG0¦|.ø“µ‘†+œžžïŠ%\_�„t�7’)OñôYÚ›ÄLݺ»Àþö¦¨ÖÂï²{·ÕU[F»qÊ[q‡)oÙù¾‚ÁY6ErÐáko{ƒ·³3`Ä“(›²7v¬üK“€X÷½Jæ›Hÿ<ýOÇÂî¥$L° 6%çÚfì"Ìš’¬ÏSÐ×±•—§$iÞØ"«o­œ ¹5�{]hZ;ñ.­\7aŠB
øq=¸^�kJŠ‚ΙÐVTE7,gˆ7dW¼ÝÊ,~«àé•ïõ„ô§B$w§€àš“3ñ
+0”Û	ØÁhJϤz„é!û	u›"(Š÷#·J:h†I·P)ÄÝÒ‰»wÊþˆ
+©Z·Ú3ÛvKД�Ò(ó°gc{W’¢?
ïÈHÏvøYÙžh ðó¶�R±š/²ÙmÃ%%Ú½>EØZ—ZQÂ$o¯¬û÷–ZG9ÁܺªlÆb<qR†²¸¨t_*¶ºZ
±¯½D¸�ô¤€Ë­”·J�ešˆöÛö}]‘ �ÉþXÛ@>$ëyV\ÑËüOûØÓCËYŠE;§�³°jàü¨
×üzHøØä/vOn%S�ú] q#ëйêO7Å'Âm¦hh8j•)~�9äOôæù!q,;¡íåL9®Ù”Þ{ ~«ß`̦Z*Ç<Ò{éaÚÍŠ¹qf£Ø}P\Ôtq"¼øˆ±¬´µ…™;ÔÉmv<–®kàଧ�«j’Ò±w$£–#Á³M¬\õ`Ú¼sUßšç\”+zs¬¦Üô˜±D–m6¾9¨C
}äD‘�îŽð‚Û‡ò"ý@lÆtnZJ¯“.‘x¬
+"ƒÒdjGFpŽ@ì
+úv®\mÌúìºò¨Öw’ ý¾ÙÊvX%Œ3uE4/
+BæéU§Xû'íl4^lÄù~ç¶#+p±<
+郙^Y)§ÐûA&¯l˺„è,$.ó¡ú[7ñ*“FÙC†
‚ç!;e£0	ÛŒ¥ŽAÉ¿?Êi èP$…m¡ß_WX_ý’æ7Äd1‹Û~ô¸ýtQ^Ï­Zýà~¹_ªœ±ÏwøP+–ÒV&!EúµRÐDL:åB°HÊ>uç—4yÓš¡×ý÷#Ñk6/Ï3o
½±ØÏÇæ!½Ù5D'DÌŸÄcÛŽ{î
+Ï5ØRo™Þõe·-ËÉy}´§FªwžSÒ=Å|FUÄRˆZ®
2š
HÚð¿Ú¥¶®›a©UæÑ(|ƒe‡-äg.–”ráîAEˆ²¯ëšîÅëÝ,›êÐ�mÑ_#’"HZSÛ]€¬ã>Gæ´’{íabI©¬4¦7?AùœK£Í®ê ¿ß¬ëO¬r©õ=¨^ *z«d,
+䛣1ש°Ð¨ïpÒ`°uÖ7D¾jؾÛnÕA.J>àhp´Ç'©|öŠWwѳ½uð�ðëÒ0j8/V�™AøSAøŒ¹1Œ
{ µöï–žpÚ߇¿>8àOÖEKõ+FT
+pÉQFÂ^7`wîö˜`
Æ“Ïbun²+M~®-è7:ªÒtqBvÿî^åõàVÉšåš
+ÉBäL!ëlcCŸ*Àáé�En‘Tw¯q–ÜâšùÒŸ¬ß°1°M†Y³’›šï™
+Â_žÔ8	Y¤8ÐD�/ZƒL–WîT¾¤ÍŸdÙ‡ÌßÔ
7Dˆ1õ“­$ï$àˆ^âëH�õû†è!jJ³ÁöùµèÇëý;�
+3àկǸâ{<ˆ¿ü–—7úë˜ãæŒÚ†Çf¾GÖ3wú
Rýêg¬áàW8²	[åŽUP‰’*3ŽÞ'V,é·Æo¿J
+¥P‰�7'໺ÜÆú3×ìkË•6bÜíx~Ö6äV¬O²yž¶
ïØá¤L+XØ�,³T#ØÑØÃ<¹�qÝ%oÊÈÜ5X
+ɳaÒÓ~`Fs:—Ïl•*š�Ä
‹§SÌYµt3âØvàÞ\;(¿‚—`xÆ¿À»G»¦†ü!Sê1ïì°côÜ¥z
VõE¤‚7_ÕW½ÿQÜœÿª'÷�üèÄ‘6nès}áì©pƒÞJqy•ïTí·”FÛOÙšÑ.’ËOSòÊ›¥OcŠ Ø	š¯wRI:!g=õ‡
›íd”hˆª¥]C&m@Þge¹¼bó
9Kñw-À”
+U4"´Æúaæµì§ÿH�ý؇ƒ—£g$ø·8f£,a¬$O›Ä}ß1ôwí_TÚiƒ£é\HÔºn´�К׮>ÕÀ>O	Ðá³Áô"ŸŸ7è•P~èÌ»Çà
–.Ãj¨Â”Ý|±›$D(óԇ­®Â%b3¨$.µøÁ�دŒÚ.Ý@ò®z†¹œ

RMli—²žO#QwEƺäê˜åŠ(íEÿ?ìEão^Ñ•îm³ãÒš”µïY!:m\.µÝ‘þÌŸàAˆ*]
sÍõé¢bø1 mÔˆ©qp¡\È
øiQäèË‹J� G×
§É]…ÚáDòuË	ƒb(M±êÚ–�ÅçŒW¸h’�¥nÆ!_K¡%(y
+€

+Ý�à™cSœNy�ÏÜ�ç�ïÒa2•v£<#Ç
Âu€i⌺ðCÿ¶Vó¼Ò
E}bëWcçúíló|Á¦ÌêÉÅZÛ\ÿ*h´ËJrBÐì¹òÞ+0)˜J„?˜¿�Òê°äÒaöq_m2ÉŠk)°—hîÓdͼR)'":,U¥¨Ä¸£•çÖ¢«^
+ÏxÓã sâQÐe-¸“¤¼Ð¦¯ÿ¨I—y†rñ	âåýÐkõ‡ Ùˆ§.\ü‘v•#i2Ýé”$§&›BS‡Õöб‡$­Y¢´dÃ
+d‘\ÝxyÛ>™éþ
+è8º—Ó¶í ˆ|óž ò�òV­ôd"Q<<Ý+gÿRÌÉRˆó‹ó¢®Ëƒm2Ûš·;$~PsFzííy1v½‹·"ð†TÔÂò~꥕üÓó„lc^žÑèCÊônÊpÝ´|ˆªìRÅ¢ó2	
+€Mòb¾¨¢¡Ò@oæ1–%Hy.¢yœ?.µÜrn’¦ýTþËp¨Z[Ñù4£ùÉ�øHáy��#I‹H³Ñìµgƒ1ÜrwõeB„�?–ɾjŒ¨o­[½Vµ«”3PTcÈ=,r“?s0•Š)¡:Kô+®b¬Jå'(g³c?8Ⱦ<χôÇųÜÌÑæ°…SvU'µN—œô­ÜÛm�iG˜DÇîÅQ’ 
øV|Q´iåÈ-(ýP¬1W”¸s+âAÎrlÜxHÔ†Dû# ù®„ZÁ·åVÆçâ
.uþ&̺©Eµ	V­Ø|„èèKo¼¸N69]ô?%µð¬§Ðå:�ˆGI
ÿöm‚‡i”
yÖYú^\ðÅå㿾²Þ«Ù`QÀ|§ªiÏð<{ºDsäÔÓÑ©¾6è&`£ØWJÜ“	á+¼W|S#3L¦+uÛ­é`D²ûdh·¢Vd‹Á+Ð{³"oËÿ ¦xôÿâ$þŒì”ÕîÜ\D`ˆ}‡Ècƒ‰Í†\¨Z.©[Û†î©]DåD1Á˜DSM¬·¾Cå:-¾éÙ¦£™hj9
+[èJˆG)õÈDâU˜¯QG^D:óçä!5çÞ«Ç
+eæ'ì7ªd�ícîèhÌ0ØÝ”}tw¾Ö²ÿü—6qj%¬y?xš`*OôzŒ–•‚mDÓàìÜg¥¹ª|[w¢ÃP0¹æý3ij¾naTû‹¨rļžË[àDù·	‹Ž¿Ã
+bi}j2ùs Ðÿýo»�”¿Haâ)yòcþHóÖiš¥6aÚ1Ÿ‘œ°Rm8 ß8§%óùäN¯Â	øÿà"@û¸9c‚ü}�1ÞÀÿ
 endobj
 624 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 33
 /LastChar 125
-/Widths 1346 0 R
-/BaseFont /FNUUJC+NimbusMonL-Regu
+/Widths 1354 0 R
+/BaseFont /CVYRZV+NimbusMonL-Regu
 /FontDescriptor 622 0 R
 >> endobj
 622 0 obj <<
 /Ascent 625
 /CapHeight 557
 /Descent -147
-/FontName /FNUUJC+NimbusMonL-Regu
+/FontName /CVYRZV+NimbusMonL-Regu
 /ItalicAngle 0
 /StemV 41
 /XHeight 426
 /FontBBox [-12 -237 650 811]
 /Flags 4
-/CharSet (/exclam/quotedbl/numbersign/dollar/percent/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/equal/at/A/B/C/D/E/F/G/H/I/K/L/M/N/O/P/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/underscore/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright)
+/CharSet (/exclam/quotedbl/numbersign/dollar/percent/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/equal/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/underscore/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright)
 /FontFile 623 0 R
 >> endobj
-1346 0 obj
-[600 600 600 600 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 0 600 0 0 600 600 600 600 600 600 600 600 600 600 0 600 600 600 600 600 600 0 600 600 600 600 600 600 600 600 600 600 600 600 0 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 ]
+1354 0 obj
+[600 600 600 600 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 0 600 0 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 0 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 ]
 endobj
 617 0 obj <<
 /Length1 1620
@@ -5952,7 +6023,7 @@ endobj
 stream
 xÚ¬zSx¥]·eœTlcÇv%©Ø¶íìضmÛ¨Šm£b£bÛ6»¾ÿïÓ§ŸÓ}Õ}.ö~Þ5Çœcb¬µö¾xɉ”éM쌀bv¶ÎôÌL\
 ´¶³·
Ú:ÿ¥øT
Îæ@€©…5 ,¯ ))' —Sˆm�Ž›Pp1²¶0ÈXm�€Ô
-Ë(gçü7%€êÿMe†ÿ>‘ÿ$þoø¿EÞÿ?qÿ«FÿÛ!þÿ=Ïÿ•ZÌÅÚZÎÐø¯ ÀÜ1
+Ë(gçü7%€êÿMe†ÿ>‘ÿ$þoø¿EÞÿ?qÿ«FÿÛ!þÿ=Ïÿ•ZÌÅÚZÎÐø¯ ÀÜ1
 Hk
 
 \P3ÏØ©®â%ª«Q¶°sy1*õŸ�ƒð3›Wž®õ;7 K³y²mÇZÉh\H�ÐçãîäÑ|Àÿ´_˜D®á!)?¬oöër$q0>°±�ÏO„<X)
@@ -6035,23 +6106,23 @@ lÅŸœ$f_dq_“ÉñøC–C'O§_œ„Í¢z™À7Í°5åAƒí`Eû�Kࣃ„>­Ò„rÖ:«Í·ä—ˆ•Ö’"îJ�ìK4åäNÏ
 @¤õÃo_U¡;¤¢æªe?Z*½¿ÚOæËͦcZ¢6zÓ*î
 €mK1”£»ã
ß:¹�<f:µ¦V.sF»øÎN®õÎîÅEQ‡gŒ�‹uà,�¥vz­!ìuS,ñš#\¥€ª6KѯAÃIá)è˜SX1ïŒ~†‰<& �;Ã]zÜ)ZP=ëN¾Ðºg¼)Q�µ°}¼>Õ˜z_#å*’Ðs,b½“o&‰ð]ÎÎì†Ò¬¦{˜±�ãxÂZ©–\å.ÉÉq™5í—]Í_ã
Ó~wX~˜½UÖ"bg¬%Ì—ÊÉbÙ¶Õ¾VÂ3a¾�$�þ—ì!íL;ENLãÖ[µô(ÁzŠþÐÞÂ
:\¦oŽìÿÞÉðdþÌn¤j’Pïn‰“Ì{:}*PDvŸw*[ð@9‚
 Ô0a¸­¦û[ßÅräÛ%Ó\qŸž]£÷Àëð|O-FêkÞ‹³€'‰Qö.ÊÂTqëÚĵ¦Îš)RžcÀ¾ôßØDã“V¶¢Ååž5yÔLùR„w
Oƒùͳ¬¯ãƲ¹ûx¥óuj2a�™	dêMèaÁxö³]&e9õ};ªÄqÜm–íʳì $j´’V¢_yŸ¹6€W3‚èíRõ�ѹc§EsšN1}œÇ‹”Çžácž!\°­1£�,,ᄬ¨\XMÔ�›ÖÁ€DÊŸ&ë«~9F=Þ'KJk®
-ÀÝÏói<ÐÿiŒö?	ͪ¾endstream
+ÀÝÏói<ÐÿiŒö?¥^ªÀendstream
 endobj
 618 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 2
 /LastChar 151
-/Widths 1347 0 R
-/BaseFont /VGVTRI+URWPalladioL-Ital
+/Widths 1355 0 R
+/BaseFont /KYDYZI+URWPalladioL-Ital
 /FontDescriptor 616 0 R
 >> endobj
 616 0 obj <<
 /Ascent 722
 /CapHeight 693
 /Descent -261
-/FontName /VGVTRI+URWPalladioL-Ital
+/FontName /KYDYZI+URWPalladioL-Ital
 /ItalicAngle -9.5
 /StemV 78
 /XHeight 482
@@ -6060,44 +6131,41 @@ endobj
 /CharSet (/fi/parenleft/parenright/comma/hyphen/period/one/two/three/four/five/six/seven/eight/colon/A/B/C/D/E/F/G/H/I/K/L/M/N/O/P/Q/R/S/T/U/W/X/Z/a/b/c/d/e/f/g/h/i/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/emdash)
 /FontFile 617 0 R
 >> endobj
-1347 0 obj
+1355 0 obj
 [528 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 333 333 0 0 250 333 250 0 0 500 500 500 500 500 500 500 500 0 250 0 0 0 0 0 0 722 611 667 778 611 556 722 778 333 0 667 556 944 778 778 611 778 667 556 611 778 0 944 722 0 667 0 0 0 0 0 0 444 463 407 500 389 278 500 500 278 0 444 278 778 556 444 500 463 389 389 333 556 500 722 500 500 444 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 ]
 endobj
 607 0 obj <<
 /Length1 862
 /Length2 1251
 /Length3 532
-/Length 1862      
+/Length 1861      
 /Filter /FlateDecode
 >>
 stream
-xÚíUkTgnõJÀ+Å€€¸T
-æ2��M°hZ 䢘Ê�LÈ@’�I¢	Tp�E*TE�J+¥õ‚.R.+
-ž
-rÓ(˜€`E.º¢î€zìÚŸ»¿öìÌŸyŸçùÞï™çýÎùœxA$–�„}Q™‚’A&àã´¤ ™JpròÁ`H� ²õ�f §'°”Q
-*cßP;`LŽ›œq“Ÿ
-¿2ç¥ô]–£€$ˆ€%‹’À
-憆¸¾žë,Ƀ™b³:¨oÕ³5ø¶ÆSÂN%S© .Äß7_üw6ûL&@…ˆ,
- Ñ=
-”˳g�ÿM-Bð‘Á°
-º:P�WjtauZEâgǯÿ
Åìis¥±Ë´!ì|b"ÜD?¼É!JQ:T¢?»WKŒÑY.ðÚo‰�±ÉÈúrü˜åɳ™GËÃrwÓëÉ�ADuJ¦fÞוCm\È�â¯õ¶Ìzìî¡oV¬ê_‘ÔlqXh`o=^7Õ×a¾Ø%pŸ‹ãRF×	ÓÞ÷—Õ½÷Û–��O*¼¼F0zí–‡G”ûf®Ô‰¼Í#Ç¡É{¾h‡Nçºi�ÕxÓ ßi-œ^ÈͪW=°ÏpLwzÔT®šÈL´Møýj¬)ñFÆpvÉÄW\3B½=ûRïumêe=%g÷†:{?»æ»nâgK›]4EQûÜæœ<oÓ}/øç*0ý¥ÁtiYâ“r(¦ø\�ýúñqß]X3LÌÞEþ¢úÀ–‡¥´æ¬@˵7»|rž1h5ɤù+ÏNj΋÷Sˆ#î­×7”ÞÝ-}ÏÂæÛ¯6ñϲ¹�ï“ìÆ�¾=—bifŽšv†ÝÊ/Cžqæ–Ï—s^"?vj÷p
-³g'Xu¥­¼mÉÞ–ŸÈãdZD]L†	ÔÝžU.
‹55V�çi´Ýö¦=úÜx+�ƒ¦R�ˆšOædeóø
›Â¾0IÚÖP˜Êçò�ÝO*–¡‡V/K5¦qö6=íu},	2gžj/
K·]©†OÕz»O›²Ê-4pth~ËvØÉÍíâ#iyâøLJs|šÔ÷ÇØw‹�F“~Lpé5A¯nÌ›Hô·ÙW&~¤çÖxU—Ù;�»<G©�Ñ;Þ˜&µE?ï
ñŠ[DÛÖ�·iöqI¹Ûã†x&–ÜrÍ/óäd©Qì·Œö<§#f4&ÿŸ•ºqY“ýc^68¯kùêõcšŸ.Ü¿úG#ÍEÙôí¹ÍˆÛãÕÁK^æ„<je[|óËÉ0㳸ÂéíÆ=®¦[{šð~Q�ê{éë/‹[Xtñªö¢–ìKjmê¹zÔƒ®ÛygL©òò°²öŠ×J
E�œ|0W^Zzò#W-8cp¾WU_×Y3�Ñ'ÝÔU}ÌœÆD}G*¼Æ*KÙŸmü5‰®íc=ùe?åeJÇ“š&•]Y(»*ýñø1³¦—Ëy¹-ýÜ>+Í”«›V=O¹±�dz®ë±]½^4uâw•gã‚‘P]J‚§E`T�ÁåC‹?ÝhX÷B\ôp�IBºvà(›˜² ü–aŽÁxÀ.–yK˯&×É<ñkÀÚ#úô´éËŠú/ÕU¬
)ä45ÞaìY4Yÿ,ÅÙðMNÏq®}I÷óc•
+xÚíUkTgnõJÀ+Å€€¸
+æ2�@	Š,š©ÉäI&	¨ÀŠ  T¨\*­”Ö°@¹¬(xjD(ÈM£`‚•«® ;€»ôçî¯=;ógÞçy¾÷{æy¿s>3/_‚	†Ý‘„
+�h2�ꀳ
+1à‹a4fq °ù,	sù"iÁCÄA
+p·0VÐ ±ø(K
+Æ2‡ÿ‘)†B,X
+Ý®:PÇÝ׌:žíZ©é•y
ïø(	?4f×Þu{wÉÃ8á{zFß~åX�KgBn¯´Ò›‡Ž]£è˜Ë;L,¿Üÿ’±²lµ¸Øjƒ¸øbÜh­ïXy££¼¯K?”Ø`¤äp¯ÆÃ8rœc¥uÓzy­Awõ¹¢WÏT»O•e 4“WH‚øœÓº3ié^�žÞþ_hÅjÊMd>ÓhzŸ—?-EÎlÝ?ê§Iboy10n3)óÕ¥]ì,ñO6¶Œ„/Ö;ÛMçk»”�Y«f(‘ì¶tÿ{;yIY¼¨É”³¿™¿ˆøcâ»õ…!„£­ǵ�›{²¦c‡=ŒN”òž©˜µNU¥¦fÄÇ1‡Äî�œ3*OlS­z‚¿aÔqpÏ}ŠixlæáðQ3/-}f™ü²“n|¼PÃsßD™Ïè
+Íþg…rJÔbBýØ+\Õ³yÛ®‰u/åûŸÜö£†b-mù¶z/;èþTÕ¾
¯3ö?k§æ|úýÍËðܹÃCšcj¦¼Wq	÷~^ƒì{á,™_›wõ¦âª‚èFhoé»YhOUy0¡ºVq}TZÃÉRNRÝ¢ì‹?�É(Éõ»ðƒ†ɺ¬¶zTÙØÐ];—4 žƒî*+?¦Í¡œ§ncåN%
´O}÷üK•pN¸<ÿå$éuB×s­Ú™I©½2yrªX§åõf¯Ì¶Aæ€�|ÖÆšN©Z%ÝÓD
 endobj
 608 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1348 0 R
+/Encoding 1356 0 R
 /FirstChar 13
 /LastChar 110
-/Widths 1349 0 R
-/BaseFont /VAUOWV+CMSY10
+/Widths 1357 0 R
+/BaseFont /OCOGLT+CMSY10
 /FontDescriptor 606 0 R
 >> endobj
 606 0 obj <<
 /Ascent 750
 /CapHeight 683
 /Descent -194
-/FontName /VAUOWV+CMSY10
+/FontName /OCOGLT+CMSY10
 /ItalicAngle -14.035
 /StemV 85
 /XHeight 431
@@ -6106,10 +6174,10 @@ endobj
 /CharSet (/circlecopyrt/bullet/braceleft/braceright/bar/backslash)
 /FontFile 607 0 R
 >> endobj
-1349 0 obj
+1357 0 obj
 [1000 0 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 500 0 0 278 0 0 0 500 ]
 endobj
-1348 0 obj <<
+1356 0 obj <<
 /Type /Encoding
 /Differences [ 0 /.notdef 13/circlecopyrt 14/.notdef 15/bullet 16/.notdef 102/braceleft/braceright 104/.notdef 106/bar 107/.notdef 110/backslash 111/.notdef]
 >> endobj
@@ -6122,8 +6190,7 @@ endobj
 >>
 stream
 xÚ¬ºS�ek´&š•¶Í•¶mÛ¶mÛvf¥mÛf¥mVªÒ¶}kïÓ§OÇé~êÛ3bþßÀ7þ±VLRBeZA{#S1{;ZF:.€ª’º‚¡��¡‰¥½­’½­!௘š”TØÉÔÐÅÒÞNÄÐÅ” nj1501
999¡I
ÂöžN–æ.
-0±tv°1ôüû/˜ƒ“å¿i¸:[Ú™ÿW4
-õÿ¾SÿµSø˽‹Š§ÃßÔþG)²ö&ÿóðŠ��½À›–‘�
@ËÄÁü÷Ê118Y˜}ÿÿbü¯³¬¡‹“¥@ûoÙŒÿÿ?žÿ:éþ7Q;c{“¦EÙÅÐÎäï€ýOÁ?jcW'§¿¼þ{çÿýŸçGÝÔÔÃÔz}ÅÞ˜;Ä*=+Ã¥#odJD{ Ÿd$Ô¡¬I¥¸0 Ö¾Ï?=âg•ÁG](]ó×W‡çò™Ãç�ÕáX?º
y_ªéU
®/1å¯B¤-².vêà z½2¸Œsõïë%™P-6µÃÝ)E%½Òp¼™.f'ÈëgÊ
+0±tv°1ôüû/˜ƒ“å¿i¸:[Ú™ÿW4
 å< (&.ÕÃè25)�hTbp§bâßVv*—èTï/o;eÚ0&±º¥Œ¤8FOX5Éávדñ9Ä–ªA àÊü<xâË…×i†y£
Ýë*ÐAlyŸU9J’ô(°ÐƒcÆœÝÛÞne£U&¥»‡Û‡蛇¶Ôœ¥1áÜå\³%Ö)ë]ŸüHÓO6QrB%¤(úkè>·Sog´mY²mÄl?dEŠL0ç…ÿœæ¿Ô¸Å¤ÍÙl\Õ–lfñm³lvÑ+bžþTê¢Jd‚þâ•*®%ß^÷%Mzú,yGºð¢È¨Nï‰�ð,-’ Ó`Ê�á®	Ø�'J˜KnárËÏÅ%?ÙÜ\óÿâÞõý#„-îÌC½Jœn)„¦Á‚…`ª�XS“.ôR°ßµPË,Ñ?Ž™·w©&|!Ž
|Õfœ9p-¡BÝÕŸ—þBÐ��9’ÐÇ1#ÄÙ€‹—i&®¼Úß=	Ň’—cú²LcDvØ·÷GüS
>*²)œ&ü9?·»b“Ä);âxˆðpÆò÷<q{¬œ
šNبkßÄ^µN�ú:v–ˆóO[P�ÐfkpÛìÓä…&懦ÅnŠNZË,¯#j‹ìeؽ%
üî†A°ÜÍBÚ<´	�iÌItxÍþSƒçŸˆ›ø¹C0¥	òym)¸ÍË•o¬¿|uM¦C¢˜F±uBmÆÇåIZÇëB¥ƒÝÑ=úë›GŠ×ûµ¶-ûÅÒÂoñ¨&N“N
d—âCMwvh¿2v�Yòj¢W*œÆX•_
 £õ¼ÓíøZ
 ÅÓcA¢\k†Ø8+Ff
@@ -6225,23 +6292,23 @@ pS>FŽÇ_è|/ÉQ�꣰–—þù"t5@Ó
ºá÷Qу;vä=­íÚ�[|r9>t4™ynÓry>lä�<þ“ýÖˆ•ÑÓpeBïaÂ)&
 L€-²¥ø»¼Jîýý
 ¡YÆS4{Ú0…b3ð?°äVf‹±Ò‚"©†¾£:iHß^Áa1`IÊRŠOÊGë½qPÌŽ3†aµæÁ¶ìêÒZ	(¾QûÈ´µ*½TÌ~4W�l?tnt49$ºÚÉ-zs^"ΉTŽ ¿ÚLi‹¨'}ãN~)™ØËžIS–+×XC” œï€tsai9£–Óv4êø&O¶ê¾ùš\CV昃ÉZLÞRÈ�ÇHýI½…àV8’ãÚ«#w}Ýá¸û"--xõôLd:ÞÂ9cœBŒÂÙ*ï#»Ã¡áÕô„u	‰¨Ù³)ŸáB¤É®…uÏÎÛoU†LÁÄÙ�WsÞ×£ö>ÅÉÚéH\"ü…ô›šu0a&†
¸V•Úð¥;T§’›î:¾Ð×'—LÕ=¸‡ Bí;`51&®séUÐœ`¤‘	øŽºT¸
‹¥{
 Ð]ŸXêy‘ß²oÓ€$ð;ñ^¯�$bМǒƒeR¨õJQ°~ð’½¢h•ƒöjtÁð’£� Aš–ÝHFþŒßæ¦>ù~~ÛŽÂÒ“]Ž3	Îk¥@\-`y-Œì|Šò
-8¨™€¢íuÉu(
{¤”ðßÁá*¬�χpr^!Þ¢�ë0SQPVÆ;�”M°(Î
E0’A		æÛ£Ÿq	E©¸›sFÍ5Ñ¥·¬XÌÖX;q¡{{ïHäP'Iðmå¨u葅ʲz­~Ì�|™Á¦­¤Ê×춻r­ŠŸ�
2µÕГ(ÚÆDÕ	Š�·Ž¾Lb`�Ån\a#ð-7ÊaÐ@ß™HÙ¶-dØä.`séBÈ�‹Å(Óâ‚4æ/gËÏÂ1‹´ˆ¶êC�-
+8¨™€¢íuÉu(
{¤”ðßÁá*¬�χpr^!Þ¢�ë0SQPVÆ;�”M°(Î
E0’A		æÛ£Ÿq	E©¸›sFÍ5Ñ¥·¬XÌÖX;q¡{{ïHäP'Iðmå¨u葅ʲz­~Ì�|™Á¦­¤Ê×춻r­ŠŸ�
2µÕГ(ÚÆDÕ	Š�·Ž¾Lb`�Ån\a#ð-7ÊaÐ@ß™HÙ¶-dØä.`séBÈ�‹Å(Óâ‚4æ/gËÏÂ1‹´ˆ¶êC�-
 endobj
 600 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 2
 /LastChar 151
-/Widths 1350 0 R
-/BaseFont /ZSDOCT+URWPalladioL-Roma
+/Widths 1358 0 R
+/BaseFont /NMVAXF+URWPalladioL-Roma
 /FontDescriptor 598 0 R
 >> endobj
 598 0 obj <<
 /Ascent 715
 /CapHeight 680
 /Descent -282
-/FontName /ZSDOCT+URWPalladioL-Roma
+/FontName /NMVAXF+URWPalladioL-Roma
 /ItalicAngle 0
 /StemV 84
 /XHeight 469
@@ -6250,7 +6317,7 @@ endobj
 /CharSet (/fi/fl/exclam/dollar/percent/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/equal/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/bracketright/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/circumflex/quotedblright/emdash)
 /FontFile 599 0 R
 >> endobj
-1350 0 obj
+1358 0 obj
 [605 608 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 278 0 0 500 840 0 278 333 333 389 606 250 333 250 606 500 500 500 500 500 500 500 500 500 500 250 250 0 606 0 0 747 778 611 709 774 611 556 763 832 337 333 726 611 946 831 786 604 786 668 525 613 778 722 1000 667 667 667 333 0 333 0 0 278 500 553 444 611 479 333 556 582 291 234 556 291 883 582 546 601 560 395 424 326 603 565 834 516 556 500 0 0 0 0 0 0 0 0 0 0 0 0 0 333 0 0 0 0 0 0 0 0 0 0 0 500 0 0 1000 ]
 endobj
 596 0 obj <<
@@ -6262,7 +6329,7 @@ endobj
 >>
 stream
 xÚ¬zc�eß³eÙ¶ë–m£Ë¶mÛ¶mWuÙ¶mÛ6»Œ®.×ôïÿ4ñf>ͼ'âìÌÜ+WæʽãÞˆCF¤ L'hbod*foçBÇDÏÈ
PURW0´±14±´—¡²·1
ü5³Á�‘	;™ºXÚÛ‰º˜rÔMM
-7µ3u2´
(¸ÙXd,�MíœM©
+7µ3u2´
(¸ÙXd,�MíœM©
 ð|I¨
 ‘wÈ»8hN‚ôÊà3/Õc¼o—eöÀ´ØÕN¦•ôJ? ðg»Xœ nÿP�¸ ‘>; ø§7Æ£w#5¡Ôýº$O>ÿóL1<16:Òw>pŒK“MÆãOà˜‹Ë¯¥Z)ZÝL~Ó‘mÂ{ôÔ*’»RÆ¢)ï0=ã½Ég—\"nsYâ‚{s’?ËçžiE«vY«Ôè€9¡ÇΗ©5{ý‰÷r=Fa‘ŠÚòBLÖÔ—J|‚íuÿáq™ßx&™å2‹r&G-H.‹Û"]pYÝÝÝÜ
 "+0TjêkÉ™”“Œ†yF
@@ -6369,23 +6436,24 @@ Lœ›Ê%…LeÌ¿+1Œ-•*ŒÂ0�G70ýo2ˆ
…"³ôd°Ç\g¶i�7±Ýâs�qLÆ7!õòîÏ�¢{ßr%tCáÃ�²A@ò
 6_mŠq'2~‹Ò=aFŠ†þÐœ²?Ç	¯Z¡._|;l[×OX˜àJÁ+QGýiÜZÉ�P&Yyf2
—<²
è•rŒGÜ75·ïá3òŽÃ#z‡FF⨾ãúF4þN¸ü5àcíÚ6P·¡“eä	è‡Ék¢œu_KŸ¥°L‹*·éñ0MH¼CrœT>Ü㇟x
 FÿàRÂB_!äµi¨NÙ%$hâ]tÞ‰¢èÛîûs¶¼ª=nù�<ü¨òÁËY©ÞØîƒQKñ™ÆýgF==ˆ3šöùsCì¶G’Ð!YŠ
W�aðŠ	+·�Yà¾]ˆh�‘!{â#iŽ»¤"”¯ùù4bwËZ¨Xà2&£‘.¿l=b,	¢,Ùl<aâr�7à')¬Í‹RQÜ.)ö2—.‘Ñ�
‡¥r×u�ü)RÖ\-Cà"
 ¨{0öÊðeh饑@­s£²çäV>ÔúAœ¦Gôì©5W0!ÒãBîV\Êå6ÔÔëߥåíýŽá;RЭ$øžv(Ó@ÃICM«Çv¹Ì_�§/#	È
 ÙÌÑ‚§õ±Á¿2å6ôw’ä�{0ëó¬+/6A3C¿X	¬Ÿ�?

-¥0©jT™¶„qÚ]�¡ÁÂ'DY¸
ö.g¬Âñ¨û;AJÒ´á¿ÔÍ­[ßÇHûaA@Ôñ ?ÍJµAì»tI•%[Ø­$Ò�ð³"ɾs™ÿ?÷€ÿ
+¥0©jT™¶„qÚ]�¡ÁÂ'DY¸
ö.g¬Âñ¨û;AJÒ´á¿ÔÍ­[ßÇHûaA@Ôñ ?ÍJµAì»tI•%[Ø­$Ò�ð³"ɾs™ÿ?÷€ÿ
+ë†endstream
 endobj
 597 0 obj <<
 /Type /Font
 /Subtype /Type1
-/Encoding 1336 0 R
+/Encoding 1344 0 R
 /FirstChar 2
 /LastChar 151
-/Widths 1351 0 R
-/BaseFont /NEGMHA+URWPalladioL-Bold
+/Widths 1359 0 R
+/BaseFont /AOZASM+URWPalladioL-Bold
 /FontDescriptor 595 0 R
 >> endobj
 595 0 obj <<
 /Ascent 708
 /CapHeight 672
 /Descent -266
-/FontName /NEGMHA+URWPalladioL-Bold
+/FontName /AOZASM+URWPalladioL-Bold
 /ItalicAngle 0
 /StemV 123
 /XHeight 471
@@ -6394,117 +6462,117 @@ endobj
 /CharSet (/fi/fl/exclam/dollar/percent/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/question/at/A/B/C/D/E/F/G/H/I/K/L/M/N/O/P/Q/R/S/T/U/W/X/Y/Z/bracketleft/bracketright/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/emdash)
 /FontFile 596 0 R
 >> endobj
-1351 0 obj
+1359 0 obj
 [611 611 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 278 0 0 500 889 0 278 333 333 444 606 250 333 250 296 500 500 500 500 500 500 500 500 500 500 250 250 0 0 0 444 747 778 667 722 833 611 556 833 833 389 0 778 611 1000 833 833 611 833 722 611 667 778 0 1000 667 667 667 333 0 333 0 0 0 500 611 444 611 500 389 556 611 333 333 611 333 889 611 556 611 611 389 444 333 611 556 833 500 556 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 ]
 endobj
 601 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
+/Parent 1360 0 R
 /Kids [590 0 R 603 0 R 610 0 R 629 0 R 646 0 R 657 0 R]
 >> endobj
 672 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
+/Parent 1360 0 R
 /Kids [664 0 R 674 0 R 679 0 R 687 0 R 698 0 R 706 0 R]
 >> endobj
 717 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
+/Parent 1360 0 R
 /Kids [713 0 R 720 0 R 727 0 R 739 0 R 748 0 R 753 0 R]
 >> endobj
 764 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
-/Kids [757 0 R 766 0 R 776 0 R 787 0 R 794 0 R 803 0 R]
+/Parent 1360 0 R
+/Kids [757 0 R 766 0 R 776 0 R 784 0 R 792 0 R 802 0 R]
 >> endobj
-813 0 obj <<
+817 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
-/Kids [807 0 R 815 0 R 819 0 R 829 0 R 835 0 R 843 0 R]
+/Parent 1360 0 R
+/Kids [811 0 R 819 0 R 823 0 R 833 0 R 839 0 R 847 0 R]
 >> endobj
-861 0 obj <<
+862 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1352 0 R
-/Kids [853 0 R 863 0 R 877 0 R 884 0 R 888 0 R 894 0 R]
+/Parent 1360 0 R
+/Kids [854 0 R 864 0 R 878 0 R 885 0 R 889 0 R 895 0 R]
 >> endobj
-907 0 obj <<
+908 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [900 0 R 909 0 R 916 0 R 920 0 R 925 0 R 931 0 R]
+/Parent 1361 0 R
+/Kids [901 0 R 910 0 R 917 0 R 921 0 R 926 0 R 932 0 R]
 >> endobj
 947 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [938 0 R 953 0 R 957 0 R 967 0 R 974 0 R 982 0 R]
+/Parent 1361 0 R
+/Kids [938 0 R 950 0 R 954 0 R 964 0 R 971 0 R 979 0 R]
 >> endobj
-992 0 obj <<
+987 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [986 0 R 994 0 R 1001 0 R 1006 0 R 1013 0 R 1021 0 R]
+/Parent 1361 0 R
+/Kids [983 0 R 989 0 R 997 0 R 1003 0 R 1010 0 R 1017 0 R]
 >> endobj
-1035 0 obj <<
+1031 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [1029 0 R 1037 0 R 1046 0 R 1051 0 R 1055 0 R 1063 0 R]
+/Parent 1361 0 R
+/Kids [1026 0 R 1033 0 R 1039 0 R 1048 0 R 1052 0 R 1056 0 R]
 >> endobj
-1084 0 obj <<
+1067 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [1075 0 R 1086 0 R 1102 0 R 1114 0 R 1120 0 R 1127 0 R]
+/Parent 1361 0 R
+/Kids [1064 0 R 1069 0 R 1081 0 R 1096 0 R 1109 0 R 1121 0 R]
 >> endobj
-1149 0 obj <<
+1133 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1353 0 R
-/Kids [1138 0 R 1151 0 R 1158 0 R 1164 0 R 1168 0 R 1176 0 R]
+/Parent 1361 0 R
+/Kids [1126 0 R 1135 0 R 1147 0 R 1160 0 R 1168 0 R 1172 0 R]
 >> endobj
-1196 0 obj <<
+1183 0 obj <<
 /Type /Pages
 /Count 6
-/Parent 1354 0 R
-/Kids [1186 0 R 1198 0 R 1202 0 R 1209 0 R 1221 0 R 1276 0 R]
+/Parent 1362 0 R
+/Kids [1176 0 R 1185 0 R 1195 0 R 1206 0 R 1210 0 R 1217 0 R]
 >> endobj
-1335 0 obj <<
+1283 0 obj <<
 /Type /Pages
-/Count 1
-/Parent 1354 0 R
-/Kids [1327 0 R]
+/Count 3
+/Parent 1362 0 R
+/Kids [1229 0 R 1285 0 R 1336 0 R]
 >> endobj
-1352 0 obj <<
+1360 0 obj <<
 /Type /Pages
 /Count 36
-/Parent 1355 0 R
-/Kids [601 0 R 672 0 R 717 0 R 764 0 R 813 0 R 861 0 R]
+/Parent 1363 0 R
+/Kids [601 0 R 672 0 R 717 0 R 764 0 R 817 0 R 862 0 R]
 >> endobj
-1353 0 obj <<
+1361 0 obj <<
 /Type /Pages
 /Count 36
-/Parent 1355 0 R
-/Kids [907 0 R 947 0 R 992 0 R 1035 0 R 1084 0 R 1149 0 R]
+/Parent 1363 0 R
+/Kids [908 0 R 947 0 R 987 0 R 1031 0 R 1067 0 R 1133 0 R]
 >> endobj
-1354 0 obj <<
+1362 0 obj <<
 /Type /Pages
-/Count 7
-/Parent 1355 0 R
-/Kids [1196 0 R 1335 0 R]
+/Count 9
+/Parent 1363 0 R
+/Kids [1183 0 R 1283 0 R]
 >> endobj
-1355 0 obj <<
+1363 0 obj <<
 /Type /Pages
-/Count 79
-/Kids [1352 0 R 1353 0 R 1354 0 R]
+/Count 81
+/Kids [1360 0 R 1361 0 R 1362 0 R]
 >> endobj
-1356 0 obj <<
+1364 0 obj <<
 /Type /Outlines
 /First 7 0 R
 /Last 555 0 R
@@ -6570,7 +6638,7 @@ endobj
 555 0 obj <<
 /Title 556 0 R
 /A 553 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 535 0 R
 /First 559 0 R
 /Last 575 0 R
@@ -6606,7 +6674,7 @@ endobj
 535 0 obj <<
 /Title 536 0 R
 /A 533 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 511 0 R
 /Next 555 0 R
 /First 539 0 R
@@ -6650,7 +6718,7 @@ endobj
 511 0 obj <<
 /Title 512 0 R
 /A 509 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 239 0 R
 /Next 535 0 R
 /First 515 0 R
@@ -7137,7 +7205,7 @@ endobj
 239 0 obj <<
 /Title 240 0 R
 /A 237 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 227 0 R
 /Next 511 0 R
 /First 243 0 R
@@ -7159,7 +7227,7 @@ endobj
 227 0 obj <<
 /Title 228 0 R
 /A 225 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 131 0 R
 /Next 239 0 R
 /First 231 0 R
@@ -7333,7 +7401,7 @@ endobj
 131 0 obj <<
 /Title 132 0 R
 /A 129 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 91 0 R
 /Next 227 0 R
 /First 135 0 R
@@ -7407,7 +7475,7 @@ endobj
 91 0 obj <<
 /Title 92 0 R
 /A 89 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 67 0 R
 /Next 131 0 R
 /First 95 0 R
@@ -7450,7 +7518,7 @@ endobj
 67 0 obj <<
 /Title 68 0 R
 /A 65 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Prev 7 0 R
 /Next 91 0 R
 /First 71 0 R
@@ -7559,1406 +7627,1414 @@ endobj
 7 0 obj <<
 /Title 8 0 R
 /A 5 0 R
-/Parent 1356 0 R
+/Parent 1364 0 R
 /Next 67 0 R
 /First 11 0 R
 /Last 23 0 R
 /Count -4
 >> endobj
-1357 0 obj <<
-/Names [(Access_Control_Lists) 1172 0 R (Bv9ARM.ch01) 613 0 R (Bv9ARM.ch02) 667 0 R (Bv9ARM.ch03) 682 0 R (Bv9ARM.ch04) 730 0 R (Bv9ARM.ch05) 810 0 R (Bv9ARM.ch06) 822 0 R (Bv9ARM.ch07) 1171 0 R (Bv9ARM.ch08) 1189 0 R (Bv9ARM.ch09) 1205 0 R (Configuration_File_Grammar) 849 0 R (DNSSEC) 782 0 R (Doc-Start) 594 0 R (Setting_TTLs) 1141 0 R (access_control) 963 0 R (acl) 857 0 R (address_match_lists) 827 0 R (admin_tools) 704 0 R (appendix.A) 554 0 R (bibliography) 1217 0 R (boolean_options) 736 0 R (builtin) 1025 0 R (chapter.1) 6 0 R (chapter.2) 66 0 R (chapter.3) 90 0 R (chapter.4) 130 0 R (chapter.5) 226 0 R (chapter.6) 238 0 R (chapter.7) 510 0 R (chapter.8) 534 0 R (cite.RFC1034) 1233 0 R (cite.RFC1035) 1235 0 R (cite.RFC1101) 1290 0 R (cite.RFC1123) 1292 0 R (cite.RFC1183) 1270 0 R (cite.RFC1464) 1310 0 R (cite.RFC1535) 1262 0 R (cite.RFC1536) 1264 0 R (cite.RFC1537) 1300 0 R (cite.RFC1591) 1294 0 R (cite.RFC1706) 1272 0 R (cite.RFC1712) 1324 0 R (cite.RFC1713) 1312 0 R (cite.RFC1794) 1314 0 R (cite.RFC1876) 1274 0 R (cite.RFC1886) 1254 0 R (cite.RFC1912) 1302 0 R (cite.RFC1982) 1266 0 R (cite.RFC1995) 1240 0 R (cite.RFC1996) 1242 0 R (cite.RFC2010) 1304 0 R (cite.RFC2052) 1280 0 R (cite.RFC2065) 1256 0 R (cite.RFC2136) 1244 0 R (cite.RFC2137) 1258 0 R (cite.RFC2163) 1282 0 R (cite.RFC2168) 1284 0 R (cite.RFC2181) 1246 0 R (cite.RFC2219) 1306 0 R (cite.RFC2230) 1286 0 R (cite.RFC2240) 1316 0 R (cite.RFC2308) 1248 0 R (cite.RFC2317) 1296 0 R (cite.RFC2345) 1318 0 R (cite.RFC2352) 1320 0 R (cite.RFC2845) 1250 0 R (cite.RFC974) 1237 0 R (cite.id2492354) 1333 0 R (configuration_file_elements) 823 0 R (controls_statement_definition_and_usage) 718 0 R (diagnostic_tools) 655 0 R (dynamic_update) 734 0 R (dynamic_update_policies) 774 0 R (dynamic_update_security) 972 0 R (historical_dns_information) 1212 0 R (id2465864) 614 0 R (id2466744) 615 0 R (id2466798) 619 0 R (id2466807) 620 0 R (id2467648) 690 0 R (id2467665) 691 0 R (id2468484) 635 0 R (id2468627) 637 0 R (id2468647) 638 0 R (id2468664) 999 0 R (id2468955) 639 0 R (id2469040) 642 0 R (id2469114) 649 0 R (id2469205) 652 0 R (id2469226) 653 0 R (id2469245) 654 0 R (id2469274) 660 0 R (id2469306) 661 0 R (id2469332) 662 0 R (id2469364) 668 0 R (id2469388) 669 0 R (id2469399) 670 0 R (id2469481) 671 0 R (id2469490) 677 0 R (id2469521) 684 0 R (id2469537) 685 0 R (id2470116) 694 0 R (id2470121) 695 0 R (id2471306) 723 0 R (id2471318) 724 0 R (id2471731) 745 0 R (id2472292) 761 0 R (id2472308) 762 0 R (id2472342) 763 0 R (id2472358) 769 0 R (id2472366) 770 0 R (id2472406) 771 0 R (id2472458) 772 0 R (id2472502) 779 0 R (id2472516) 780 0 R (id2472633) 781 0 R (id2472699) 790 0 R (id2472766) 791 0 R (id2472909) 792 0 R (id2472933) 797 0 R (id2472992) 799 0 R (id2473012) 800 0 R (id2473180) 811 0 R (id2473387) 824 0 R (id2474020) 832 0 R (id2474046) 833 0 R (id2474140) 838 0 R (id2474155) 839 0 R (id2474184) 840 0 R (id2474329) 850 0 R (id2474694) 856 0 R (id2474736) 858 0 R (id2474862) 860 0 R (id2475131) 868 0 R (id2475146) 869 0 R (id2475169) 870 0 R (id2475190) 871 0 R (id2475261) 880 0 R (id2475456) 881 0 R (id2475508) 882 0 R (id2476201) 897 0 R (id2476729) 903 0 R (id2476870) 904 0 R (id2476933) 912 0 R (id2476977) 913 0 R (id2476992) 914 0 R (id2478674) 934 0 R (id2479741) 960 0 R (id2479792) 962 0 R (id2479971) 971 0 R (id2480128) 977 0 R (id2480722) 989 0 R (id2480738) 990 0 R (id2480976) 997 0 R (id2483475) 1017 0 R (id2483930) 1032 0 R (id2484556) 1042 0 R (id2484673) 1043 0 R (id2484741) 1049 0 R (id2485414) 1058 0 R (id2485420) 1059 0 R (id2485425) 1060 0 R (id2485658) 1066 0 R (id2485689) 1067 0 R (id2486790) 1105 0 R (id2486949) 1107 0 R (id2486967) 1108 0 R (id2486988) 1111 0 R (id2487128) 1117 0 R (id2487779) 1123 0 R (id2487888) 1125 0 R (id2487909) 1130 0 R (id2488198) 1132 0 R (id2488313) 1134 0 R (id2488331) 1135 0 R (id2488705) 1142 0 R (id2488878) 1144 0 R (id2488892) 1145 0 R (id2488984) 1147 0 R (id2489003) 1148 0 R (id2489059) 1154 0 R (id2489122) 1155 0 R (id2489153) 1156 0 R (id2489213) 1161 0 R (id2489545) 1182 0 R (id2489621) 1183 0 R (id2489678) 1184 0 R (id2489885) 1190 0 R (id2489891) 1191 0 R (id2489902) 1192 0 R (id2489920) 1193 0 R (id2490050) 1206 0 R (id2490055) 1207 0 R (id2490243) 1213 0 R (id2490554) 1215 0 R (id2490899) 1229 0 R (id2490901) 1231 0 R (id2490909) 1236 0 R (id2491001) 1232 0 R (id2491025) 1234 0 R (id2491062) 1245 0 R (id2491088) 1247 0 R (id2491113) 1239 0 R (id2491138) 1241 0 R (id2491161) 1243 0 R (id2491217) 1249 0 R (id2491277) 1252 0 R (id2491292) 1253 0 R (id2491331) 1255 0 R (id2491370) 1257 0 R (id2491398) 1260 0 R (id2491406) 1261 0 R (id2491432) 1263 0 R (id2491499) 1265 0 R (id2491536) 1268 0 R (id2491541) 1269 0 R (id2491598) 1271 0 R (id2491636) 1283 0 R (id2491671) 1273 0 R (id2491725) 1279 0 R (id2491765) 1281 0 R (id2491792) 1285 0 R (id2491818) 1288 0 R (id2491826) 1289 0 R (id2491851) 1291 0 R (id2491875) 1293 0 R (id2491896) 1295 0 R (id2491943) 1298 0 R (id2491950) 1299 0 R (id2491976) 1301 0 R (id2492003) 1303 0 R (id2492039) 1305 0 R (id2492078) 1308 0 R (id2492099) 1309 0 R (id2492121) 1311 0 R (id2492146) 1313 0 R (id2492170) 1315 0 R (id2492193) 1317 0 R (id2492238) 1319 0 R (id2492263) 1322 0 R (id2492269) 1323 0 R (id2492342) 1330 0 R (id2492352) 1332 0 R (id2492354) 1334 0 R (incremental_zone_transfers) 742 0 R (internet_drafts) 1325 0 R (ipv6addresses) 801 0 R (journal) 735 0 R (lwresd) 812 0 R (notify) 731 0 R (options) 923 0 R (page.1) 593 0 R (page.10) 689 0 R (page.11) 700 0 R (page.12) 708 0 R (page.13) 715 0 R (page.14) 722 0 R (page.15) 729 0 R (page.16) 741 0 R (page.17) 750 0 R (page.18) 755 0 R (page.19) 759 0 R (page.2) 605 0 R (page.20) 768 0 R (page.21) 778 0 R (page.22) 789 0 R (page.23) 796 0 R (page.24) 805 0 R (page.25) 809 0 R (page.26) 817 0 R (page.27) 821 0 R (page.28) 831 0 R (page.29) 837 0 R (page.3) 612 0 R (page.30) 845 0 R (page.31) 855 0 R (page.32) 865 0 R (page.33) 879 0 R (page.34) 886 0 R (page.35) 890 0 R (page.36) 896 0 R (page.37) 902 0 R (page.38) 911 0 R (page.39) 918 0 R (page.4) 631 0 R (page.40) 922 0 R (page.41) 927 0 R (page.42) 933 0 R (page.43) 940 0 R (page.44) 955 0 R (page.45) 959 0 R (page.46) 969 0 R (page.47) 976 0 R (page.48) 984 0 R (page.49) 988 0 R (page.5) 648 0 R (page.50) 996 0 R (page.51) 1003 0 R (page.52) 1008 0 R (page.53) 1015 0 R (page.54) 1023 0 R (page.55) 1031 0 R (page.56) 1039 0 R (page.57) 1048 0 R (page.58) 1053 0 R (page.59) 1057 0 R (page.6) 659 0 R (page.60) 1065 0 R (page.61) 1077 0 R (page.62) 1088 0 R (page.63) 1104 0 R (page.64) 1116 0 R (page.65) 1122 0 R (page.66) 1129 0 R (page.67) 1140 0 R (page.68) 1153 0 R (page.69) 1160 0 R (page.7) 666 0 R (page.70) 1166 0 R (page.71) 1170 0 R (page.72) 1178 0 R (page.73) 1188 0 R (page.74) 1200 0 R (page.75) 1204 0 R (page.76) 1211 0 R (page.77) 1224 0 R (page.78) 1278 0 R (page.79) 1329 0 R (page.8) 676 0 R (page.9) 681 0 R (proposed_standards) 746 0 R (rfcs) 644 0 R (rndc) 875 0 R (rrset_ordering) 696 0 R (sample_configuration) 683 0 R (section*.1) 1228 0 R (section*.10) 1321 0 R (section*.11) 1331 0 R (section*.2) 1230 0 R (section*.3) 1238 0 R (section*.4) 1251 0 R (section*.5) 1259 0 R (section*.6) 1267 0 R (section*.7) 1287 0 R (section*.8) 1297 0 R (section*.9) 1307 0 R (section.1.1) 10 0 R (section.1.2) 14 0 R (section.1.3) 18 0 R (section.1.4) 22 0 R (section.2.1) 70 0 R (section.2.2) 74 0 R (section.2.3) 78 0 R (section.2.4) 82 0 R (section.2.5) 86 0 R (section.3.1) 94 0 R (section.3.2) 106 0 R (section.3.3) 110 0 R (section.4.1) 134 0 R (section.4.2) 138 0 R (section.4.3) 146 0 R (section.4.4) 150 0 R (section.4.5) 154 0 R (section.4.6) 190 0 R (section.4.7) 194 0 R (section.4.8) 198 0 R (section.4.9) 214 0 R (section.5.1) 230 0 R (section.5.2) 234 0 R (section.6.1) 242 0 R (section.6.2) 270 0 R (section.6.3) 462 0 R (section.7.1) 514 0 R (section.7.2) 518 0 R (section.7.3) 530 0 R (section.8.1) 538 0 R (section.8.2) 546 0 R (section.8.3) 550 0 R (section.A.1) 558 0 R (section.A.2) 566 0 R (section.A.3) 574 0 R (server_statement_definition_and_usage) 951 0 R (server_statement_grammar) 1034 0 R (statsfile) 929 0 R (subsection.1.4.1) 26 0 R (subsection.1.4.2) 30 0 R (subsection.1.4.3) 34 0 R (subsection.1.4.4) 38 0 R (subsection.1.4.5) 54 0 R (subsection.1.4.6) 62 0 R (subsection.3.1.1) 98 0 R (subsection.3.1.2) 102 0 R (subsection.3.3.1) 114 0 R (subsection.3.3.2) 126 0 R (subsection.4.2.1) 142 0 R (subsection.4.5.1) 158 0 R (subsection.4.5.2) 170 0 R (subsection.4.5.3) 174 0 R (subsection.4.5.4) 178 0 R (subsection.4.5.5) 182 0 R (subsection.4.5.6) 186 0 R (subsection.4.8.1) 202 0 R (subsection.4.8.2) 206 0 R (subsection.4.8.3) 210 0 R (subsection.4.9.1) 218 0 R (subsection.4.9.2) 222 0 R (subsection.6.1.1) 246 0 R (subsection.6.1.2) 258 0 R (subsection.6.2.1) 274 0 R (subsection.6.2.10) 310 0 R (subsection.6.2.11) 322 0 R (subsection.6.2.12) 326 0 R (subsection.6.2.13) 330 0 R (subsection.6.2.14) 334 0 R (subsection.6.2.15) 338 0 R (subsection.6.2.16) 342 0 R (subsection.6.2.17) 414 0 R (subsection.6.2.18) 418 0 R (subsection.6.2.19) 422 0 R (subsection.6.2.2) 278 0 R (subsection.6.2.20) 426 0 R (subsection.6.2.21) 430 0 R (subsection.6.2.22) 434 0 R (subsection.6.2.23) 438 0 R (subsection.6.2.24) 442 0 R (subsection.6.2.3) 282 0 R (subsection.6.2.4) 286 0 R (subsection.6.2.5) 290 0 R (subsection.6.2.6) 294 0 R (subsection.6.2.7) 298 0 R (subsection.6.2.8) 302 0 R (subsection.6.2.9) 306 0 R (subsection.6.3.1) 466 0 R (subsection.6.3.2) 478 0 R (subsection.6.3.3) 482 0 R (subsection.6.3.4) 486 0 R (subsection.6.3.5) 490 0 R (subsection.6.3.6) 506 0 R (subsection.7.2.1) 522 0 R (subsection.7.2.2) 526 0 R (subsection.8.1.1) 542 0 R (subsection.A.1.1) 562 0 R (subsection.A.2.1) 570 0 R (subsection.A.3.1) 578 0 R (subsection.A.3.2) 582 0 R (subsection.A.3.3) 586 0 R (subsubsection.1.4.4.1) 42 0 R (subsubsection.1.4.4.2) 46 0 R (subsubsection.1.4.4.3) 50 0 R (subsubsection.1.4.5.1) 58 0 R (subsubsection.3.3.1.1) 118 0 R (subsubsection.3.3.1.2) 122 0 R (subsubsection.4.5.1.1) 162 0 R (subsubsection.4.5.1.2) 166 0 R (subsubsection.6.1.1.1) 250 0 R (subsubsection.6.1.1.2) 254 0 R (subsubsection.6.1.2.1) 262 0 R (subsubsection.6.1.2.2) 266 0 R (subsubsection.6.2.10.1) 314 0 R (subsubsection.6.2.10.2) 318 0 R (subsubsection.6.2.16.1) 346 0 R (subsubsection.6.2.16.10) 382 0 R (subsubsection.6.2.16.11) 386 0 R (subsubsection.6.2.16.12) 390 0 R (subsubsection.6.2.16.13) 394 0 R (subsubsection.6.2.16.14) 398 0 R (subsubsection.6.2.16.15) 402 0 R (subsubsection.6.2.16.16) 406 0 R (subsubsection.6.2.16.17) 410 0 R (subsubsection.6.2.16.2) 350 0 R (subsubsection.6.2.16.3) 354 0 R (subsubsection.6.2.16.4) 358 0 R (subsubsection.6.2.16.5) 362 0 R (subsubsection.6.2.16.6) 366 0 R (subsubsection.6.2.16.7) 370 0 R (subsubsection.6.2.16.8) 374 0 R (subsubsection.6.2.16.9) 378 0 R (subsubsection.6.2.24.1) 446 0 R (subsubsection.6.2.24.2) 450 0 R (subsubsection.6.2.24.3) 454 0 R (subsubsection.6.2.24.4) 458 0 R (subsubsection.6.3.1.1) 470 0 R (subsubsection.6.3.1.2) 474 0 R (subsubsection.6.3.5.1) 494 0 R (subsubsection.6.3.5.2) 498 0 R (subsubsection.6.3.5.3) 502 0 R (table.1.1) 621 0 R (table.1.2) 636 0 R (table.3.1) 692 0 R (table.3.2) 725 0 R (table.6.1) 825 0 R (table.6.10) 1112 0 R (table.6.11) 1118 0 R (table.6.12) 1124 0 R (table.6.13) 1131 0 R (table.6.14) 1133 0 R (table.6.15) 1136 0 R (table.6.16) 1143 0 R (table.6.17) 1146 0 R (table.6.18) 1162 0 R (table.6.2) 851 0 R (table.6.3) 859 0 R (table.6.4) 898 0 R (table.6.5) 935 0 R (table.6.6) 1018 0 R (table.6.7) 1033 0 R (table.6.8) 1061 0 R (table.6.9) 1106 0 R (table.A.1) 1214 0 R (table.A.2) 1216 0 R (the_category_phrase) 892 0 R (the_sortlist_statement) 1009 0 R (topology) 1004 0 R (tsig) 760 0 R (tuning) 1019 0 R (types_of_resource_records_and_when_to_use_them) 643 0 R (view_statement_grammar) 1027 0 R (zone_statement_grammar) 965 0 R (zone_transfers) 737 0 R]
+1365 0 obj <<
+/Names [(Access_Control_Lists) 1180 0 R (Bv9ARM.ch01) 613 0 R (Bv9ARM.ch02) 667 0 R (Bv9ARM.ch03) 682 0 R (Bv9ARM.ch04) 730 0 R (Bv9ARM.ch05) 814 0 R (Bv9ARM.ch06) 826 0 R (Bv9ARM.ch07) 1179 0 R (Bv9ARM.ch08) 1198 0 R (Bv9ARM.ch09) 1213 0 R (Configuration_File_Grammar) 850 0 R (DNSSEC) 782 0 R (Doc-Start) 594 0 R (Setting_TTLs) 1143 0 R (access_control) 960 0 R (acl) 858 0 R (address_match_lists) 831 0 R (admin_tools) 704 0 R (appendix.A) 554 0 R (bibliography) 1225 0 R (boolean_options) 736 0 R (builtin) 1022 0 R (chapter.1) 6 0 R (chapter.2) 66 0 R (chapter.3) 90 0 R (chapter.4) 130 0 R (chapter.5) 226 0 R (chapter.6) 238 0 R (chapter.7) 510 0 R (chapter.8) 534 0 R (cite.RFC1034) 1241 0 R (cite.RFC1035) 1243 0 R (cite.RFC1101) 1299 0 R (cite.RFC1123) 1301 0 R (cite.RFC1183) 1278 0 R (cite.RFC1464) 1319 0 R (cite.RFC1535) 1270 0 R (cite.RFC1536) 1272 0 R (cite.RFC1537) 1309 0 R (cite.RFC1591) 1303 0 R (cite.RFC1706) 1280 0 R (cite.RFC1712) 1333 0 R (cite.RFC1713) 1321 0 R (cite.RFC1794) 1323 0 R (cite.RFC1876) 1282 0 R (cite.RFC1886) 1262 0 R (cite.RFC1912) 1311 0 R (cite.RFC1982) 1274 0 R (cite.RFC1995) 1248 0 R (cite.RFC1996) 1250 0 R (cite.RFC2010) 1313 0 R (cite.RFC2052) 1289 0 R (cite.RFC2065) 1264 0 R (cite.RFC2136) 1252 0 R (cite.RFC2137) 1266 0 R (cite.RFC2163) 1291 0 R (cite.RFC2168) 1293 0 R (cite.RFC2181) 1254 0 R (cite.RFC2219) 1315 0 R (cite.RFC2230) 1295 0 R (cite.RFC2240) 1325 0 R (cite.RFC2308) 1256 0 R (cite.RFC2317) 1305 0 R (cite.RFC2345) 1327 0 R (cite.RFC2352) 1329 0 R (cite.RFC2845) 1258 0 R (cite.RFC974) 1245 0 R (cite.id2492379) 1342 0 R (configuration_file_elements) 827 0 R (controls_statement_definition_and_usage) 718 0 R (diagnostic_tools) 655 0 R (dynamic_update) 734 0 R (dynamic_update_policies) 774 0 R (dynamic_update_security) 969 0 R (historical_dns_information) 1220 0 R (id2465419) 614 0 R (id2465445) 615 0 R (id2467371) 685 0 R (id2467394) 690 0 R (id2467411) 691 0 R (id2467500) 619 0 R (id2467509) 620 0 R (id2467684) 635 0 R (id2467827) 637 0 R (id2467940) 994 0 R (id2468120) 638 0 R (id2468155) 639 0 R (id2468240) 642 0 R (id2468314) 649 0 R (id2468337) 652 0 R (id2468358) 653 0 R (id2468377) 654 0 R (id2468474) 660 0 R (id2468506) 661 0 R (id2468532) 662 0 R (id2468564) 668 0 R (id2468588) 669 0 R (id2468599) 670 0 R (id2468613) 671 0 R (id2468621) 677 0 R (id2468652) 684 0 R (id2469316) 694 0 R (id2469321) 695 0 R (id2470486) 723 0 R (id2470498) 724 0 R (id2470910) 745 0 R (id2471473) 761 0 R (id2471489) 762 0 R (id2471523) 763 0 R (id2471539) 769 0 R (id2471547) 770 0 R (id2471587) 771 0 R (id2471639) 772 0 R (id2471683) 779 0 R (id2471697) 780 0 R (id2471746) 781 0 R (id2471880) 787 0 R (id2471947) 788 0 R (id2472158) 789 0 R (id2472228) 805 0 R (id2472491) 807 0 R (id2472512) 808 0 R (id2472544) 815 0 R (id2472682) 828 0 R (id2473315) 836 0 R (id2473341) 837 0 R (id2473435) 842 0 R (id2473450) 843 0 R (id2473479) 844 0 R (id2473624) 851 0 R (id2473989) 857 0 R (id2474030) 859 0 R (id2474157) 861 0 R (id2474435) 869 0 R (id2474450) 870 0 R (id2474472) 871 0 R (id2474493) 872 0 R (id2474633) 881 0 R (id2474759) 882 0 R (id2474948) 883 0 R (id2475505) 898 0 R (id2476033) 904 0 R (id2476105) 905 0 R (id2476305) 913 0 R (id2476348) 914 0 R (id2476363) 915 0 R (id2477910) 935 0 R (id2479046) 957 0 R (id2479096) 959 0 R (id2479275) 968 0 R (id2479364) 974 0 R (id2480179) 986 0 R (id2480195) 992 0 R (id2482457) 1000 0 R (id2482795) 1014 0 R (id2483261) 1029 0 R (id2483956) 1043 0 R (id2484004) 1044 0 R (id2484086) 1046 0 R (id2485301) 1059 0 R (id2485307) 1060 0 R (id2485312) 1061 0 R (id2485682) 1072 0 R (id2485713) 1073 0 R (id2486680) 1106 0 R (id2486839) 1112 0 R (id2486857) 1113 0 R (id2486878) 1116 0 R (id2487018) 1118 0 R (id2487805) 1124 0 R (id2487914) 1130 0 R (id2487936) 1131 0 R (id2488156) 1138 0 R (id2488272) 1140 0 R (id2488290) 1141 0 R (id2488663) 1144 0 R (id2488769) 1150 0 R (id2488782) 1151 0 R (id2488942) 1153 0 R (id2488962) 1154 0 R (id2489017) 1158 0 R (id2489080) 1163 0 R (id2489111) 1164 0 R (id2489172) 1165 0 R (id2489568) 1191 0 R (id2489712) 1192 0 R (id2489769) 1193 0 R (id2489976) 1199 0 R (id2489981) 1200 0 R (id2489993) 1201 0 R (id2490010) 1202 0 R (id2490072) 1214 0 R (id2490077) 1215 0 R (id2490268) 1221 0 R (id2490580) 1223 0 R (id2490993) 1237 0 R (id2490995) 1239 0 R (id2491003) 1244 0 R (id2491027) 1240 0 R (id2491050) 1242 0 R (id2491088) 1253 0 R (id2491113) 1255 0 R (id2491139) 1247 0 R (id2491163) 1249 0 R (id2491187) 1251 0 R (id2491242) 1257 0 R (id2491303) 1260 0 R (id2491318) 1261 0 R (id2491356) 1263 0 R (id2491396) 1265 0 R (id2491424) 1268 0 R (id2491432) 1269 0 R (id2491458) 1271 0 R (id2491525) 1273 0 R (id2491561) 1276 0 R (id2491566) 1277 0 R (id2491624) 1279 0 R (id2491661) 1292 0 R (id2491697) 1281 0 R (id2491751) 1288 0 R (id2491790) 1290 0 R (id2491817) 1294 0 R (id2491844) 1297 0 R (id2491851) 1298 0 R (id2491877) 1300 0 R (id2491900) 1302 0 R (id2491922) 1304 0 R (id2491969) 1307 0 R (id2491976) 1308 0 R (id2492002) 1310 0 R (id2492028) 1312 0 R (id2492065) 1314 0 R (id2492104) 1317 0 R (id2492124) 1318 0 R (id2492147) 1320 0 R (id2492171) 1322 0 R (id2492196) 1324 0 R (id2492218) 1326 0 R (id2492264) 1328 0 R (id2492289) 1331 0 R (id2492295) 1332 0 R (id2492368) 1339 0 R (id2492377) 1341 0 R (id2492379) 1343 0 R (incremental_zone_transfers) 742 0 R (internet_drafts) 1334 0 R (ipv6addresses) 809 0 R (journal) 735 0 R (lwresd) 816 0 R (notify) 731 0 R (options) 924 0 R (page.1) 593 0 R (page.10) 689 0 R (page.11) 700 0 R (page.12) 708 0 R (page.13) 715 0 R (page.14) 722 0 R (page.15) 729 0 R (page.16) 741 0 R (page.17) 750 0 R (page.18) 755 0 R (page.19) 759 0 R (page.2) 605 0 R (page.20) 768 0 R (page.21) 778 0 R (page.22) 786 0 R (page.23) 794 0 R (page.24) 804 0 R (page.25) 813 0 R (page.26) 821 0 R (page.27) 825 0 R (page.28) 835 0 R (page.29) 841 0 R (page.3) 612 0 R (page.30) 849 0 R (page.31) 856 0 R (page.32) 866 0 R (page.33) 880 0 R (page.34) 887 0 R (page.35) 891 0 R (page.36) 897 0 R (page.37) 903 0 R (page.38) 912 0 R (page.39) 919 0 R (page.4) 631 0 R (page.40) 923 0 R (page.41) 928 0 R (page.42) 934 0 R (page.43) 940 0 R (page.44) 952 0 R (page.45) 956 0 R (page.46) 966 0 R (page.47) 973 0 R (page.48) 981 0 R (page.49) 985 0 R (page.5) 648 0 R (page.50) 991 0 R (page.51) 999 0 R (page.52) 1005 0 R (page.53) 1012 0 R (page.54) 1019 0 R (page.55) 1028 0 R (page.56) 1035 0 R (page.57) 1041 0 R (page.58) 1050 0 R (page.59) 1054 0 R (page.6) 659 0 R (page.60) 1058 0 R (page.61) 1066 0 R (page.62) 1071 0 R (page.63) 1083 0 R (page.64) 1098 0 R (page.65) 1111 0 R (page.66) 1123 0 R (page.67) 1128 0 R (page.68) 1137 0 R (page.69) 1149 0 R (page.7) 666 0 R (page.70) 1162 0 R (page.71) 1170 0 R (page.72) 1174 0 R (page.73) 1178 0 R (page.74) 1187 0 R (page.75) 1197 0 R (page.76) 1208 0 R (page.77) 1212 0 R (page.78) 1219 0 R (page.79) 1232 0 R (page.8) 676 0 R (page.80) 1287 0 R (page.81) 1338 0 R (page.9) 681 0 R (proposed_standards) 746 0 R (rfcs) 644 0 R (rndc) 876 0 R (rrset_ordering) 696 0 R (sample_configuration) 683 0 R (section*.1) 1236 0 R (section*.10) 1330 0 R (section*.11) 1340 0 R (section*.2) 1238 0 R (section*.3) 1246 0 R (section*.4) 1259 0 R (section*.5) 1267 0 R (section*.6) 1275 0 R (section*.7) 1296 0 R (section*.8) 1306 0 R (section*.9) 1316 0 R (section.1.1) 10 0 R (section.1.2) 14 0 R (section.1.3) 18 0 R (section.1.4) 22 0 R (section.2.1) 70 0 R (section.2.2) 74 0 R (section.2.3) 78 0 R (section.2.4) 82 0 R (section.2.5) 86 0 R (section.3.1) 94 0 R (section.3.2) 106 0 R (section.3.3) 110 0 R (section.4.1) 134 0 R (section.4.2) 138 0 R (section.4.3) 146 0 R (section.4.4) 150 0 R (section.4.5) 154 0 R (section.4.6) 190 0 R (section.4.7) 194 0 R (section.4.8) 198 0 R (section.4.9) 214 0 R (section.5.1) 230 0 R (section.5.2) 234 0 R (section.6.1) 242 0 R (section.6.2) 270 0 R (section.6.3) 462 0 R (section.7.1) 514 0 R (section.7.2) 518 0 R (section.7.3) 530 0 R (section.8.1) 538 0 R (section.8.2) 546 0 R (section.8.3) 550 0 R (section.A.1) 558 0 R (section.A.2) 566 0 R (section.A.3) 574 0 R (server_statement_definition_and_usage) 948 0 R (server_statement_grammar) 1036 0 R (statsfile) 930 0 R (subsection.1.4.1) 26 0 R (subsection.1.4.2) 30 0 R (subsection.1.4.3) 34 0 R (subsection.1.4.4) 38 0 R (subsection.1.4.5) 54 0 R (subsection.1.4.6) 62 0 R (subsection.3.1.1) 98 0 R (subsection.3.1.2) 102 0 R (subsection.3.3.1) 114 0 R (subsection.3.3.2) 126 0 R (subsection.4.2.1) 142 0 R (subsection.4.5.1) 158 0 R (subsection.4.5.2) 170 0 R (subsection.4.5.3) 174 0 R (subsection.4.5.4) 178 0 R (subsection.4.5.5) 182 0 R (subsection.4.5.6) 186 0 R (subsection.4.8.1) 202 0 R (subsection.4.8.2) 206 0 R (subsection.4.8.3) 210 0 R (subsection.4.9.1) 218 0 R (subsection.4.9.2) 222 0 R (subsection.6.1.1) 246 0 R (subsection.6.1.2) 258 0 R (subsection.6.2.1) 274 0 R (subsection.6.2.10) 310 0 R (subsection.6.2.11) 322 0 R (subsection.6.2.12) 326 0 R (subsection.6.2.13) 330 0 R (subsection.6.2.14) 334 0 R (subsection.6.2.15) 338 0 R (subsection.6.2.16) 342 0 R (subsection.6.2.17) 414 0 R (subsection.6.2.18) 418 0 R (subsection.6.2.19) 422 0 R (subsection.6.2.2) 278 0 R (subsection.6.2.20) 426 0 R (subsection.6.2.21) 430 0 R (subsection.6.2.22) 434 0 R (subsection.6.2.23) 438 0 R (subsection.6.2.24) 442 0 R (subsection.6.2.3) 282 0 R (subsection.6.2.4) 286 0 R (subsection.6.2.5) 290 0 R (subsection.6.2.6) 294 0 R (subsection.6.2.7) 298 0 R (subsection.6.2.8) 302 0 R (subsection.6.2.9) 306 0 R (subsection.6.3.1) 466 0 R (subsection.6.3.2) 478 0 R (subsection.6.3.3) 482 0 R (subsection.6.3.4) 486 0 R (subsection.6.3.5) 490 0 R (subsection.6.3.6) 506 0 R (subsection.7.2.1) 522 0 R (subsection.7.2.2) 526 0 R (subsection.8.1.1) 542 0 R (subsection.A.1.1) 562 0 R (subsection.A.2.1) 570 0 R (subsection.A.3.1) 578 0 R (subsection.A.3.2) 582 0 R (subsection.A.3.3) 586 0 R (subsubsection.1.4.4.1) 42 0 R (subsubsection.1.4.4.2) 46 0 R (subsubsection.1.4.4.3) 50 0 R (subsubsection.1.4.5.1) 58 0 R (subsubsection.3.3.1.1) 118 0 R (subsubsection.3.3.1.2) 122 0 R (subsubsection.4.5.1.1) 162 0 R (subsubsection.4.5.1.2) 166 0 R (subsubsection.6.1.1.1) 250 0 R (subsubsection.6.1.1.2) 254 0 R (subsubsection.6.1.2.1) 262 0 R (subsubsection.6.1.2.2) 266 0 R (subsubsection.6.2.10.1) 314 0 R (subsubsection.6.2.10.2) 318 0 R (subsubsection.6.2.16.1) 346 0 R (subsubsection.6.2.16.10) 382 0 R (subsubsection.6.2.16.11) 386 0 R (subsubsection.6.2.16.12) 390 0 R (subsubsection.6.2.16.13) 394 0 R (subsubsection.6.2.16.14) 398 0 R (subsubsection.6.2.16.15) 402 0 R (subsubsection.6.2.16.16) 406 0 R (subsubsection.6.2.16.17) 410 0 R (subsubsection.6.2.16.2) 350 0 R (subsubsection.6.2.16.3) 354 0 R (subsubsection.6.2.16.4) 358 0 R (subsubsection.6.2.16.5) 362 0 R (subsubsection.6.2.16.6) 366 0 R (subsubsection.6.2.16.7) 370 0 R (subsubsection.6.2.16.8) 374 0 R (subsubsection.6.2.16.9) 378 0 R (subsubsection.6.2.24.1) 446 0 R (subsubsection.6.2.24.2) 450 0 R (subsubsection.6.2.24.3) 454 0 R (subsubsection.6.2.24.4) 458 0 R (subsubsection.6.3.1.1) 470 0 R (subsubsection.6.3.1.2) 474 0 R (subsubsection.6.3.5.1) 494 0 R (subsubsection.6.3.5.2) 498 0 R (subsubsection.6.3.5.3) 502 0 R (table.1.1) 621 0 R (table.1.2) 636 0 R (table.3.1) 692 0 R (table.3.2) 725 0 R (table.6.1) 829 0 R (table.6.10) 1117 0 R (table.6.11) 1119 0 R (table.6.12) 1129 0 R (table.6.13) 1132 0 R (table.6.14) 1139 0 R (table.6.15) 1142 0 R (table.6.16) 1145 0 R (table.6.17) 1152 0 R (table.6.18) 1166 0 R (table.6.2) 852 0 R (table.6.3) 860 0 R (table.6.4) 899 0 R (table.6.5) 936 0 R (table.6.6) 1015 0 R (table.6.7) 1030 0 R (table.6.8) 1062 0 R (table.6.9) 1107 0 R (table.A.1) 1222 0 R (table.A.2) 1224 0 R (the_category_phrase) 893 0 R (the_sortlist_statement) 1006 0 R (topology) 1001 0 R (tsig) 760 0 R (tuning) 1020 0 R (types_of_resource_records_and_when_to_use_them) 643 0 R (view_statement_grammar) 1024 0 R (zone_statement_grammar) 962 0 R (zone_transfers) 737 0 R]
 /Limits [(Access_Control_Lists) (zone_transfers)]
 >> endobj
-1358 0 obj <<
-/Kids [1357 0 R]
+1366 0 obj <<
+/Kids [1365 0 R]
 >> endobj
-1359 0 obj <<
-/Dests 1358 0 R
+1367 0 obj <<
+/Dests 1366 0 R
 >> endobj
-1360 0 obj <<
+1368 0 obj <<
 /Type /Catalog
-/Pages 1355 0 R
-/Outlines 1356 0 R
-/Names 1359 0 R
+/Pages 1363 0 R
+/Outlines 1364 0 R
+/Names 1367 0 R
 /PageMode /UseOutlines 
 /OpenAction 589 0 R
 >> endobj
-1361 0 obj <<
+1369 0 obj <<
 /Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfeTeX-1.21a)/Keywords()
-/CreationDate (D:20051104123603+11'00')
+/CreationDate (D:20060525181314+10'00')
 /PTEX.Fullbanner (This is pdfeTeX, Version 3.141592-1.21a-2.2 (Web2C 7.5.4) kpathsea version 3.5.4)
 >> endobj
 xref
-0 1362
+0 1370
 0000000001 65535 f 
 0000000002 00000 f 
 0000000003 00000 f 
 0000000004 00000 f 
 0000000000 00000 f 
 0000000009 00000 n 
-0000018859 00000 n 
-0000483529 00000 n 
+0000018864 00000 n 
+0000489741 00000 n 
 0000000054 00000 n 
 0000000086 00000 n 
-0000018983 00000 n 
-0000483457 00000 n 
+0000018988 00000 n 
+0000489669 00000 n 
 0000000133 00000 n 
 0000000173 00000 n 
-0000019108 00000 n 
-0000483371 00000 n 
+0000019113 00000 n 
+0000489583 00000 n 
 0000000221 00000 n 
 0000000273 00000 n 
-0000019233 00000 n 
-0000483285 00000 n 
+0000019238 00000 n 
+0000489497 00000 n 
 0000000321 00000 n 
 0000000377 00000 n 
-0000023668 00000 n 
-0000483175 00000 n 
+0000023673 00000 n 
+0000489387 00000 n 
 0000000425 00000 n 
 0000000478 00000 n 
-0000023792 00000 n 
-0000483101 00000 n 
+0000023797 00000 n 
+0000489313 00000 n 
 0000000531 00000 n 
 0000000572 00000 n 
-0000023917 00000 n 
-0000483014 00000 n 
+0000023922 00000 n 
+0000489226 00000 n 
 0000000625 00000 n 
 0000000674 00000 n 
-0000024042 00000 n 
-0000482927 00000 n 
+0000024047 00000 n 
+0000489139 00000 n 
 0000000727 00000 n 
 0000000757 00000 n 
-0000028190 00000 n 
-0000482803 00000 n 
+0000028195 00000 n 
+0000489015 00000 n 
 0000000810 00000 n 
 0000000861 00000 n 
-0000028315 00000 n 
-0000482729 00000 n 
+0000028320 00000 n 
+0000488941 00000 n 
 0000000919 00000 n 
 0000000964 00000 n 
-0000028440 00000 n 
-0000482642 00000 n 
+0000028445 00000 n 
+0000488854 00000 n 
 0000001022 00000 n 
 0000001062 00000 n 
-0000028565 00000 n 
-0000482568 00000 n 
+0000028570 00000 n 
+0000488780 00000 n 
 0000001120 00000 n 
 0000001162 00000 n 
-0000031474 00000 n 
-0000482444 00000 n 
+0000031479 00000 n 
+0000488656 00000 n 
 0000001215 00000 n 
 0000001260 00000 n 
-0000031599 00000 n 
-0000482383 00000 n 
+0000031604 00000 n 
+0000488595 00000 n 
 0000001318 00000 n 
 0000001355 00000 n 
-0000031724 00000 n 
-0000482309 00000 n 
+0000031729 00000 n 
+0000488521 00000 n 
 0000001408 00000 n 
 0000001463 00000 n 
-0000034112 00000 n 
-0000482184 00000 n 
+0000034117 00000 n 
+0000488396 00000 n 
 0000001509 00000 n 
 0000001556 00000 n 
-0000034237 00000 n 
-0000482110 00000 n 
+0000034242 00000 n 
+0000488322 00000 n 
 0000001604 00000 n 
 0000001648 00000 n 
-0000034362 00000 n 
-0000482023 00000 n 
+0000034367 00000 n 
+0000488235 00000 n 
 0000001696 00000 n 
 0000001735 00000 n 
-0000034485 00000 n 
-0000481936 00000 n 
+0000034490 00000 n 
+0000488148 00000 n 
 0000001783 00000 n 
 0000001825 00000 n 
-0000034609 00000 n 
-0000481849 00000 n 
+0000034614 00000 n 
+0000488061 00000 n 
 0000001873 00000 n 
 0000001936 00000 n 
-0000035645 00000 n 
-0000481775 00000 n 
+0000035650 00000 n 
+0000487987 00000 n 
 0000001984 00000 n 
 0000002034 00000 n 
-0000037323 00000 n 
-0000481647 00000 n 
+0000037328 00000 n 
+0000487859 00000 n 
 0000002080 00000 n 
 0000002126 00000 n 
-0000037447 00000 n 
-0000481534 00000 n 
+0000037452 00000 n 
+0000487746 00000 n 
 0000002174 00000 n 
 0000002218 00000 n 
-0000037572 00000 n 
-0000481458 00000 n 
+0000037577 00000 n 
+0000487670 00000 n 
 0000002271 00000 n 
 0000002323 00000 n 
-0000037697 00000 n 
-0000481381 00000 n 
+0000037702 00000 n 
+0000487593 00000 n 
 0000002377 00000 n 
 0000002436 00000 n 
-0000040313 00000 n 
-0000481290 00000 n 
+0000040318 00000 n 
+0000487502 00000 n 
 0000002485 00000 n 
 0000002523 00000 n 
-0000040564 00000 n 
-0000481173 00000 n 
+0000040569 00000 n 
+0000487385 00000 n 
 0000002572 00000 n 
 0000002618 00000 n 
-0000040690 00000 n 
-0000481055 00000 n 
+0000040695 00000 n 
+0000487267 00000 n 
 0000002672 00000 n 
 0000002739 00000 n 
-0000043869 00000 n 
-0000480976 00000 n 
+0000043874 00000 n 
+0000487188 00000 n 
 0000002798 00000 n 
 0000002842 00000 n 
-0000043995 00000 n 
-0000480897 00000 n 
+0000044000 00000 n 
+0000487109 00000 n 
 0000002901 00000 n 
 0000002949 00000 n 
-0000053818 00000 n 
-0000480818 00000 n 
+0000053886 00000 n 
+0000487030 00000 n 
 0000003003 00000 n 
 0000003036 00000 n 
-0000057084 00000 n 
-0000480686 00000 n 
+0000057152 00000 n 
+0000486898 00000 n 
 0000003083 00000 n 
 0000003126 00000 n 
-0000057210 00000 n 
-0000480607 00000 n 
+0000057278 00000 n 
+0000486819 00000 n 
 0000003175 00000 n 
 0000003205 00000 n 
-0000057336 00000 n 
-0000480475 00000 n 
+0000057404 00000 n 
+0000486687 00000 n 
 0000003254 00000 n 
 0000003292 00000 n 
-0000057461 00000 n 
-0000480410 00000 n 
+0000057529 00000 n 
+0000486622 00000 n 
 0000003346 00000 n 
 0000003388 00000 n 
-0000061908 00000 n 
-0000480317 00000 n 
+0000061976 00000 n 
+0000486529 00000 n 
 0000003437 00000 n 
 0000003496 00000 n 
-0000062034 00000 n 
-0000480224 00000 n 
+0000062102 00000 n 
+0000486436 00000 n 
 0000003545 00000 n 
 0000003578 00000 n 
-0000068735 00000 n 
-0000480092 00000 n 
+0000068808 00000 n 
+0000486304 00000 n 
 0000003627 00000 n 
 0000003655 00000 n 
-0000068861 00000 n 
-0000479974 00000 n 
+0000068934 00000 n 
+0000486186 00000 n 
 0000003709 00000 n 
 0000003778 00000 n 
-0000068987 00000 n 
-0000479895 00000 n 
+0000069060 00000 n 
+0000486107 00000 n 
 0000003837 00000 n 
 0000003885 00000 n 
-0000069113 00000 n 
-0000479816 00000 n 
+0000069186 00000 n 
+0000486028 00000 n 
 0000003944 00000 n 
 0000003989 00000 n 
-0000072115 00000 n 
-0000479723 00000 n 
+0000072188 00000 n 
+0000485935 00000 n 
 0000004043 00000 n 
 0000004111 00000 n 
-0000072241 00000 n 
-0000479630 00000 n 
+0000072314 00000 n 
+0000485842 00000 n 
 0000004165 00000 n 
 0000004235 00000 n 
-0000072367 00000 n 
-0000479537 00000 n 
+0000072440 00000 n 
+0000485749 00000 n 
 0000004289 00000 n 
 0000004352 00000 n 
-0000072493 00000 n 
-0000479444 00000 n 
+0000072566 00000 n 
+0000485656 00000 n 
 0000004406 00000 n 
 0000004461 00000 n 
-0000076214 00000 n 
-0000479365 00000 n 
+0000076286 00000 n 
+0000485577 00000 n 
 0000004515 00000 n 
 0000004547 00000 n 
-0000076340 00000 n 
-0000479272 00000 n 
+0000076412 00000 n 
+0000485484 00000 n 
 0000004596 00000 n 
 0000004624 00000 n 
-0000076465 00000 n 
-0000479179 00000 n 
+0000076537 00000 n 
+0000485391 00000 n 
 0000004673 00000 n 
 0000004705 00000 n 
-0000076591 00000 n 
-0000479047 00000 n 
+0000076663 00000 n 
+0000485259 00000 n 
 0000004754 00000 n 
 0000004784 00000 n 
-0000080038 00000 n 
-0000478968 00000 n 
+0000080118 00000 n 
+0000485180 00000 n 
 0000004838 00000 n 
 0000004879 00000 n 
-0000080163 00000 n 
-0000478875 00000 n 
+0000080243 00000 n 
+0000485087 00000 n 
 0000004933 00000 n 
 0000004975 00000 n 
-0000080289 00000 n 
-0000478796 00000 n 
+0000080369 00000 n 
+0000485008 00000 n 
 0000005029 00000 n 
 0000005074 00000 n 
-0000082997 00000 n 
-0000478678 00000 n 
+0000087812 00000 n 
+0000484890 00000 n 
 0000005123 00000 n 
 0000005169 00000 n 
-0000083123 00000 n 
-0000478599 00000 n 
+0000087938 00000 n 
+0000484811 00000 n 
 0000005223 00000 n 
 0000005283 00000 n 
-0000083249 00000 n 
-0000478520 00000 n 
+0000088064 00000 n 
+0000484732 00000 n 
 0000005337 00000 n 
 0000005406 00000 n 
-0000086059 00000 n 
-0000478387 00000 n 
+0000090499 00000 n 
+0000484599 00000 n 
 0000005453 00000 n 
 0000005506 00000 n 
-0000086185 00000 n 
-0000478308 00000 n 
+0000090625 00000 n 
+0000484520 00000 n 
 0000005555 00000 n 
 0000005611 00000 n 
-0000086311 00000 n 
-0000478229 00000 n 
+0000090751 00000 n 
+0000484441 00000 n 
 0000005660 00000 n 
 0000005709 00000 n 
-0000090413 00000 n 
-0000478096 00000 n 
+0000094853 00000 n 
+0000484308 00000 n 
 0000005756 00000 n 
 0000005808 00000 n 
-0000090539 00000 n 
-0000477978 00000 n 
+0000094979 00000 n 
+0000484190 00000 n 
 0000005857 00000 n 
 0000005908 00000 n 
-0000094681 00000 n 
-0000477860 00000 n 
+0000099121 00000 n 
+0000484072 00000 n 
 0000005962 00000 n 
 0000006007 00000 n 
-0000094806 00000 n 
-0000477781 00000 n 
+0000099246 00000 n 
+0000483993 00000 n 
 0000006066 00000 n 
 0000006100 00000 n 
-0000094931 00000 n 
-0000477702 00000 n 
+0000099371 00000 n 
+0000483914 00000 n 
 0000006159 00000 n 
 0000006207 00000 n 
-0000098209 00000 n 
-0000477584 00000 n 
+0000102649 00000 n 
+0000483796 00000 n 
 0000006261 00000 n 
 0000006301 00000 n 
-0000098335 00000 n 
-0000477505 00000 n 
+0000102775 00000 n 
+0000483717 00000 n 
 0000006360 00000 n 
 0000006394 00000 n 
-0000098461 00000 n 
-0000477426 00000 n 
+0000102901 00000 n 
+0000483638 00000 n 
 0000006453 00000 n 
 0000006501 00000 n 
-0000102189 00000 n 
-0000477293 00000 n 
+0000106627 00000 n 
+0000483505 00000 n 
 0000006550 00000 n 
 0000006600 00000 n 
-0000105995 00000 n 
-0000477214 00000 n 
+0000110465 00000 n 
+0000483426 00000 n 
 0000006654 00000 n 
 0000006701 00000 n 
-0000106121 00000 n 
-0000477121 00000 n 
+0000110591 00000 n 
+0000483333 00000 n 
 0000006755 00000 n 
 0000006815 00000 n 
-0000106371 00000 n 
-0000477028 00000 n 
+0000110841 00000 n 
+0000483240 00000 n 
 0000006869 00000 n 
 0000006921 00000 n 
-0000106497 00000 n 
-0000476935 00000 n 
+0000110967 00000 n 
+0000483147 00000 n 
 0000006975 00000 n 
 0000007040 00000 n 
-0000111147 00000 n 
-0000476842 00000 n 
+0000115594 00000 n 
+0000483054 00000 n 
 0000007094 00000 n 
 0000007145 00000 n 
-0000111273 00000 n 
-0000476749 00000 n 
+0000115720 00000 n 
+0000482961 00000 n 
 0000007199 00000 n 
 0000007263 00000 n 
-0000111399 00000 n 
-0000476656 00000 n 
+0000115846 00000 n 
+0000482868 00000 n 
 0000007317 00000 n 
 0000007364 00000 n 
-0000111525 00000 n 
-0000476563 00000 n 
+0000115972 00000 n 
+0000482775 00000 n 
 0000007418 00000 n 
 0000007478 00000 n 
-0000114467 00000 n 
-0000476470 00000 n 
+0000118914 00000 n 
+0000482682 00000 n 
 0000007532 00000 n 
 0000007583 00000 n 
-0000114593 00000 n 
-0000476338 00000 n 
+0000119040 00000 n 
+0000482550 00000 n 
 0000007638 00000 n 
 0000007703 00000 n 
-0000114719 00000 n 
-0000476259 00000 n 
+0000119166 00000 n 
+0000482471 00000 n 
 0000007763 00000 n 
 0000007810 00000 n 
-0000125127 00000 n 
-0000476180 00000 n 
+0000129579 00000 n 
+0000482392 00000 n 
 0000007870 00000 n 
 0000007918 00000 n 
-0000128845 00000 n 
-0000476087 00000 n 
+0000133288 00000 n 
+0000482299 00000 n 
 0000007973 00000 n 
 0000008023 00000 n 
-0000128971 00000 n 
-0000475994 00000 n 
+0000133414 00000 n 
+0000482206 00000 n 
 0000008078 00000 n 
 0000008141 00000 n 
-0000130711 00000 n 
-0000475901 00000 n 
+0000135154 00000 n 
+0000482113 00000 n 
 0000008196 00000 n 
 0000008248 00000 n 
-0000130837 00000 n 
-0000475808 00000 n 
+0000135280 00000 n 
+0000482020 00000 n 
 0000008303 00000 n 
 0000008368 00000 n 
-0000130963 00000 n 
-0000475715 00000 n 
+0000135406 00000 n 
+0000481927 00000 n 
 0000008423 00000 n 
 0000008475 00000 n 
-0000136313 00000 n 
-0000475582 00000 n 
+0000140756 00000 n 
+0000481794 00000 n 
 0000008530 00000 n 
 0000008595 00000 n 
-0000140379 00000 n 
-0000475503 00000 n 
+0000144848 00000 n 
+0000481715 00000 n 
 0000008655 00000 n 
 0000008699 00000 n 
-0000159492 00000 n 
-0000475410 00000 n 
+0000162335 00000 n 
+0000481622 00000 n 
 0000008759 00000 n 
 0000008798 00000 n 
-0000159618 00000 n 
-0000475317 00000 n 
+0000162461 00000 n 
+0000481529 00000 n 
 0000008858 00000 n 
 0000008905 00000 n 
-0000159743 00000 n 
-0000475224 00000 n 
+0000162586 00000 n 
+0000481436 00000 n 
 0000008965 00000 n 
 0000009008 00000 n 
-0000163657 00000 n 
-0000475131 00000 n 
+0000166500 00000 n 
+0000481343 00000 n 
 0000009068 00000 n 
 0000009107 00000 n 
-0000166745 00000 n 
-0000475038 00000 n 
+0000169268 00000 n 
+0000481250 00000 n 
 0000009167 00000 n 
 0000009209 00000 n 
-0000166871 00000 n 
-0000474945 00000 n 
+0000173301 00000 n 
+0000481157 00000 n 
 0000009269 00000 n 
 0000009312 00000 n 
-0000174775 00000 n 
-0000474852 00000 n 
+0000176853 00000 n 
+0000481064 00000 n 
 0000009372 00000 n 
 0000009419 00000 n 
-0000174899 00000 n 
-0000474759 00000 n 
+0000180880 00000 n 
+0000480971 00000 n 
 0000009479 00000 n 
 0000009540 00000 n 
-0000178845 00000 n 
-0000474666 00000 n 
+0000181006 00000 n 
+0000480878 00000 n 
 0000009601 00000 n 
 0000009653 00000 n 
-0000178971 00000 n 
-0000474573 00000 n 
+0000184605 00000 n 
+0000480785 00000 n 
 0000009714 00000 n 
 0000009767 00000 n 
-0000181984 00000 n 
-0000474480 00000 n 
+0000184732 00000 n 
+0000480692 00000 n 
 0000009828 00000 n 
 0000009866 00000 n 
-0000185943 00000 n 
-0000474387 00000 n 
+0000188741 00000 n 
+0000480599 00000 n 
 0000009927 00000 n 
 0000009979 00000 n 
-0000189321 00000 n 
-0000474294 00000 n 
+0000191881 00000 n 
+0000480506 00000 n 
 0000010040 00000 n 
 0000010084 00000 n 
-0000189579 00000 n 
-0000474201 00000 n 
+0000196252 00000 n 
+0000480413 00000 n 
 0000010145 00000 n 
 0000010181 00000 n 
-0000194073 00000 n 
-0000474108 00000 n 
+0000196381 00000 n 
+0000480320 00000 n 
 0000010242 00000 n 
 0000010305 00000 n 
-0000197229 00000 n 
-0000474029 00000 n 
+0000199806 00000 n 
+0000480241 00000 n 
 0000010366 00000 n 
 0000010415 00000 n 
-0000197486 00000 n 
-0000473936 00000 n 
+0000204023 00000 n 
+0000480148 00000 n 
 0000010470 00000 n 
 0000010521 00000 n 
-0000197615 00000 n 
-0000473843 00000 n 
+0000204152 00000 n 
+0000480055 00000 n 
 0000010576 00000 n 
 0000010640 00000 n 
-0000202325 00000 n 
-0000473750 00000 n 
+0000207910 00000 n 
+0000479962 00000 n 
 0000010695 00000 n 
 0000010752 00000 n 
-0000202454 00000 n 
-0000473657 00000 n 
+0000208039 00000 n 
+0000479869 00000 n 
 0000010807 00000 n 
 0000010877 00000 n 
-0000206017 00000 n 
-0000473564 00000 n 
+0000208168 00000 n 
+0000479776 00000 n 
 0000010932 00000 n 
 0000010981 00000 n 
-0000206146 00000 n 
-0000473471 00000 n 
+0000208297 00000 n 
+0000479683 00000 n 
 0000011036 00000 n 
 0000011098 00000 n 
-0000207911 00000 n 
-0000473378 00000 n 
+0000210836 00000 n 
+0000479590 00000 n 
 0000011153 00000 n 
 0000011202 00000 n 
-0000211360 00000 n 
-0000473260 00000 n 
+0000213935 00000 n 
+0000479472 00000 n 
 0000011257 00000 n 
 0000011319 00000 n 
-0000211489 00000 n 
-0000473181 00000 n 
+0000214064 00000 n 
+0000479393 00000 n 
 0000011379 00000 n 
 0000011418 00000 n 
-0000216452 00000 n 
-0000473088 00000 n 
+0000223024 00000 n 
+0000479300 00000 n 
 0000011478 00000 n 
 0000011512 00000 n 
-0000216581 00000 n 
-0000472995 00000 n 
+0000223153 00000 n 
+0000479207 00000 n 
 0000011572 00000 n 
 0000011613 00000 n 
-0000226764 00000 n 
-0000472916 00000 n 
+0000233339 00000 n 
+0000479128 00000 n 
 0000011673 00000 n 
 0000011725 00000 n 
-0000230938 00000 n 
-0000472798 00000 n 
+0000237382 00000 n 
+0000479010 00000 n 
 0000011774 00000 n 
 0000011807 00000 n 
-0000231067 00000 n 
-0000472680 00000 n 
+0000237511 00000 n 
+0000478892 00000 n 
 0000011861 00000 n 
 0000011933 00000 n 
-0000231195 00000 n 
-0000472601 00000 n 
+0000237639 00000 n 
+0000478813 00000 n 
 0000011992 00000 n 
 0000012036 00000 n 
-0000238969 00000 n 
-0000472522 00000 n 
+0000245192 00000 n 
+0000478734 00000 n 
 0000012095 00000 n 
 0000012148 00000 n 
-0000242553 00000 n 
-0000472429 00000 n 
+0000248957 00000 n 
+0000478641 00000 n 
 0000012202 00000 n 
 0000012252 00000 n 
-0000245916 00000 n 
-0000472336 00000 n 
+0000249215 00000 n 
+0000478548 00000 n 
 0000012306 00000 n 
 0000012344 00000 n 
-0000246174 00000 n 
-0000472243 00000 n 
+0000252462 00000 n 
+0000478455 00000 n 
 0000012398 00000 n 
 0000012447 00000 n 
-0000246432 00000 n 
-0000472111 00000 n 
+0000252721 00000 n 
+0000478323 00000 n 
 0000012501 00000 n 
 0000012553 00000 n 
-0000246561 00000 n 
-0000472032 00000 n 
+0000252850 00000 n 
+0000478244 00000 n 
 0000012612 00000 n 
 0000012664 00000 n 
-0000249442 00000 n 
-0000471939 00000 n 
+0000252979 00000 n 
+0000478151 00000 n 
 0000012723 00000 n 
 0000012776 00000 n 
-0000249571 00000 n 
-0000471860 00000 n 
+0000256633 00000 n 
+0000478072 00000 n 
 0000012835 00000 n 
 0000012884 00000 n 
-0000249700 00000 n 
-0000471781 00000 n 
+0000256762 00000 n 
+0000477993 00000 n 
 0000012938 00000 n 
 0000013018 00000 n 
-0000255562 00000 n 
-0000471648 00000 n 
+0000261265 00000 n 
+0000477860 00000 n 
 0000013065 00000 n 
 0000013117 00000 n 
-0000255691 00000 n 
-0000471569 00000 n 
+0000261394 00000 n 
+0000477781 00000 n 
 0000013166 00000 n 
 0000013210 00000 n 
-0000259402 00000 n 
-0000471437 00000 n 
+0000265106 00000 n 
+0000477649 00000 n 
 0000013259 00000 n 
 0000013321 00000 n 
-0000259531 00000 n 
-0000471358 00000 n 
+0000265235 00000 n 
+0000477570 00000 n 
 0000013375 00000 n 
 0000013423 00000 n 
-0000259660 00000 n 
-0000471279 00000 n 
+0000265364 00000 n 
+0000477491 00000 n 
 0000013477 00000 n 
 0000013528 00000 n 
-0000259789 00000 n 
-0000471200 00000 n 
+0000265493 00000 n 
+0000477412 00000 n 
 0000013577 00000 n 
 0000013624 00000 n 
-0000262719 00000 n 
-0000471067 00000 n 
+0000268423 00000 n 
+0000477279 00000 n 
 0000013671 00000 n 
 0000013708 00000 n 
-0000262848 00000 n 
-0000470949 00000 n 
+0000268552 00000 n 
+0000477161 00000 n 
 0000013757 00000 n 
 0000013796 00000 n 
-0000262977 00000 n 
-0000470884 00000 n 
+0000268681 00000 n 
+0000477096 00000 n 
 0000013850 00000 n 
 0000013928 00000 n 
-0000263106 00000 n 
-0000470791 00000 n 
+0000268810 00000 n 
+0000477003 00000 n 
 0000013977 00000 n 
 0000014044 00000 n 
-0000263235 00000 n 
-0000470712 00000 n 
+0000268939 00000 n 
+0000476924 00000 n 
 0000014093 00000 n 
 0000014138 00000 n 
-0000266737 00000 n 
-0000470593 00000 n 
+0000272422 00000 n 
+0000476805 00000 n 
 0000014186 00000 n 
 0000014218 00000 n 
-0000266866 00000 n 
-0000470475 00000 n 
+0000272551 00000 n 
+0000476687 00000 n 
 0000014267 00000 n 
 0000014306 00000 n 
-0000266995 00000 n 
-0000470410 00000 n 
+0000272680 00000 n 
+0000476622 00000 n 
 0000014360 00000 n 
 0000014421 00000 n 
-0000271002 00000 n 
-0000470278 00000 n 
+0000276687 00000 n 
+0000476490 00000 n 
 0000014470 00000 n 
 0000014527 00000 n 
-0000271131 00000 n 
-0000470213 00000 n 
+0000276816 00000 n 
+0000476425 00000 n 
 0000014581 00000 n 
 0000014630 00000 n 
-0000271519 00000 n 
-0000470095 00000 n 
+0000277204 00000 n 
+0000476307 00000 n 
 0000014679 00000 n 
 0000014741 00000 n 
-0000271648 00000 n 
-0000470016 00000 n 
+0000277333 00000 n 
+0000476228 00000 n 
 0000014795 00000 n 
 0000014850 00000 n 
-0000284749 00000 n 
-0000469923 00000 n 
+0000290437 00000 n 
+0000476135 00000 n 
 0000014904 00000 n 
 0000014945 00000 n 
-0000285811 00000 n 
-0000469844 00000 n 
+0000291499 00000 n 
+0000476056 00000 n 
 0000014999 00000 n 
 0000015051 00000 n 
-0000015405 00000 n 
-0000015653 00000 n 
+0000015404 00000 n 
+0000015652 00000 n 
 0000015104 00000 n 
-0000015527 00000 n 
-0000015590 00000 n 
-0000466703 00000 n 
-0000441039 00000 n 
-0000466529 00000 n 
-0000439990 00000 n 
-0000414055 00000 n 
-0000439816 00000 n 
-0000467708 00000 n 
-0000016305 00000 n 
-0000016120 00000 n 
-0000015738 00000 n 
-0000016242 00000 n 
-0000413370 00000 n 
-0000411224 00000 n 
-0000413206 00000 n 
-0000019484 00000 n 
-0000018674 00000 n 
-0000016390 00000 n 
-0000018796 00000 n 
-0000018920 00000 n 
-0000019045 00000 n 
-0000019170 00000 n 
-0000410370 00000 n 
-0000390012 00000 n 
-0000410196 00000 n 
-0000019295 00000 n 
-0000019358 00000 n 
-0000019421 00000 n 
-0000389071 00000 n 
-0000369672 00000 n 
-0000388898 00000 n 
-0000368945 00000 n 
-0000352561 00000 n 
-0000368772 00000 n 
-0000024167 00000 n 
-0000022985 00000 n 
-0000019608 00000 n 
-0000023479 00000 n 
-0000352026 00000 n 
-0000335109 00000 n 
-0000351842 00000 n 
-0000023542 00000 n 
-0000023605 00000 n 
-0000023729 00000 n 
-0000023854 00000 n 
-0000023979 00000 n 
-0000023135 00000 n 
-0000023328 00000 n 
-0000024104 00000 n 
-0000231131 00000 n 
-0000271712 00000 n 
-0000028690 00000 n 
-0000027655 00000 n 
-0000024291 00000 n 
-0000028127 00000 n 
-0000028252 00000 n 
-0000027805 00000 n 
-0000027967 00000 n 
-0000028377 00000 n 
-0000028502 00000 n 
-0000028627 00000 n 
-0000043932 00000 n 
-0000031848 00000 n 
-0000031289 00000 n 
-0000028814 00000 n 
-0000031411 00000 n 
-0000031536 00000 n 
-0000031661 00000 n 
-0000031785 00000 n 
-0000034734 00000 n 
-0000033927 00000 n 
-0000031959 00000 n 
-0000034049 00000 n 
-0000034174 00000 n 
-0000034299 00000 n 
-0000034424 00000 n 
-0000034546 00000 n 
-0000034671 00000 n 
-0000467826 00000 n 
-0000035770 00000 n 
-0000035460 00000 n 
-0000034819 00000 n 
-0000035582 00000 n 
-0000035707 00000 n 
-0000037823 00000 n 
-0000037138 00000 n 
-0000035868 00000 n 
-0000037260 00000 n 
-0000037385 00000 n 
-0000037509 00000 n 
-0000037634 00000 n 
-0000037760 00000 n 
-0000040816 00000 n 
-0000039949 00000 n 
-0000037921 00000 n 
-0000040250 00000 n 
-0000040376 00000 n 
-0000040439 00000 n 
-0000040501 00000 n 
-0000040091 00000 n 
-0000040627 00000 n 
-0000040753 00000 n 
-0000189385 00000 n 
-0000044121 00000 n 
-0000043684 00000 n 
-0000040927 00000 n 
-0000043806 00000 n 
-0000334582 00000 n 
-0000325273 00000 n 
-0000334405 00000 n 
-0000044058 00000 n 
-0000047626 00000 n 
-0000047441 00000 n 
-0000044245 00000 n 
-0000047563 00000 n 
-0000324830 00000 n 
-0000318031 00000 n 
-0000324653 00000 n 
-0000051895 00000 n 
-0000051505 00000 n 
-0000047789 00000 n 
-0000051832 00000 n 
-0000051647 00000 n 
-0000467944 00000 n 
-0000106560 00000 n 
-0000054068 00000 n 
-0000053633 00000 n 
-0000052032 00000 n 
-0000053755 00000 n 
-0000053881 00000 n 
-0000053942 00000 n 
-0000054005 00000 n 
-0000057587 00000 n 
-0000056549 00000 n 
-0000054192 00000 n 
-0000057021 00000 n 
-0000057147 00000 n 
-0000057273 00000 n 
-0000056699 00000 n 
-0000056860 00000 n 
-0000057398 00000 n 
-0000057524 00000 n 
-0000140442 00000 n 
-0000166934 00000 n 
-0000062160 00000 n 
-0000061369 00000 n 
-0000057685 00000 n 
-0000061845 00000 n 
-0000061971 00000 n 
-0000061519 00000 n 
-0000061684 00000 n 
-0000062097 00000 n 
-0000276260 00000 n 
-0000064989 00000 n 
-0000064617 00000 n 
-0000062310 00000 n 
-0000064926 00000 n 
-0000064759 00000 n 
-0000066145 00000 n 
-0000065960 00000 n 
-0000065113 00000 n 
-0000066082 00000 n 
-0000069239 00000 n 
-0000068550 00000 n 
-0000066243 00000 n 
-0000068672 00000 n 
-0000068798 00000 n 
-0000068924 00000 n 
-0000069050 00000 n 
-0000069176 00000 n 
-0000468062 00000 n 
-0000072619 00000 n 
-0000071742 00000 n 
-0000069376 00000 n 
-0000072052 00000 n 
-0000072178 00000 n 
-0000072304 00000 n 
-0000072430 00000 n 
-0000072556 00000 n 
-0000071884 00000 n 
-0000226828 00000 n 
-0000076716 00000 n 
-0000076029 00000 n 
-0000072756 00000 n 
-0000076151 00000 n 
-0000076277 00000 n 
-0000076403 00000 n 
-0000076528 00000 n 
-0000076653 00000 n 
-0000317678 00000 n 
-0000315683 00000 n 
-0000317515 00000 n 
-0000080413 00000 n 
-0000079853 00000 n 
-0000076853 00000 n 
-0000079975 00000 n 
-0000080100 00000 n 
-0000080226 00000 n 
-0000080350 00000 n 
+0000015526 00000 n 
+0000015589 00000 n 
+0000472898 00000 n 
+0000447234 00000 n 
+0000472724 00000 n 
+0000446185 00000 n 
+0000420250 00000 n 
+0000446011 00000 n 
+0000473903 00000 n 
+0000016310 00000 n 
+0000016125 00000 n 
+0000015737 00000 n 
+0000016247 00000 n 
+0000419565 00000 n 
+0000417420 00000 n 
+0000419401 00000 n 
+0000019489 00000 n 
+0000018679 00000 n 
+0000016395 00000 n 
+0000018801 00000 n 
+0000018925 00000 n 
+0000019050 00000 n 
+0000019175 00000 n 
+0000416566 00000 n 
+0000396208 00000 n 
+0000416392 00000 n 
+0000019300 00000 n 
+0000019363 00000 n 
+0000019426 00000 n 
+0000395259 00000 n 
+0000375507 00000 n 
+0000395086 00000 n 
+0000374780 00000 n 
+0000358396 00000 n 
+0000374607 00000 n 
+0000024172 00000 n 
+0000022990 00000 n 
+0000019613 00000 n 
+0000023484 00000 n 
+0000357861 00000 n 
+0000340944 00000 n 
+0000357677 00000 n 
+0000023547 00000 n 
+0000023610 00000 n 
+0000023734 00000 n 
+0000023859 00000 n 
+0000023984 00000 n 
+0000023140 00000 n 
+0000023333 00000 n 
+0000024109 00000 n 
+0000237575 00000 n 
+0000277397 00000 n 
+0000028695 00000 n 
+0000027660 00000 n 
+0000024296 00000 n 
+0000028132 00000 n 
+0000028257 00000 n 
+0000027810 00000 n 
+0000027972 00000 n 
+0000028382 00000 n 
+0000028507 00000 n 
+0000028632 00000 n 
+0000043937 00000 n 
+0000031853 00000 n 
+0000031294 00000 n 
+0000028819 00000 n 
+0000031416 00000 n 
+0000031541 00000 n 
+0000031666 00000 n 
+0000031790 00000 n 
+0000034739 00000 n 
+0000033932 00000 n 
+0000031964 00000 n 
+0000034054 00000 n 
+0000034179 00000 n 
+0000034304 00000 n 
+0000034429 00000 n 
+0000034551 00000 n 
+0000034676 00000 n 
+0000474021 00000 n 
+0000035775 00000 n 
+0000035465 00000 n 
+0000034824 00000 n 
+0000035587 00000 n 
+0000035712 00000 n 
+0000037828 00000 n 
+0000037143 00000 n 
+0000035873 00000 n 
+0000037265 00000 n 
+0000037390 00000 n 
+0000037514 00000 n 
+0000037639 00000 n 
+0000037765 00000 n 
+0000040821 00000 n 
+0000039954 00000 n 
+0000037926 00000 n 
+0000040255 00000 n 
+0000040381 00000 n 
+0000040444 00000 n 
+0000040506 00000 n 
+0000040096 00000 n 
+0000040632 00000 n 
+0000040758 00000 n 
+0000191945 00000 n 
+0000044126 00000 n 
+0000043689 00000 n 
+0000040932 00000 n 
+0000043811 00000 n 
+0000340417 00000 n 
+0000331108 00000 n 
+0000340240 00000 n 
+0000044063 00000 n 
+0000047694 00000 n 
+0000047509 00000 n 
+0000044250 00000 n 
+0000047631 00000 n 
+0000330665 00000 n 
+0000323867 00000 n 
+0000330488 00000 n 
+0000051963 00000 n 
+0000051573 00000 n 
+0000047857 00000 n 
+0000051900 00000 n 
+0000051715 00000 n 
+0000474139 00000 n 
+0000111030 00000 n 
+0000054136 00000 n 
+0000053701 00000 n 
+0000052100 00000 n 
+0000053823 00000 n 
+0000053949 00000 n 
+0000054010 00000 n 
+0000054073 00000 n 
+0000057655 00000 n 
+0000056617 00000 n 
+0000054260 00000 n 
+0000057089 00000 n 
+0000057215 00000 n 
+0000057341 00000 n 
+0000056767 00000 n 
+0000056928 00000 n 
+0000057466 00000 n 
+0000057592 00000 n 
+0000144911 00000 n 
+0000173364 00000 n 
+0000062228 00000 n 
+0000061437 00000 n 
+0000057753 00000 n 
+0000061913 00000 n 
+0000062039 00000 n 
+0000061587 00000 n 
+0000061752 00000 n 
+0000062165 00000 n 
+0000281947 00000 n 
+0000065062 00000 n 
+0000064690 00000 n 
+0000062378 00000 n 
+0000064999 00000 n 
+0000064832 00000 n 
+0000066218 00000 n 
+0000066033 00000 n 
+0000065186 00000 n 
+0000066155 00000 n 
+0000069312 00000 n 
+0000068623 00000 n 
+0000066316 00000 n 
+0000068745 00000 n 
+0000068871 00000 n 
+0000068997 00000 n 
+0000069123 00000 n 
+0000069249 00000 n 
+0000474257 00000 n 
+0000072692 00000 n 
+0000071815 00000 n 
+0000069449 00000 n 
+0000072125 00000 n 
+0000072251 00000 n 
+0000072377 00000 n 
+0000072503 00000 n 
+0000072629 00000 n 
+0000071957 00000 n 
+0000233403 00000 n 
+0000076788 00000 n 
+0000076101 00000 n 
+0000072829 00000 n 
+0000076223 00000 n 
+0000076349 00000 n 
+0000076475 00000 n 
+0000076600 00000 n 
+0000076725 00000 n 
+0000080493 00000 n 
+0000079933 00000 n 
+0000076912 00000 n 
+0000080055 00000 n 
+0000080180 00000 n 
+0000080306 00000 n 
+0000080430 00000 n 
+0000083497 00000 n 
+0000085196 00000 n 
 0000083375 00000 n 
-0000082633 00000 n 
-0000080537 00000 n 
-0000082934 00000 n 
-0000083060 00000 n 
-0000082775 00000 n 
-0000083186 00000 n 
-0000083312 00000 n 
-0000271195 00000 n 
-0000083833 00000 n 
-0000083648 00000 n 
-0000083499 00000 n 
-0000083770 00000 n 
-0000086437 00000 n 
-0000085874 00000 n 
-0000083874 00000 n 
-0000085996 00000 n 
-0000086122 00000 n 
-0000086248 00000 n 
-0000086374 00000 n 
-0000468180 00000 n 
-0000086869 00000 n 
-0000086684 00000 n 
-0000086535 00000 n 
-0000086806 00000 n 
-0000090790 00000 n 
-0000090042 00000 n 
-0000086910 00000 n 
-0000090350 00000 n 
-0000090476 00000 n 
-0000090601 00000 n 
-0000090664 00000 n 
-0000090727 00000 n 
-0000090184 00000 n 
-0000094744 00000 n 
-0000095057 00000 n 
-0000094496 00000 n 
-0000090888 00000 n 
-0000094618 00000 n 
-0000094868 00000 n 
-0000094994 00000 n 
-0000098587 00000 n 
-0000098024 00000 n 
-0000095194 00000 n 
-0000098146 00000 n 
-0000098272 00000 n 
-0000098398 00000 n 
-0000098524 00000 n 
-0000101201 00000 n 
-0000102440 00000 n 
-0000101079 00000 n 
-0000098698 00000 n 
-0000102126 00000 n 
-0000314870 00000 n 
-0000306196 00000 n 
-0000314698 00000 n 
-0000102252 00000 n 
-0000102315 00000 n 
-0000102378 00000 n 
-0000106623 00000 n 
-0000105810 00000 n 
-0000102592 00000 n 
-0000105932 00000 n 
-0000106058 00000 n 
-0000106182 00000 n 
-0000106245 00000 n 
-0000106308 00000 n 
-0000106434 00000 n 
-0000468298 00000 n 
-0000111651 00000 n 
-0000110085 00000 n 
-0000106734 00000 n 
-0000111084 00000 n 
-0000110259 00000 n 
-0000110409 00000 n 
-0000111210 00000 n 
-0000111336 00000 n 
-0000111462 00000 n 
-0000111588 00000 n 
-0000110567 00000 n 
-0000110718 00000 n 
-0000110902 00000 n 
-0000286325 00000 n 
-0000114845 00000 n 
-0000114282 00000 n 
-0000111788 00000 n 
-0000114404 00000 n 
-0000114530 00000 n 
-0000114656 00000 n 
-0000114782 00000 n 
-0000119363 00000 n 
-0000119178 00000 n 
-0000114982 00000 n 
-0000119300 00000 n 
-0000122390 00000 n 
-0000122020 00000 n 
-0000119474 00000 n 
-0000122327 00000 n 
-0000122162 00000 n 
-0000125190 00000 n 
-0000125379 00000 n 
-0000124942 00000 n 
-0000122501 00000 n 
-0000125064 00000 n 
-0000125253 00000 n 
-0000125316 00000 n 
-0000129097 00000 n 
-0000128329 00000 n 
-0000125490 00000 n 
-0000128782 00000 n 
-0000128908 00000 n 
-0000129034 00000 n 
-0000128479 00000 n 
-0000128630 00000 n 
-0000468416 00000 n 
-0000131089 00000 n 
-0000130526 00000 n 
-0000129208 00000 n 
-0000130648 00000 n 
-0000130774 00000 n 
-0000130900 00000 n 
-0000131026 00000 n 
-0000132625 00000 n 
-0000132440 00000 n 
-0000131200 00000 n 
-0000132562 00000 n 
-0000136439 00000 n 
-0000136128 00000 n 
-0000132723 00000 n 
-0000136250 00000 n 
-0000136376 00000 n 
-0000140505 00000 n 
-0000140019 00000 n 
-0000136563 00000 n 
-0000140316 00000 n 
-0000140161 00000 n 
-0000197293 00000 n 
-0000144437 00000 n 
-0000144127 00000 n 
-0000140629 00000 n 
-0000144249 00000 n 
-0000144312 00000 n 
-0000144374 00000 n 
-0000148409 00000 n 
-0000151142 00000 n 
-0000148227 00000 n 
-0000144561 00000 n 
-0000151079 00000 n 
-0000150045 00000 n 
-0000150198 00000 n 
-0000150354 00000 n 
-0000150538 00000 n 
-0000150711 00000 n 
-0000150895 00000 n 
-0000468534 00000 n 
-0000149877 00000 n 
-0000149934 00000 n 
-0000150023 00000 n 
-0000197679 00000 n 
-0000155337 00000 n 
-0000155152 00000 n 
-0000151320 00000 n 
-0000155274 00000 n 
-0000159869 00000 n 
-0000158946 00000 n 
-0000155461 00000 n 
-0000159429 00000 n 
-0000159555 00000 n 
-0000159096 00000 n 
-0000159681 00000 n 
-0000159806 00000 n 
-0000159264 00000 n 
-0000207975 00000 n 
-0000163782 00000 n 
-0000163282 00000 n 
-0000159980 00000 n 
-0000163594 00000 n 
-0000163424 00000 n 
-0000163720 00000 n 
-0000259852 00000 n 
-0000166997 00000 n 
-0000166560 00000 n 
-0000163906 00000 n 
-0000166682 00000 n 
-0000166808 00000 n 
-0000305670 00000 n 
-0000297780 00000 n 
-0000305497 00000 n 
-0000170997 00000 n 
-0000170812 00000 n 
-0000167162 00000 n 
-0000170934 00000 n 
-0000175025 00000 n 
-0000174397 00000 n 
-0000171108 00000 n 
-0000174712 00000 n 
-0000174836 00000 n 
-0000174962 00000 n 
-0000174539 00000 n 
-0000468652 00000 n 
-0000179097 00000 n 
-0000178486 00000 n 
-0000175190 00000 n 
-0000178782 00000 n 
-0000178908 00000 n 
-0000178628 00000 n 
-0000179034 00000 n 
-0000182112 00000 n 
-0000181794 00000 n 
-0000179208 00000 n 
-0000181919 00000 n 
-0000182047 00000 n 
-0000186072 00000 n 
-0000185406 00000 n 
-0000182278 00000 n 
-0000185878 00000 n 
-0000186007 00000 n 
-0000185561 00000 n 
-0000185723 00000 n 
-0000189708 00000 n 
-0000188941 00000 n 
-0000186184 00000 n 
-0000189256 00000 n 
-0000189087 00000 n 
-0000189449 00000 n 
-0000189514 00000 n 
-0000189643 00000 n 
-0000194202 00000 n 
-0000193524 00000 n 
-0000189874 00000 n 
-0000194008 00000 n 
-0000193679 00000 n 
-0000194137 00000 n 
-0000193841 00000 n 
-0000206081 00000 n 
-0000197742 00000 n 
-0000197038 00000 n 
-0000194368 00000 n 
-0000197164 00000 n 
-0000197357 00000 n 
-0000197421 00000 n 
-0000197550 00000 n 
-0000468774 00000 n 
-0000202583 00000 n 
-0000201630 00000 n 
-0000197854 00000 n 
-0000202260 00000 n 
-0000201795 00000 n 
-0000201945 00000 n 
-0000202389 00000 n 
-0000202518 00000 n 
-0000202107 00000 n 
-0000206275 00000 n 
-0000205826 00000 n 
-0000202695 00000 n 
-0000205952 00000 n 
-0000206210 00000 n 
-0000208039 00000 n 
-0000207720 00000 n 
-0000206387 00000 n 
-0000207846 00000 n 
-0000211746 00000 n 
-0000211169 00000 n 
-0000208151 00000 n 
-0000211295 00000 n 
-0000211424 00000 n 
-0000211553 00000 n 
-0000211618 00000 n 
-0000211683 00000 n 
-0000216710 00000 n 
-0000215208 00000 n 
-0000211858 00000 n 
-0000216387 00000 n 
-0000216516 00000 n 
-0000216645 00000 n 
-0000215400 00000 n 
-0000215562 00000 n 
-0000215724 00000 n 
-0000215886 00000 n 
-0000216057 00000 n 
-0000216227 00000 n 
-0000221529 00000 n 
-0000220300 00000 n 
-0000216822 00000 n 
-0000221464 00000 n 
-0000220492 00000 n 
-0000220655 00000 n 
-0000220817 00000 n 
-0000220979 00000 n 
-0000221139 00000 n 
-0000221301 00000 n 
-0000468899 00000 n 
-0000226892 00000 n 
-0000224533 00000 n 
-0000221654 00000 n 
-0000226699 00000 n 
-0000224779 00000 n 
-0000224932 00000 n 
-0000225094 00000 n 
-0000225256 00000 n 
-0000225418 00000 n 
-0000225580 00000 n 
-0000225742 00000 n 
-0000225904 00000 n 
-0000226066 00000 n 
-0000226220 00000 n 
-0000226381 00000 n 
-0000226536 00000 n 
-0000231452 00000 n 
-0000230255 00000 n 
-0000227017 00000 n 
-0000230743 00000 n 
-0000230808 00000 n 
-0000230873 00000 n 
-0000231002 00000 n 
-0000231259 00000 n 
-0000230411 00000 n 
-0000230581 00000 n 
-0000231324 00000 n 
-0000231388 00000 n 
-0000235060 00000 n 
-0000234739 00000 n 
-0000231577 00000 n 
-0000234865 00000 n 
-0000234930 00000 n 
-0000234995 00000 n 
-0000239098 00000 n 
-0000238648 00000 n 
-0000235159 00000 n 
-0000238774 00000 n 
-0000238839 00000 n 
-0000238904 00000 n 
-0000239033 00000 n 
-0000242812 00000 n 
-0000242102 00000 n 
-0000239223 00000 n 
-0000242228 00000 n 
-0000242293 00000 n 
-0000242358 00000 n 
-0000242423 00000 n 
-0000242488 00000 n 
-0000242617 00000 n 
-0000242682 00000 n 
-0000242747 00000 n 
-0000246688 00000 n 
-0000245725 00000 n 
-0000242937 00000 n 
-0000245851 00000 n 
-0000245980 00000 n 
-0000246045 00000 n 
-0000246110 00000 n 
-0000246238 00000 n 
-0000246302 00000 n 
-0000246367 00000 n 
-0000246496 00000 n 
-0000246624 00000 n 
-0000469024 00000 n 
-0000249829 00000 n 
-0000249251 00000 n 
-0000246880 00000 n 
-0000249377 00000 n 
-0000249506 00000 n 
-0000249635 00000 n 
-0000249764 00000 n 
-0000252798 00000 n 
-0000252477 00000 n 
-0000250021 00000 n 
-0000252603 00000 n 
-0000252668 00000 n 
-0000252733 00000 n 
-0000253251 00000 n 
-0000253060 00000 n 
-0000252910 00000 n 
-0000253186 00000 n 
-0000255820 00000 n 
-0000254911 00000 n 
-0000253293 00000 n 
-0000255497 00000 n 
-0000255626 00000 n 
-0000255755 00000 n 
-0000255067 00000 n 
-0000255282 00000 n 
-0000259916 00000 n 
-0000259211 00000 n 
-0000255945 00000 n 
-0000259337 00000 n 
-0000297459 00000 n 
-0000288246 00000 n 
-0000297273 00000 n 
-0000259466 00000 n 
-0000259595 00000 n 
-0000259724 00000 n 
-0000263363 00000 n 
-0000262137 00000 n 
-0000260081 00000 n 
-0000262654 00000 n 
-0000262783 00000 n 
-0000262912 00000 n 
-0000263041 00000 n 
-0000263170 00000 n 
-0000263299 00000 n 
-0000262293 00000 n 
-0000262465 00000 n 
-0000469149 00000 n 
-0000263816 00000 n 
-0000263625 00000 n 
-0000263475 00000 n 
-0000263751 00000 n 
-0000267124 00000 n 
-0000266546 00000 n 
-0000263858 00000 n 
-0000266672 00000 n 
-0000266801 00000 n 
-0000266930 00000 n 
-0000267059 00000 n 
-0000271776 00000 n 
-0000270426 00000 n 
-0000267210 00000 n 
-0000270937 00000 n 
-0000271066 00000 n 
-0000271259 00000 n 
-0000271324 00000 n 
-0000271389 00000 n 
-0000271454 00000 n 
-0000271583 00000 n 
-0000270582 00000 n 
-0000270760 00000 n 
-0000278658 00000 n 
-0000274598 00000 n 
-0000271927 00000 n 
-0000274772 00000 n 
-0000275480 00000 n 
-0000274950 00000 n 
-0000275128 00000 n 
-0000275304 00000 n 
-0000275545 00000 n 
-0000275610 00000 n 
-0000275675 00000 n 
-0000275740 00000 n 
-0000275805 00000 n 
-0000275870 00000 n 
-0000275935 00000 n 
-0000276000 00000 n 
-0000276065 00000 n 
-0000276130 00000 n 
-0000276195 00000 n 
-0000276324 00000 n 
-0000276389 00000 n 
-0000276454 00000 n 
-0000276519 00000 n 
-0000276584 00000 n 
-0000276648 00000 n 
-0000276713 00000 n 
-0000276777 00000 n 
-0000276842 00000 n 
-0000276907 00000 n 
-0000276972 00000 n 
-0000277037 00000 n 
-0000277101 00000 n 
-0000277166 00000 n 
-0000277231 00000 n 
-0000277296 00000 n 
-0000277361 00000 n 
-0000277426 00000 n 
-0000277491 00000 n 
-0000277555 00000 n 
-0000277620 00000 n 
-0000277685 00000 n 
-0000277750 00000 n 
-0000277815 00000 n 
-0000277880 00000 n 
-0000277945 00000 n 
-0000278010 00000 n 
-0000278075 00000 n 
-0000278140 00000 n 
-0000278205 00000 n 
-0000278270 00000 n 
-0000278335 00000 n 
-0000278400 00000 n 
-0000278465 00000 n 
-0000278530 00000 n 
-0000278594 00000 n 
-0000284877 00000 n 
-0000281570 00000 n 
-0000278809 00000 n 
-0000281696 00000 n 
-0000281761 00000 n 
-0000281826 00000 n 
-0000281891 00000 n 
-0000281956 00000 n 
-0000282021 00000 n 
-0000282085 00000 n 
-0000282150 00000 n 
-0000282215 00000 n 
-0000282280 00000 n 
-0000282345 00000 n 
-0000282410 00000 n 
-0000282475 00000 n 
-0000282540 00000 n 
-0000282605 00000 n 
-0000282670 00000 n 
-0000282735 00000 n 
-0000282800 00000 n 
-0000282865 00000 n 
-0000282930 00000 n 
-0000282995 00000 n 
-0000283060 00000 n 
-0000283125 00000 n 
-0000283190 00000 n 
-0000283254 00000 n 
-0000283319 00000 n 
-0000283384 00000 n 
-0000283449 00000 n 
-0000283514 00000 n 
-0000283579 00000 n 
-0000283644 00000 n 
-0000283709 00000 n 
-0000283774 00000 n 
-0000283839 00000 n 
-0000283904 00000 n 
-0000283969 00000 n 
-0000284034 00000 n 
-0000284099 00000 n 
-0000284164 00000 n 
-0000284229 00000 n 
-0000284294 00000 n 
-0000284359 00000 n 
-0000284424 00000 n 
-0000284489 00000 n 
-0000284554 00000 n 
-0000284619 00000 n 
-0000284684 00000 n 
-0000284813 00000 n 
-0000286200 00000 n 
-0000285620 00000 n 
-0000284989 00000 n 
-0000285746 00000 n 
-0000285875 00000 n 
-0000285940 00000 n 
-0000286005 00000 n 
-0000286070 00000 n 
-0000286135 00000 n 
-0000469274 00000 n 
-0000286357 00000 n 
-0000297701 00000 n 
-0000305945 00000 n 
-0000315264 00000 n 
-0000317923 00000 n 
-0000317892 00000 n 
-0000325072 00000 n 
-0000334868 00000 n 
-0000352366 00000 n 
-0000369353 00000 n 
-0000389635 00000 n 
-0000410774 00000 n 
-0000413857 00000 n 
-0000413627 00000 n 
-0000440544 00000 n 
-0000467222 00000 n 
-0000469354 00000 n 
-0000469474 00000 n 
-0000469597 00000 n 
-0000469686 00000 n 
-0000469768 00000 n 
-0000483639 00000 n 
-0000495601 00000 n 
-0000495642 00000 n 
-0000495682 00000 n 
-0000495816 00000 n 
+0000080617 00000 n 
+0000085133 00000 n 
+0000323048 00000 n 
+0000314239 00000 n 
+0000322876 00000 n 
+0000084965 00000 n 
+0000085022 00000 n 
+0000085111 00000 n 
+0000088190 00000 n 
+0000087448 00000 n 
+0000085348 00000 n 
+0000087749 00000 n 
+0000087875 00000 n 
+0000087590 00000 n 
+0000088001 00000 n 
+0000088127 00000 n 
+0000276880 00000 n 
+0000090877 00000 n 
+0000090314 00000 n 
+0000088314 00000 n 
+0000090436 00000 n 
+0000090562 00000 n 
+0000090688 00000 n 
+0000090814 00000 n 
+0000474375 00000 n 
+0000091309 00000 n 
+0000091124 00000 n 
+0000090975 00000 n 
+0000091246 00000 n 
+0000095230 00000 n 
+0000094482 00000 n 
+0000091350 00000 n 
+0000094790 00000 n 
+0000094916 00000 n 
+0000095041 00000 n 
+0000095104 00000 n 
+0000095167 00000 n 
+0000094624 00000 n 
+0000099184 00000 n 
+0000099497 00000 n 
+0000098936 00000 n 
+0000095328 00000 n 
+0000099058 00000 n 
+0000099308 00000 n 
+0000099434 00000 n 
+0000103027 00000 n 
+0000102464 00000 n 
+0000099634 00000 n 
+0000102586 00000 n 
+0000102712 00000 n 
+0000102838 00000 n 
+0000102964 00000 n 
+0000105639 00000 n 
+0000106878 00000 n 
+0000105517 00000 n 
+0000103138 00000 n 
+0000106564 00000 n 
+0000106690 00000 n 
+0000106753 00000 n 
+0000106816 00000 n 
+0000111093 00000 n 
+0000110280 00000 n 
+0000107030 00000 n 
+0000110402 00000 n 
+0000110528 00000 n 
+0000110652 00000 n 
+0000110715 00000 n 
+0000110778 00000 n 
+0000110904 00000 n 
+0000474493 00000 n 
+0000116098 00000 n 
+0000114532 00000 n 
+0000111204 00000 n 
+0000115531 00000 n 
+0000114706 00000 n 
+0000114856 00000 n 
+0000115657 00000 n 
+0000115783 00000 n 
+0000115909 00000 n 
+0000116035 00000 n 
+0000115014 00000 n 
+0000115165 00000 n 
+0000115349 00000 n 
+0000292013 00000 n 
+0000119292 00000 n 
+0000118729 00000 n 
+0000116235 00000 n 
+0000118851 00000 n 
+0000118977 00000 n 
+0000119103 00000 n 
+0000119229 00000 n 
+0000123807 00000 n 
+0000123622 00000 n 
+0000119429 00000 n 
+0000123744 00000 n 
+0000126842 00000 n 
+0000126472 00000 n 
+0000123918 00000 n 
+0000126779 00000 n 
+0000126614 00000 n 
+0000129642 00000 n 
+0000129831 00000 n 
+0000129394 00000 n 
+0000126953 00000 n 
+0000129516 00000 n 
+0000129705 00000 n 
+0000129768 00000 n 
+0000133540 00000 n 
+0000132772 00000 n 
+0000129942 00000 n 
+0000133225 00000 n 
+0000133351 00000 n 
+0000133477 00000 n 
+0000132922 00000 n 
+0000133073 00000 n 
+0000474611 00000 n 
+0000135532 00000 n 
+0000134969 00000 n 
+0000133651 00000 n 
+0000135091 00000 n 
+0000135217 00000 n 
+0000135343 00000 n 
+0000135469 00000 n 
+0000137068 00000 n 
+0000136883 00000 n 
+0000135643 00000 n 
+0000137005 00000 n 
+0000140882 00000 n 
+0000140571 00000 n 
+0000137166 00000 n 
+0000140693 00000 n 
+0000140819 00000 n 
+0000144974 00000 n 
+0000144488 00000 n 
+0000141006 00000 n 
+0000144785 00000 n 
+0000144630 00000 n 
+0000199870 00000 n 
+0000148911 00000 n 
+0000148601 00000 n 
+0000145098 00000 n 
+0000148723 00000 n 
+0000148786 00000 n 
+0000148848 00000 n 
+0000153982 00000 n 
+0000152703 00000 n 
+0000149035 00000 n 
+0000153919 00000 n 
+0000152885 00000 n 
+0000153038 00000 n 
+0000153194 00000 n 
+0000153378 00000 n 
+0000153551 00000 n 
+0000153735 00000 n 
+0000474729 00000 n 
+0000204216 00000 n 
+0000158177 00000 n 
+0000157992 00000 n 
+0000154160 00000 n 
+0000158114 00000 n 
+0000162712 00000 n 
+0000161789 00000 n 
+0000158301 00000 n 
+0000162272 00000 n 
+0000162398 00000 n 
+0000161939 00000 n 
+0000162524 00000 n 
+0000162649 00000 n 
+0000162107 00000 n 
+0000210900 00000 n 
+0000166625 00000 n 
+0000166125 00000 n 
+0000162823 00000 n 
+0000166437 00000 n 
+0000166267 00000 n 
+0000166563 00000 n 
+0000265556 00000 n 
+0000169394 00000 n 
+0000169083 00000 n 
+0000166749 00000 n 
+0000169205 00000 n 
+0000169331 00000 n 
+0000313713 00000 n 
+0000305822 00000 n 
+0000313540 00000 n 
+0000173427 00000 n 
+0000173116 00000 n 
+0000169559 00000 n 
+0000173238 00000 n 
+0000176977 00000 n 
+0000176668 00000 n 
+0000173538 00000 n 
+0000176790 00000 n 
+0000176915 00000 n 
+0000474847 00000 n 
+0000181132 00000 n 
+0000180340 00000 n 
+0000177129 00000 n 
+0000180817 00000 n 
+0000180943 00000 n 
+0000180490 00000 n 
+0000181069 00000 n 
+0000180663 00000 n 
+0000184859 00000 n 
+0000184420 00000 n 
+0000181243 00000 n 
+0000184542 00000 n 
+0000184668 00000 n 
+0000184795 00000 n 
+0000188870 00000 n 
+0000188204 00000 n 
+0000185011 00000 n 
+0000188676 00000 n 
+0000188805 00000 n 
+0000188359 00000 n 
+0000188521 00000 n 
+0000192137 00000 n 
+0000191501 00000 n 
+0000189036 00000 n 
+0000191816 00000 n 
+0000191647 00000 n 
+0000192008 00000 n 
+0000192072 00000 n 
+0000196510 00000 n 
+0000195704 00000 n 
+0000192303 00000 n 
+0000196187 00000 n 
+0000196316 00000 n 
+0000195859 00000 n 
+0000196445 00000 n 
+0000196021 00000 n 
+0000208232 00000 n 
+0000200064 00000 n 
+0000199615 00000 n 
+0000196676 00000 n 
+0000199741 00000 n 
+0000199934 00000 n 
+0000199999 00000 n 
+0000474968 00000 n 
+0000204280 00000 n 
+0000203660 00000 n 
+0000200176 00000 n 
+0000203958 00000 n 
+0000204087 00000 n 
+0000203807 00000 n 
+0000208426 00000 n 
+0000207373 00000 n 
+0000204392 00000 n 
+0000207845 00000 n 
+0000207529 00000 n 
+0000207974 00000 n 
+0000208103 00000 n 
+0000207691 00000 n 
+0000208361 00000 n 
+0000210964 00000 n 
+0000210645 00000 n 
+0000208538 00000 n 
+0000210771 00000 n 
+0000212368 00000 n 
+0000212177 00000 n 
+0000211076 00000 n 
+0000212303 00000 n 
+0000214322 00000 n 
+0000213744 00000 n 
+0000212467 00000 n 
+0000213870 00000 n 
+0000213999 00000 n 
+0000214128 00000 n 
+0000214193 00000 n 
+0000214258 00000 n 
+0000218301 00000 n 
+0000218110 00000 n 
+0000214434 00000 n 
+0000218236 00000 n 
+0000475093 00000 n 
+0000223282 00000 n 
+0000221778 00000 n 
+0000218413 00000 n 
+0000222959 00000 n 
+0000223088 00000 n 
+0000223217 00000 n 
+0000221970 00000 n 
+0000222132 00000 n 
+0000222294 00000 n 
+0000222456 00000 n 
+0000222627 00000 n 
+0000222798 00000 n 
+0000228583 00000 n 
+0000226515 00000 n 
+0000223394 00000 n 
+0000228518 00000 n 
+0000226752 00000 n 
+0000226915 00000 n 
+0000227076 00000 n 
+0000227238 00000 n 
+0000227399 00000 n 
+0000227561 00000 n 
+0000227723 00000 n 
+0000227877 00000 n 
+0000228039 00000 n 
+0000228201 00000 n 
+0000228360 00000 n 
+0000233597 00000 n 
+0000231956 00000 n 
+0000228708 00000 n 
+0000233274 00000 n 
+0000232157 00000 n 
+0000232319 00000 n 
+0000232481 00000 n 
+0000232642 00000 n 
+0000232796 00000 n 
+0000232957 00000 n 
+0000233112 00000 n 
+0000233467 00000 n 
+0000233532 00000 n 
+0000238026 00000 n 
+0000236829 00000 n 
+0000233722 00000 n 
+0000237317 00000 n 
+0000237446 00000 n 
+0000237703 00000 n 
+0000236985 00000 n 
+0000237155 00000 n 
+0000237768 00000 n 
+0000237833 00000 n 
+0000237897 00000 n 
+0000237962 00000 n 
+0000241483 00000 n 
+0000241228 00000 n 
+0000238164 00000 n 
+0000241354 00000 n 
+0000241419 00000 n 
+0000245451 00000 n 
+0000244936 00000 n 
+0000241582 00000 n 
+0000245062 00000 n 
+0000245127 00000 n 
+0000245256 00000 n 
+0000245321 00000 n 
+0000245386 00000 n 
+0000475218 00000 n 
+0000249472 00000 n 
+0000248636 00000 n 
+0000245563 00000 n 
+0000248762 00000 n 
+0000248827 00000 n 
+0000248892 00000 n 
+0000249021 00000 n 
+0000249086 00000 n 
+0000249150 00000 n 
+0000249278 00000 n 
+0000249343 00000 n 
+0000249407 00000 n 
+0000253107 00000 n 
+0000252271 00000 n 
+0000249597 00000 n 
+0000252397 00000 n 
+0000252526 00000 n 
+0000252591 00000 n 
+0000252656 00000 n 
+0000252785 00000 n 
+0000252914 00000 n 
+0000305467 00000 n 
+0000303468 00000 n 
+0000305302 00000 n 
+0000253042 00000 n 
+0000257021 00000 n 
+0000256442 00000 n 
+0000253313 00000 n 
+0000256568 00000 n 
+0000256697 00000 n 
+0000256826 00000 n 
+0000256891 00000 n 
+0000256956 00000 n 
+0000258516 00000 n 
+0000258325 00000 n 
+0000257213 00000 n 
+0000258451 00000 n 
+0000258956 00000 n 
+0000258765 00000 n 
+0000258615 00000 n 
+0000258891 00000 n 
+0000261522 00000 n 
+0000260614 00000 n 
+0000258998 00000 n 
+0000261200 00000 n 
+0000261329 00000 n 
+0000261458 00000 n 
+0000260770 00000 n 
+0000260985 00000 n 
+0000475343 00000 n 
+0000265620 00000 n 
+0000264915 00000 n 
+0000261648 00000 n 
+0000265041 00000 n 
+0000303147 00000 n 
+0000293934 00000 n 
+0000302961 00000 n 
+0000265170 00000 n 
+0000265299 00000 n 
+0000265428 00000 n 
+0000269067 00000 n 
+0000267841 00000 n 
+0000265785 00000 n 
+0000268358 00000 n 
+0000268487 00000 n 
+0000268616 00000 n 
+0000268745 00000 n 
+0000268874 00000 n 
+0000269003 00000 n 
+0000267997 00000 n 
+0000268169 00000 n 
+0000269521 00000 n 
+0000269330 00000 n 
+0000269180 00000 n 
+0000269456 00000 n 
+0000272809 00000 n 
+0000272231 00000 n 
+0000269563 00000 n 
+0000272357 00000 n 
+0000272486 00000 n 
+0000272615 00000 n 
+0000272744 00000 n 
+0000277461 00000 n 
+0000276111 00000 n 
+0000272895 00000 n 
+0000276622 00000 n 
+0000276751 00000 n 
+0000276944 00000 n 
+0000277009 00000 n 
+0000277074 00000 n 
+0000277139 00000 n 
+0000277268 00000 n 
+0000276267 00000 n 
+0000276445 00000 n 
+0000284345 00000 n 
+0000280285 00000 n 
+0000277613 00000 n 
+0000280459 00000 n 
+0000281167 00000 n 
+0000280637 00000 n 
+0000280815 00000 n 
+0000280991 00000 n 
+0000281232 00000 n 
+0000281297 00000 n 
+0000281362 00000 n 
+0000281427 00000 n 
+0000281492 00000 n 
+0000281557 00000 n 
+0000281622 00000 n 
+0000281687 00000 n 
+0000281752 00000 n 
+0000281817 00000 n 
+0000281882 00000 n 
+0000282011 00000 n 
+0000282076 00000 n 
+0000282141 00000 n 
+0000282206 00000 n 
+0000282271 00000 n 
+0000282335 00000 n 
+0000282400 00000 n 
+0000282464 00000 n 
+0000282529 00000 n 
+0000282594 00000 n 
+0000282659 00000 n 
+0000282724 00000 n 
+0000282788 00000 n 
+0000282853 00000 n 
+0000282918 00000 n 
+0000282983 00000 n 
+0000283048 00000 n 
+0000283113 00000 n 
+0000283178 00000 n 
+0000283242 00000 n 
+0000283307 00000 n 
+0000283372 00000 n 
+0000283437 00000 n 
+0000283502 00000 n 
+0000283567 00000 n 
+0000283632 00000 n 
+0000283697 00000 n 
+0000283762 00000 n 
+0000283827 00000 n 
+0000283892 00000 n 
+0000283957 00000 n 
+0000284022 00000 n 
+0000284087 00000 n 
+0000284152 00000 n 
+0000284217 00000 n 
+0000284281 00000 n 
+0000475468 00000 n 
+0000290565 00000 n 
+0000287258 00000 n 
+0000284497 00000 n 
+0000287384 00000 n 
+0000287449 00000 n 
+0000287514 00000 n 
+0000287579 00000 n 
+0000287644 00000 n 
+0000287709 00000 n 
+0000287773 00000 n 
+0000287838 00000 n 
+0000287903 00000 n 
+0000287968 00000 n 
+0000288033 00000 n 
+0000288098 00000 n 
+0000288163 00000 n 
+0000288228 00000 n 
+0000288293 00000 n 
+0000288358 00000 n 
+0000288423 00000 n 
+0000288488 00000 n 
+0000288553 00000 n 
+0000288618 00000 n 
+0000288683 00000 n 
+0000288748 00000 n 
+0000288813 00000 n 
+0000288878 00000 n 
+0000288942 00000 n 
+0000289007 00000 n 
+0000289072 00000 n 
+0000289137 00000 n 
+0000289202 00000 n 
+0000289267 00000 n 
+0000289332 00000 n 
+0000289397 00000 n 
+0000289462 00000 n 
+0000289527 00000 n 
+0000289592 00000 n 
+0000289657 00000 n 
+0000289722 00000 n 
+0000289787 00000 n 
+0000289852 00000 n 
+0000289917 00000 n 
+0000289982 00000 n 
+0000290047 00000 n 
+0000290112 00000 n 
+0000290177 00000 n 
+0000290242 00000 n 
+0000290307 00000 n 
+0000290372 00000 n 
+0000290501 00000 n 
+0000291888 00000 n 
+0000291308 00000 n 
+0000290677 00000 n 
+0000291434 00000 n 
+0000291563 00000 n 
+0000291628 00000 n 
+0000291693 00000 n 
+0000291758 00000 n 
+0000291823 00000 n 
+0000292045 00000 n 
+0000303389 00000 n 
+0000305714 00000 n 
+0000305683 00000 n 
+0000313988 00000 n 
+0000323446 00000 n 
+0000330907 00000 n 
+0000340703 00000 n 
+0000358201 00000 n 
+0000375188 00000 n 
+0000395827 00000 n 
+0000416970 00000 n 
+0000420052 00000 n 
+0000419822 00000 n 
+0000446739 00000 n 
+0000473417 00000 n 
+0000475566 00000 n 
+0000475686 00000 n 
+0000475809 00000 n 
+0000475898 00000 n 
+0000475980 00000 n 
+0000489851 00000 n 
+0000501851 00000 n 
+0000501892 00000 n 
+0000501932 00000 n 
+0000502066 00000 n 
 trailer
 <<
-/Size 1362
-/Root 1360 0 R
-/Info 1361 0 R
-/ID [<398C74303A70323E9600C964366A931D> <398C74303A70323E9600C964366A931D>]
+/Size 1370
+/Root 1368 0 R
+/Info 1369 0 R
+/ID [<4AA4EB183F27E00974E8BA03B75B114E> <4AA4EB183F27E00974E8BA03B75B114E>]
 >>
 startxref
-496080
+502330
 %%EOF
diff --git a/lib/bind/api b/lib/bind/api
index dcc846ea..2bcba231 100644
--- a/lib/bind/api
+++ b/lib/bind/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 4
-LIBREVISION = 2
+LIBREVISION = 4
 LIBAGE = 0
diff --git a/lib/bind/configure b/lib/bind/configure
index 8f126216..9849b0ee 100755
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.83.2.5.2.22 .
+# From configure.in Revision: 1.83.2.5.2.23 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -6403,7 +6403,7 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
-	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings"
+	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wpointer-arith"
 else
 	case $host in
 	*-dec-osf*)
@@ -12350,7 +12350,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 fi
 
 
-# Report which librarie types wil actually be built
+# Report which libraries types will actually be built
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $can_build_shared" >&5
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 50ffe82a..42997558 100644
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -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.83.2.5.2.22 $)
+AC_REVISION($Revision: 1.83.2.5.2.24 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -513,7 +513,7 @@ MKDEPCFLAGS="-M"
 IRIX_DNSSEC_WARNINGS_HACK=""
 
 if test "X$GCC" = "Xyes"; then
-	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings"
+	STD_CWARNINGS="$STD_CWARNINGS -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wpointer-arith"
 else
 	case $host in
 	*-dec-osf*)
diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 51dfd0b8..417c31f8 100644
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.3 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -170,6 +170,10 @@ dst_s_get_key_struct(const char *name, const int alg, const int flags,
 
 	memset(new_key, 0, sizeof(*new_key));
 	new_key->dk_key_name = strdup(name);
+	if (new_key->dk_key_name == NULL) {
+		free(new_key);
+		return (NULL);
+	}
 	new_key->dk_alg = alg;
 	new_key->dk_flags = flags;
 	new_key->dk_proto = protocol;
@@ -655,11 +659,13 @@ dst_dnskey_to_key(const char *in_name, const u_char *rdata, const int len)
 			 alg));
 		return (NULL);
 	}
-	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
-		return (NULL);
 
 	if (in_name == NULL)
 		return (NULL);
+
+	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
+		return (NULL);
+
 	key_st->dk_id = dst_s_dns_key_id(rdata, len);
 	key_st->dk_flags = dst_s_get_int16(rdata);
 	key_st->dk_proto = (u_int16_t) rdata[DST_KEY_PROT];
@@ -772,13 +778,11 @@ dst_buffer_to_key(const char *key_name,		/* name of the key */
 		return (NULL);
 	}
 
-	dkey = dst_s_get_key_struct(key_name, alg, flags, 
-					     protocol, -1);
+	dkey = dst_s_get_key_struct(key_name, alg, flags, protocol, -1);
 
-	if (dkey == NULL)
-		return (NULL);
-	if (dkey->dk_func == NULL || dkey->dk_func->from_dns_key == NULL)
-		return NULL;
+	if (dkey == NULL || dkey->dk_func == NULL ||
+	    dkey->dk_func->from_dns_key == NULL) 
+		return (dst_free_key(dkey));
 
 	if (dkey->dk_func->from_dns_key(dkey, key_buf, key_len) < 0) {
 		EREPORT(("dst_buffer_to_key(): dst_buffer_to_hmac failed\n"));
@@ -1013,7 +1017,6 @@ dst_free_key(DST_KEY *f_key)
 	else {
 		EREPORT(("dst_free_key(): Unknown key alg %d\n",
 			 f_key->dk_alg));
-		free(f_key->dk_KEY_struct);	/* SHOULD NOT happen */
 	}
 	if (f_key->dk_KEY_struct) {
 		free(f_key->dk_KEY_struct);
diff --git a/lib/bind/dst/hmac_link.c b/lib/bind/dst/hmac_link.c
index aa66c80e..028f02e9 100644
--- a/lib/bind/dst/hmac_link.c
+++ b/lib/bind/dst/hmac_link.c
@@ -1,6 +1,6 @@
 #ifdef HMAC_MD5
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.1 2005/07/28 07:43:16 marka Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -93,6 +93,9 @@ dst_hmac_md5_sign(const int mode, DST_KEY *d_key, void **context,
 	int sign_len = 0;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -100,8 +103,6 @@ dst_hmac_md5_sign(const int mode, DST_KEY *d_key, void **context,
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 
 	if (mode & SIG_MODE_INIT) {
@@ -160,6 +161,9 @@ dst_hmac_md5_verify(const int mode, DST_KEY *d_key, void **context,
 	HMAC_Key *key;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -167,9 +171,6 @@ dst_hmac_md5_verify(const int mode, DST_KEY *d_key, void **context,
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
-
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 	if (mode & SIG_MODE_INIT) {
 		MD5Init(ctx);
@@ -272,7 +273,7 @@ dst_buffer_to_hmac_md5(DST_KEY *dkey, const u_char *key, const int keylen)
 
 static int
 dst_hmac_md5_key_to_file_format(const DST_KEY *dkey, char *buff,
-			    const int buff_len)
+			        const int buff_len)
 {
 	char *bp;
 	int len, b_len, i, key_len;
@@ -289,7 +290,7 @@ dst_hmac_md5_key_to_file_format(const DST_KEY *dkey, char *buff,
 	/* write file header */
 	sprintf(buff, key_file_fmt_str, KEY_FILE_FORMAT, KEY_HMAC_MD5, "HMAC");
 
-	bp = (char *) strchr(buff, '\0');
+	bp = buff + strlen(buff);
 	b_len = buff_len - (bp - buff);
 
 	memset(key, 0, HMAC_LEN);
@@ -334,9 +335,9 @@ dst_hmac_md5_key_from_file_format(DST_KEY *dkey, const char *buff,
 {
 	const char *p = buff, *eol;
 	u_char key[HMAC_LEN+1];	/* b64_pton needs more than 64 bytes do decode
-							 * it should probably be fixed rather than doing
-							 * this
-							 */
+				 * it should probably be fixed rather than doing
+				 * this
+				 */
 	u_char *tmp;
 	int key_len, len;
 
@@ -355,6 +356,8 @@ dst_hmac_md5_key_from_file_format(DST_KEY *dkey, const char *buff,
 		return (-4);
 	len = eol - p;
 	tmp = malloc(len + 2);
+	if (tmp == NULL)
+		return (-5);
 	memcpy(tmp, p, len);
 	*(tmp + len) = 0x0;
 	key_len = b64_pton((char *)tmp, key, HMAC_LEN+1);	/* see above */
diff --git a/lib/bind/include/arpa/nameser_compat.h b/lib/bind/include/arpa/nameser_compat.h
index 464f12e1..4460261b 100644
--- a/lib/bind/include/arpa/nameser_compat.h
+++ b/lib/bind/include/arpa/nameser_compat.h
@@ -32,7 +32,7 @@
 
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $
+ *	$Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
@@ -52,8 +52,9 @@
 #define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in long (pdp)*/
 
 #if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha) || \
+    defined(__i386__) || defined(__i386) || defined(__amd64__) || \
+    defined(__x86_64__) || defined(MIPSEL) || defined(_MIPSEL) || \
+    defined(BIT_ZERO_ON_RIGHT) || defined(__alpha__) || defined(__alpha) || \
     (defined(__Lynx__) && defined(__x86__))
 #define BYTE_ORDER	LITTLE_ENDIAN
 #endif
diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h
index 48a38294..2bf2e348 100644
--- a/lib/bind/include/netdb.h
+++ b/lib/bind/include/netdb.h
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h,v 1.12.2.1.4.5 2004/11/30 01:15:42 marka Exp $
+ *	$Id: netdb.h,v 1.12.2.1.4.6 2006/03/06 02:27:35 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -175,7 +175,7 @@ struct	addrinfo {
 	int		ai_socktype;	/* SOCK_xxx */
 	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
 #if defined(sun) && defined(_SOCKLEN_T)
-#ifdef __sparc9
+#ifdef __sparcv9
 	int		_ai_pad;
 #endif
 	socklen_t	ai_addrlen;
diff --git a/lib/bind/irs/dns.c b/lib/bind/irs/dns.c
index ab83b3e4..27529b56 100644
--- a/lib/bind/irs/dns.c
+++ b/lib/bind/irs/dns.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns.c,v 1.1.206.2 2004/03/17 00:29:47 marka Exp $";
+static const char rcsid[] = "$Id: dns.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -114,7 +114,7 @@ dns_res_get(struct irs_acc *this) {
 		res = (struct __res_state *)malloc(sizeof *res);
 		if (res == NULL)
 			return (NULL);
-		memset(dns->res, 0, sizeof *dns->res);
+		memset(res, 0, sizeof *res);
 		dns_res_set(this, res, free);
 	}
 
diff --git a/lib/bind/irs/dns_ho.c b/lib/bind/irs/dns_ho.c
index e8da61a0..192be042 100644
--- a/lib/bind/irs/dns_ho.c
+++ b/lib/bind/irs/dns_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.6 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.8 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -218,8 +218,7 @@ ho_close(struct irs_ho *this) {
 	ho_minimize(this);
 	if (pvt->res && pvt->free_res)
 		(*pvt->free_res)(pvt->res);
-	if (pvt)
-		memput(pvt, sizeof *pvt);
+	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
 
@@ -260,7 +259,7 @@ ho_byname2(struct irs_ho *this, const char *name, int af)
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
+	memset(q, 0, sizeof(*q));
 
 	switch (af) {
 	case AF_INET:
@@ -352,8 +351,8 @@ ho_byaddr(struct irs_ho *this, const void *addr, int len, int af)
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q));
+	memset(q2, 0, sizeof(*q2));
 
 	if (af == AF_INET6 && len == IN6ADDRSZ &&
 	    (!memcmp(uaddr, mapped, sizeof mapped) ||
@@ -578,8 +577,8 @@ ho_addrinfo(struct irs_ho *this, const char *name, const struct addrinfo *pai)
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q2));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q2));
+	memset(q2, 0, sizeof(*q2));
 
 	switch (pai->ai_family) {
 	case AF_UNSPEC:
@@ -649,10 +648,9 @@ ho_addrinfo(struct irs_ho *this, const char *name, const struct addrinfo *pai)
 		if (ai) {
 			querystate = RESQRY_SUCCESS;
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
-		}
-		else
+		} else
 			querystate = RESQRY_FAIL;
 	}
 
@@ -948,7 +946,7 @@ gethostans(struct irs_ho *this,
 				continue;
 			}
 			if (ret_aip) { /* need addrinfo. keep it. */
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else if (cur->ai_next) { /* need hostent */
 				struct addrinfo *aip = cur->ai_next;
diff --git a/lib/bind/irs/gai_strerror.c b/lib/bind/irs/gai_strerror.c
index 6aeaaa19..0492f8f4 100644
--- a/lib/bind/irs/gai_strerror.c
+++ b/lib/bind/irs/gai_strerror.c
@@ -66,18 +66,26 @@ gai_strerror(int ecode) {
 
 #ifdef DO_PTHREADS
         if (!once) {
-                pthread_mutex_lock(&lock);
-                if (!once++)
-                        pthread_key_create(&key, free);
-                pthread_mutex_unlock(&lock);
+                if (pthread_mutex_lock(&lock) != 0)
+			goto unknown;
+                if (!once) {
+                        if (pthread_key_create(&key, free) != 0)
+				goto unknown;
+			once = 1;
+		}
+                if (pthread_mutex_unlock(&lock) != 0)
+			goto unknown;
         }
 
 	buf = pthread_getspecific(key);
         if (buf == NULL) {
 		buf = malloc(EAI_BUFSIZE);
                 if (buf == NULL)
-                        return ("unknown error");
-                pthread_setspecific(key, buf);
+                        goto unknown;
+                if (pthread_setspecific(key, buf) != 0) {
+			free(buf);
+			goto unknown;
+		}
         }
 #endif
 	/* 
@@ -86,4 +94,9 @@ gai_strerror(int ecode) {
 	 */
 	sprintf(buf, "%s: %d", gai_errlist[gai_nerr - 1], ecode);
 	return (buf);
+
+#ifdef DO_PTHREADS
+ unknown:
+	return ("unknown error");
+#endif
 }
diff --git a/lib/bind/irs/gen_ho.c b/lib/bind/irs/gen_ho.c
index e9e2c890..f17aa223 100644
--- a/lib/bind/irs/gen_ho.c
+++ b/lib/bind/irs/gen_ho.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.2 2004/03/17 01:49:39 marka Exp $";
+static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports */
@@ -371,8 +371,6 @@ ho_addrinfo(struct irs_ho *this, const char *name, const struct addrinfo *pai)
 	}
 	if (softerror != 0 && pvt->res->res_h_errno == HOST_NOT_FOUND)
 		RES_SET_H_ERRNO(pvt->res, therrno);
-	if (rval)
-		freeaddrinfo(rval);
 	return (NULL);
 }
 
diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c
index 4f741a8e..39617e46 100644
--- a/lib/bind/irs/getaddrinfo.c
+++ b/lib/bind/irs/getaddrinfo.c
@@ -332,7 +332,7 @@ getaddrinfo(hostname, servname, hints, res)
 	pai->ai_family = PF_UNSPEC;
 	pai->ai_socktype = ANY;
 	pai->ai_protocol = ANY;
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 	/*
 	 * clear _ai_pad to preserve binary
 	 * compatibility with previously compiled 64-bit
@@ -340,7 +340,7 @@ getaddrinfo(hostname, servname, hints, res)
 	 * guaranteeing the upper 32-bits are empty.
 	 */
 	pai->_ai_pad = 0;
-#endif /* __sparcv9 */
+#endif
 	pai->ai_addrlen = 0;
 	pai->ai_canonname = NULL;
 	pai->ai_addr = NULL;
@@ -365,7 +365,7 @@ getaddrinfo(hostname, servname, hints, res)
 		}
 		memcpy(pai, hints, sizeof(*pai));
 
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 		/*
 		 * We need to clear _ai_pad to preserve binary
 		 * compatibility.  See prior comment.
@@ -576,10 +576,6 @@ getaddrinfo(hostname, servname, hints, res)
 
 	freeaddrinfo(afai);	/* afai must not be NULL at this point. */
 
-	/* we must not have got any errors. */
-	if (error != 0) /* just for diagnosis */
-		abort();
-
 	if (sentinel.ai_next) {
 good:
 		*res = sentinel.ai_next;
@@ -804,7 +800,7 @@ explore_numeric(pai, hostname, servname, res)
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -817,7 +813,7 @@ explore_numeric(pai, hostname, servname, res)
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -1202,7 +1198,7 @@ hostent2addrinfo(hp, pai)
 			 */
 			GET_CANONNAME(cur->ai_next, hp->h_name);
 		}
-		while (cur && cur->ai_next) /* no need to loop, actually. */
+		while (cur->ai_next) /* no need to loop, actually. */
 			cur = cur->ai_next;
 		continue;
 
diff --git a/lib/bind/irs/gethostent.c b/lib/bind/irs/gethostent.c
index b471c529..cfea501f 100644
--- a/lib/bind/irs/gethostent.c
+++ b/lib/bind/irs/gethostent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.2 2004/03/17 01:49:40 marka Exp $";
+static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.3 2006/01/10 05:09:16 marka Exp $";
 #endif
 
 /* Imports */
@@ -608,7 +608,7 @@ scan_interfaces6(int *have_v4, int *have_v6) {
 }
 #endif
 
-#ifdef __linux
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
 #ifndef IF_NAMESIZE
 # ifdef IFNAMSIZ
 #  define IF_NAMESIZE  IFNAMSIZ
diff --git a/lib/bind/irs/getnameinfo.c b/lib/bind/irs/getnameinfo.c
index 5947c038..d6d89f3e 100644
--- a/lib/bind/irs/getnameinfo.c
+++ b/lib/bind/irs/getnameinfo.c
@@ -3,6 +3,16 @@
  * - Thread safe-ness must be checked
  */
 
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
+#ifndef IF_NAMESIZE
+# ifdef IFNAMSIZ
+#  define IF_NAMESIZE  IFNAMSIZ
+# else
+#  define IF_NAMESIZE 16
+# endif
+#endif
+#endif
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
diff --git a/lib/bind/irs/irp.c b/lib/bind/irs/irp.c
index e5620db3..649079c3 100644
--- a/lib/bind/irs/irp.c
+++ b/lib/bind/irs/irp.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.2 2004/03/17 01:49:41 marka Exp $";
+static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Imports */
@@ -425,6 +425,9 @@ irs_irp_read_body(struct irp_p *pvt, size_t *size) {
 	char *buffer = memget(len);
 	int idx = 0;
 
+	if (buffer == NULL)
+		return (NULL);
+
 	for (;;) {
 		if (irs_irp_read_line(pvt, line, sizeof line) <= 0 ||
 		    strchr(line, '\n') == NULL)
@@ -517,7 +520,7 @@ irs_irp_get_full_response(struct irp_p *pvt, int *code, char *text,
  * int irs_irp_send_command(struct irp_p *pvt, const char *fmt, ...);
  *
  *	Sends command to remote connected via the PVT
- *	struture. FMT and args after it are fprintf-like
+ *	structure. FMT and args after it are fprintf-like
  *	arguments for formatting.
  *
  * Returns:
diff --git a/lib/bind/irs/irp_nw.c b/lib/bind/irs/irp_nw.c
index 346e5a4d..ea686124 100644
--- a/lib/bind/irs/irp_nw.c
+++ b/lib/bind/irs/irp_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.1 2004/03/09 08:33:37 marka Exp $";
+static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -319,6 +319,8 @@ nw_next(struct irs_nw *this) {
 		nw = NULL;
 	}
 
+	if (body != NULL)
+		memput(body, bodylen);
 	return (nw);
 }
 
diff --git a/lib/bind/irs/irpmarshall.c b/lib/bind/irs/irpmarshall.c
index 6d2ebd48..198e349d 100644
--- a/lib/bind/irs/irpmarshall.c
+++ b/lib/bind/irs/irpmarshall.c
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.3 2004/03/17 01:13:34 marka Exp $";
+static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.4 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -1020,7 +1020,7 @@ irp_unmarshall_ho(struct hostent *ho, char *buffer) {
 	int hoaddrtype;
 	int holength;
 	long t;
-	char *name = NULL;
+	char *name;
 	char **aliases = NULL;
 	char **hohaddrlist = NULL;
 	size_t hoaddrsize;
@@ -1143,6 +1143,7 @@ irp_unmarshall_ho(struct hostent *ho, char *buffer) {
 	errno = myerrno;
 
 	if (name != NULL) free(name);
+	free_array(hohaddrlist, 0);
 	free_array(aliases, 0);
 
 	return (-1);
@@ -1313,7 +1314,6 @@ irp_unmarshall_ng(const char **hostp, const char **userp, const char **domainp,
 
 	if (host != NULL) free(host);
 	if (user != NULL) free(user);
-	if (domain != NULL) free(domain);
 
 	return (-1);
 }
diff --git a/lib/bind/irs/irs_data.c b/lib/bind/irs/irs_data.c
index f8e65adf..7904286d 100644
--- a/lib/bind/irs/irs_data.c
+++ b/lib/bind/irs/irs_data.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.3 2004/11/30 01:15:43 marka Exp $";
+static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -128,10 +128,15 @@ net_data_init(const char *conf_file) {
 	struct net_data *net_data;
 
 	if (!once) {
-		pthread_mutex_lock(&keylock);
-		if (!once++)
-			pthread_key_create(&key, net_data_destroy);
-		pthread_mutex_unlock(&keylock);
+		if (pthread_mutex_lock(&keylock) != 0)
+			return (NULL);
+		if (!once) {
+			if (pthread_key_create(&key, net_data_destroy) != 0)
+				return (NULL);
+			once = 1;
+		}
+		if (pthread_mutex_unlock(&keylock) != 0)
+			return (NULL);
 	}
 	net_data = pthread_getspecific(key);
 #endif
@@ -141,7 +146,10 @@ net_data_init(const char *conf_file) {
 		if (net_data == NULL)
 			return (NULL);
 #ifdef	DO_PTHREADS
-		pthread_setspecific(key, net_data);
+		if (pthread_setspecific(key, net_data) != 0) {
+			net_data_destroy(net_data);
+			return (NULL);
+		}
 #endif
 	}
 
diff --git a/lib/bind/irs/lcl_ho.c b/lib/bind/irs/lcl_ho.c
index 45d26778..b59a1046 100644
--- a/lib/bind/irs/lcl_ho.c
+++ b/lib/bind/irs/lcl_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.2 2004/03/17 00:29:50 marka Exp $";
+static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -541,7 +541,7 @@ ho_addrinfo(struct irs_ho *this, const char *name, const struct addrinfo *pai)
 		ai = hostent2addrinfo(hp, pai);
 		if (ai) {
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
 		}
 	}
diff --git a/lib/bind/irs/lcl_pr.c b/lib/bind/irs/lcl_pr.c
index d8f909e8..ddc92c89 100644
--- a/lib/bind/irs/lcl_pr.c
+++ b/lib/bind/irs/lcl_pr.c
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.1 2004/03/09 08:33:38 marka Exp $";
+static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* extern */
@@ -85,6 +85,7 @@ static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.1 2004/03/09 08:33:38 marka
 struct pvt {
 	FILE *		fp;
 	char		line[BUFSIZ+1];
+	char *		dbuf;
 	struct protoent	proto;
 	char *		proto_aliases[MAXALIASES];
 };
@@ -141,6 +142,8 @@ pr_close(struct irs_pr *this) {
 
 	if (pvt->fp)
 		(void) fclose(pvt->fp);
+	if (pvt->dbuf)
+		free(pvt->dbuf);
 	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
@@ -202,6 +205,10 @@ pr_next(struct irs_pr *this) {
 		pr_rewind(this);
 	if (!pvt->fp)
 		return (NULL);
+	if (pvt->dbuf) {
+		free(pvt->dbuf);
+		pvt->dbuf = NULL;
+	}
 	bufp = pvt->line;
 	bufsiz = BUFSIZ;
 	offset = 0;
@@ -270,6 +277,7 @@ pr_next(struct irs_pr *this) {
 		}
 	}
 	*q = NULL;
+	pvt->dbuf = dbuf;
 	return (&pvt->proto);
 }
 
diff --git a/lib/bind/isc/ev_connects.c b/lib/bind/isc/ev_connects.c
index 4b0dd222..b3873b72 100644
--- a/lib/bind/isc/ev_connects.c
+++ b/lib/bind/isc/ev_connects.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.2 2005/07/08 04:52:54 marka Exp $";
+static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -69,7 +69,7 @@ evListen(evContext opaqueCtx, int fd, int maxconn,
 
 	OKNEW(new);
 	new->flags = EV_CONN_LISTEN;
-	OK(mode = fcntl(fd, F_GETFL, NULL));	/* side effect: validate fd. */
+	OKFREE(mode = fcntl(fd, F_GETFL, NULL), new);	/* side effect: validate fd. */
 	/*
 	 * Remember the nonblocking status.  We assume that either evSelectFD
 	 * has not been done to this fd, or that if it has then the caller
@@ -80,13 +80,13 @@ evListen(evContext opaqueCtx, int fd, int maxconn,
 	if ((mode & PORT_NONBLOCK) == 0) {
 #ifdef USE_FIONBIO_IOCTL
 		int on = 1;
-		OK(ioctl(fd, FIONBIO, (char *)&on));
+		OKFREE(ioctl(fd, FIONBIO, (char *)&on), new);
 #else
-		OK(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK));
+		OKFREE(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK), new);
 #endif
 		new->flags |= EV_CONN_BLOCK;
 	}
-	OK(listen(fd, maxconn));
+	OKFREE(listen(fd, maxconn), new);
 	if (evSelectFD(opaqueCtx, fd, EV_READ, listener, new, &new->file) < 0){
 		int save = errno;
 
diff --git a/lib/bind/isc/eventlib.c b/lib/bind/isc/eventlib.c
index 77b14144..11120eca 100644
--- a/lib/bind/isc/eventlib.c
+++ b/lib/bind/isc/eventlib.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.5 2005/07/28 07:43:20 marka Exp $";
+static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.6 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -784,13 +784,10 @@ pselect(int nfds, void *rfds, void *wfds, void *efds,
 		pnfds = 0;
 	}
 	n = poll(fds, pnfds, polltimeout);
-	/*
-	 * pselect() should return the total number of events on the file
-	 * desriptors, not just the count of fd:s with activity. Hence,
-	 * traverse the pollfds array and count the events.
-	 */
 	if (n > 0) {
 		int     i, e;
+
+		INSIST(ctx != NULL);
 		for (e = 0, i = ctx->firstfd; i <= ctx->fdMax; i++) {
 			if (ctx->pollfds[i].fd < 0)
 				continue;
diff --git a/lib/bind/isc/eventlib_p.h b/lib/bind/isc/eventlib_p.h
index b95741d7..5c45ab83 100644
--- a/lib/bind/isc/eventlib_p.h
+++ b/lib/bind/isc/eventlib_p.h
@@ -18,7 +18,7 @@
 /* eventlib_p.h - private interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $
+ * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $
  */
 
 #ifndef _EVENTLIB_P_H
@@ -45,6 +45,8 @@
 #define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
 #define EV_ERR(e)		return (errno = (e), -1)
 #define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
+#define OKFREE(x, y)	if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
+			else (void)NULL
 
 #define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
 				FILL(p); \
diff --git a/lib/bind/isc/heap.c b/lib/bind/isc/heap.c
index f63619f5..2faf6f57 100644
--- a/lib/bind/isc/heap.c
+++ b/lib/bind/isc/heap.c
@@ -26,7 +26,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: heap.c,v 1.1.206.1 2004/03/09 08:33:43 marka Exp $";
+static const char rcsid[] = "$Id: heap.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -54,9 +54,13 @@ heap_new(heap_higher_priority_func higher_priority, heap_index_func index,
 	 int array_size_increment) {
 	heap_context ctx;
 
+	if (higher_priority == NULL)
+		return (NULL);
+
 	ctx = (heap_context)malloc(sizeof (struct heap_context));
-	if (ctx == NULL || higher_priority == NULL)
+	if (ctx == NULL)
 		return (NULL);
+
 	ctx->array_size = 0;
 	if (array_size_increment == 0)
 		ctx->array_size_increment = ARRAY_SIZE_INCREMENT;
diff --git a/lib/bind/isc/hex.c b/lib/bind/isc/hex.c
index c177ca0f..70312597 100644
--- a/lib/bind/isc/hex.c
+++ b/lib/bind/isc/hex.c
@@ -45,8 +45,9 @@ isc_gethexstring(unsigned char *buf, size_t len, int count, FILE *fp,
 			goto formerr;
 		/* comment */
 		if (c == ';') {
-			while ((c = fgetc(fp)) != EOF && c != '\n')
-				/* empty */
+			do {
+				c = fgetc(fp);
+			} while (c != EOF && c != '\n');
 			if (c == '\n' && *multiline)
 				continue;
 			goto formerr;
diff --git a/lib/bind/nameser/ns_sign.c b/lib/bind/nameser/ns_sign.c
index 56248a59..7b742f1f 100644
--- a/lib/bind/nameser/ns_sign.c
+++ b/lib/bind/nameser/ns_sign.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.1 2004/03/09 08:33:45 marka Exp $";
+static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -89,7 +89,7 @@ ns_sign2(u_char *msg, int *msglen, int msgsize, int error, void *k,
 {
 	HEADER *hp = (HEADER *)msg;
 	DST_KEY *key = (DST_KEY *)k;
-	u_char *cp = msg + *msglen, *eob = msg + msgsize;
+	u_char *cp, *eob;
 	u_char *lenp;
 	u_char *alg;
 	int n;
@@ -100,6 +100,9 @@ ns_sign2(u_char *msg, int *msglen, int msgsize, int error, void *k,
 	if (msg == NULL || msglen == NULL || sig == NULL || siglen == NULL)
 		return (-1);
 
+	cp = msg + *msglen;
+	eob = msg + msgsize;
+
 	/* Name. */
 	if (key != NULL && error != ns_r_badsig && error != ns_r_badkey) {
 		n = ns_name_pton(key->dk_key_name, name, sizeof name);
diff --git a/lib/bind/nameser/ns_verify.c b/lib/bind/nameser/ns_verify.c
index adda249b..c74a0a38 100644
--- a/lib/bind/nameser/ns_verify.c
+++ b/lib/bind/nameser/ns_verify.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.2 2005/10/11 00:48:16 marka Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -343,7 +343,7 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
 	HEADER *hp = (HEADER *)msg;
 	u_char *recstart, *sigstart;
 	unsigned int sigfieldlen, otherfieldlen;
-	u_char *cp, *eom = msg + *msglen, *cp2;
+	u_char *cp, *eom, *cp2;
 	char name[MAXDNAME], alg[MAXDNAME];
 	u_char buf[MAXDNAME];
 	int n, type, length, fudge, error;
@@ -352,6 +352,8 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
 	if (msg == NULL || msglen == NULL || state == NULL)
 		return (-1);
 
+	eom = msg + *msglen;
+
 	state->counter++;
 	if (state->counter == 0)
 		return (ns_verify(msg, msglen, state->key,
diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index 0c956b71..12d8d2bc 100644
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -5,6 +5,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
+#include <sys/time.h>
 #if (!defined(BSD)) || (BSD < 199306)
 #include <sys/bitypes.h>
 #endif
diff --git a/lib/bind/resolv/mtctxres.c b/lib/bind/resolv/mtctxres.c
index f33cf11e..635bbd44 100644
--- a/lib/bind/resolv/mtctxres.c
+++ b/lib/bind/resolv/mtctxres.c
@@ -106,9 +106,10 @@ ___mtctxres(void) {
 	 */
 	if (!mt_key_initialized) {
 		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                pthread_mutex_lock(&keylock);
-		_mtctxres_init();
-                pthread_mutex_unlock(&keylock);
+                if (pthread_mutex_lock(&keylock) == 0) {
+			_mtctxres_init();
+			(void) pthread_mutex_unlock(&keylock);
+		}
 	}
 
 	/*
diff --git a/lib/bind/resolv/res_send.c b/lib/bind/resolv/res_send.c
index 5be24893..24527ead 100644
--- a/lib/bind/resolv/res_send.c
+++ b/lib/bind/resolv/res_send.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -130,7 +130,7 @@ static struct sockaddr * get_nsaddr __P((res_state, size_t));
 static int		send_vc(res_state, const u_char *, int,
 				u_char *, int, int *, int);
 static int		send_dg(res_state, const u_char *, int,
-				u_char *, int, int *, int,
+				u_char *, int, int *, int, int,
 				int *, int *);
 static void		Aerror(const res_state, FILE *, const char *, int,
 			       const struct sockaddr *, int);
@@ -458,7 +458,7 @@ res_nsend(res_state statp,
 		} else {
 			/* Use datagrams. */
 			n = send_dg(statp, buf, buflen, ans, anssiz, &terrno,
-				    ns, &v_circuit, &gotsomewhere);
+				    ns, try, &v_circuit, &gotsomewhere);
 			if (n < 0)
 				goto fail;
 			if (n == 0)
@@ -766,9 +766,9 @@ send_vc(res_state statp,
 }
 
 static int
-send_dg(res_state statp,
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns, int *v_circuit, int *gotsomewhere)
+send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
+	int anssiz, int *terrno, int ns, int try, int *v_circuit,
+	int *gotsomewhere)
 {
 	const HEADER *hp = (const HEADER *) buf;
 	HEADER *anhp = (HEADER *) ans;
@@ -849,7 +849,7 @@ send_dg(res_state statp,
 	/*
 	 * Wait for reply.
 	 */
-	seconds = (statp->retrans << ns);
+	seconds = (statp->retrans << try);
 	if (ns > 0)
 		seconds /= statp->nscount;
 	if (seconds <= 0)
diff --git a/lib/bind/resolv/res_sendsigned.c b/lib/bind/resolv/res_sendsigned.c
index d1d22745..93ad5c97 100644
--- a/lib/bind/resolv/res_sendsigned.c
+++ b/lib/bind/resolv/res_sendsigned.c
@@ -52,6 +52,7 @@ res_nsendsigned(res_state statp, const u_char *msg, int msglen,
 	bufsize = msglen + 1024;
 	newmsg = (u_char *) malloc(bufsize);
 	if (newmsg == NULL) {
+		free(nstatp);
 		errno = ENOMEM;
 		return (-1);
 	}
@@ -102,11 +103,11 @@ res_nsendsigned(res_state statp, const u_char *msg, int msglen,
 retry:
 
 	len = res_nsend(nstatp, newmsg, newmsglen, answer, anslen);
-	if (ret < 0) {
+	if (len < 0) {
 		free (nstatp);
 		free (newmsg);
 		dst_free_key(dstkey);
-		return (ret);
+		return (len);
 	}
 
 	ret = ns_verify(answer, &len, dstkey, sig, siglen,
diff --git a/lib/bind9/api b/lib/bind9/api
index 0a12b5e8..be7faa69 100644
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 0
-LIBREVISION = 7
+LIBREVISION = 8
 LIBAGE = 0
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index e6e86fd1..2079a847 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.37.6.32 2005/11/03 23:08:41 marka Exp $ */
+/* $Id: check.c,v 1.37.6.34 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -50,12 +50,12 @@ freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) {
 }
 
 static isc_result_t
-check_orderent(cfg_obj_t *ent, isc_log_t *logctx) {
+check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 	isc_textregion_t r;
 	dns_fixedname_t fixed;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 	dns_rdataclass_t rdclass;
 	dns_rdatatype_t rdtype;
 	isc_buffer_t b;
@@ -132,11 +132,11 @@ check_orderent(cfg_obj_t *ent, isc_log_t *logctx) {
 }
 
 static isc_result_t
-check_order(cfg_obj_t *options, isc_log_t *logctx) {
+check_order(const cfg_obj_t *options, isc_log_t *logctx) {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
-	cfg_listelt_t *element;
-	cfg_obj_t *obj = NULL;
+	const cfg_listelt_t *element;
+	const cfg_obj_t *obj = NULL;
 
 	if (cfg_map_get(options, "rrset-order", &obj) != ISC_R_SUCCESS)
 		return (result);
@@ -153,12 +153,12 @@ check_order(cfg_obj_t *options, isc_log_t *logctx) {
 }
 
 static isc_result_t
-check_dual_stack(cfg_obj_t *options, isc_log_t *logctx) {
-	cfg_listelt_t *element;
-	cfg_obj_t *alternates = NULL;
-	cfg_obj_t *value;
-	cfg_obj_t *obj;
-	char *str;
+check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) {
+	const cfg_listelt_t *element;
+	const cfg_obj_t *alternates = NULL;
+	const cfg_obj_t *value;
+	const cfg_obj_t *obj;
+	const char *str;
 	dns_fixedname_t fixed;
 	dns_name_t *name;
 	isc_buffer_t buffer;
@@ -213,9 +213,9 @@ check_dual_stack(cfg_obj_t *options, isc_log_t *logctx) {
 }
 
 static isc_result_t
-check_forward(cfg_obj_t *options, isc_log_t *logctx) {
-	cfg_obj_t *forward = NULL;
-	cfg_obj_t *forwarders = NULL;
+check_forward(const cfg_obj_t *options, isc_log_t *logctx) {
+	const cfg_obj_t *forward = NULL;
+	const cfg_obj_t *forwarders = NULL;
 
 	(void)cfg_map_get(options, "forward", &forward);
 	(void)cfg_map_get(options, "forwarders", &forwarders);
@@ -229,15 +229,15 @@ check_forward(cfg_obj_t *options, isc_log_t *logctx) {
 }
 
 static isc_result_t
-disabled_algorithms(cfg_obj_t *disabled, isc_log_t *logctx) {
+disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
-	cfg_listelt_t *element;
+	const cfg_listelt_t *element;
 	const char *str;
 	isc_buffer_t b;
 	dns_fixedname_t fixed;
 	dns_name_t *name;
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 
 	dns_fixedname_init(&fixed);
 	name = dns_fixedname_name(&fixed);
@@ -262,7 +262,7 @@ disabled_algorithms(cfg_obj_t *disabled, isc_log_t *logctx) {
 		dns_secalg_t alg;
 		isc_result_t tresult;
 
-		r.base = cfg_obj_asstring(cfg_listelt_value(element));
+		DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base);
 		r.length = strlen(r.base);
 
 		tresult = dns_secalg_fromtext(&alg, &r);
@@ -280,8 +280,9 @@ disabled_algorithms(cfg_obj_t *disabled, isc_log_t *logctx) {
 }
 
 static isc_result_t
-nameexist(cfg_obj_t *obj, const char *name, int value, isc_symtab_t *symtab,
-	  const char *fmt, isc_log_t *logctx, isc_mem_t *mctx)
+nameexist(const cfg_obj_t *obj, const char *name, int value,
+	  isc_symtab_t *symtab, const char *fmt, isc_log_t *logctx,
+	  isc_mem_t *mctx)
 {
 	char *key;
 	const char *file;
@@ -292,14 +293,14 @@ nameexist(cfg_obj_t *obj, const char *name, int value, isc_symtab_t *symtab,
 	key = isc_mem_strdup(mctx, name);
 	if (key == NULL)
 		return (ISC_R_NOMEMORY);
-	symvalue.as_pointer = obj;
+	symvalue.as_cpointer = obj;
 	result = isc_symtab_define(symtab, key, value, symvalue,
 				   isc_symexists_reject);
 	if (result == ISC_R_EXISTS) {
 		RUNTIME_CHECK(isc_symtab_lookup(symtab, key, value,
 						&symvalue) == ISC_R_SUCCESS);
-		file = cfg_obj_file(symvalue.as_pointer);
-		line = cfg_obj_line(symvalue.as_pointer);
+		file = cfg_obj_file(symvalue.as_cpointer);
+		line = cfg_obj_line(symvalue.as_cpointer);
 
 		if (file == NULL)
 			file = "<unknown file>";
@@ -313,10 +314,10 @@ nameexist(cfg_obj_t *obj, const char *name, int value, isc_symtab_t *symtab,
 }
 
 static isc_result_t
-mustbesecure(cfg_obj_t *secure, isc_symtab_t *symtab, isc_log_t *logctx,
+mustbesecure(const cfg_obj_t *secure, isc_symtab_t *symtab, isc_log_t *logctx,
 	     isc_mem_t *mctx)
 {
-	cfg_obj_t *obj;
+	const cfg_obj_t *obj;
 	char namebuf[DNS_NAME_FORMATSIZE];
 	const char *str;
 	dns_fixedname_t fixed;
@@ -351,12 +352,12 @@ typedef struct {
 } intervaltable;
 
 static isc_result_t
-check_options(cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx) {
+check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx) {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 	unsigned int i;
-	cfg_obj_t *obj = NULL;
-	cfg_listelt_t *element;
+	const cfg_obj_t *obj = NULL;
+	const cfg_listelt_t *element;
 	isc_symtab_t *symtab = NULL;
 
 	static intervaltable intervals[] = {
@@ -411,9 +412,9 @@ check_options(cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx) {
 	(void)cfg_map_get(options, "root-delegation-only", &obj);
 	if (obj != NULL) {
 		if (!cfg_obj_isvoid(obj)) {
-			cfg_listelt_t *element;
-			cfg_obj_t *exclude;
-			char *str;
+			const cfg_listelt_t *element;
+			const cfg_obj_t *exclude;
+			const char *str;
 			dns_fixedname_t fixed;
 			dns_name_t *name;
 			isc_buffer_t b;
@@ -557,10 +558,10 @@ check_options(cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx) {
 }
 
 static isc_result_t
-get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
+get_masters_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) {
 	isc_result_t result;
-	cfg_obj_t *masters = NULL;
-	cfg_listelt_t *elt;
+	const cfg_obj_t *masters = NULL;
+	const cfg_listelt_t *elt;
 
 	result = cfg_map_get(cctx, "masters", &masters);
 	if (result != ISC_R_SUCCESS)
@@ -568,7 +569,7 @@ get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 	for (elt = cfg_list_first(masters);
 	     elt != NULL;
 	     elt = cfg_list_next(elt)) {
-		cfg_obj_t *list;
+		const cfg_obj_t *list;
 		const char *listname;
 
 		list = cfg_listelt_value(elt);
@@ -583,18 +584,18 @@ get_masters_def(cfg_obj_t *cctx, char *name, cfg_obj_t **ret) {
 }
 
 static isc_result_t
-validate_masters(cfg_obj_t *obj, cfg_obj_t *config, isc_uint32_t *countp,
-		 isc_log_t *logctx, isc_mem_t *mctx)
+validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config,
+	         isc_uint32_t *countp, isc_log_t *logctx, isc_mem_t *mctx)
 {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 	isc_uint32_t count = 0;
 	isc_symtab_t *symtab = NULL;
 	isc_symvalue_t symvalue;
-	cfg_listelt_t *element;
-	cfg_listelt_t **stack = NULL;
+	const cfg_listelt_t *element;
+	const cfg_listelt_t **stack = NULL;
 	isc_uint32_t stackcount = 0, pushed = 0;
-	cfg_obj_t *list;
+	const cfg_obj_t *list;
 
 	REQUIRE(countp != NULL);
 	result = isc_symtab_create(mctx, 100, NULL, NULL, ISC_FALSE, &symtab);
@@ -611,9 +612,9 @@ validate_masters(cfg_obj_t *obj, cfg_obj_t *config, isc_uint32_t *countp,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		char *listname;
-		cfg_obj_t *addr;
-		cfg_obj_t *key;
+		const char *listname;
+		const cfg_obj_t *addr;
+		const cfg_obj_t *key;
 
 		addr = cfg_tuple_get(cfg_listelt_value(element),
 				     "masterselement");
@@ -631,7 +632,7 @@ validate_masters(cfg_obj_t *obj, cfg_obj_t *config, isc_uint32_t *countp,
 				result = ISC_R_FAILURE;
 		}
 		listname = cfg_obj_asstring(addr);
-		symvalue.as_pointer = addr;
+		symvalue.as_cpointer = addr;
 		tresult = isc_symtab_define(symtab, listname, 1, symvalue,
 					    isc_symexists_reject);
 		if (tresult == ISC_R_EXISTS)
@@ -691,14 +692,15 @@ typedef struct {
 } optionstable;
 
 static isc_result_t
-check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab,
-	       dns_rdataclass_t defclass, isc_log_t *logctx, isc_mem_t *mctx)
+check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *config,
+	       isc_symtab_t *symtab, dns_rdataclass_t defclass,
+	       isc_log_t *logctx, isc_mem_t *mctx)
 {
 	const char *zname;
 	const char *typestr;
 	unsigned int ztype;
-	cfg_obj_t *zoptions;
-	cfg_obj_t *obj = NULL;
+	const cfg_obj_t *zoptions;
+	const cfg_obj_t *obj = NULL;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 	unsigned int i;
@@ -902,10 +904,10 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab,
 	 * Check the excessively complicated "dialup" option.
 	 */
 	if (ztype == MASTERZONE || ztype == SLAVEZONE || ztype == STUBZONE) {
-		cfg_obj_t *dialup = NULL;
+		const cfg_obj_t *dialup = NULL;
 		(void)cfg_map_get(zoptions, "dialup", &dialup);
 		if (dialup != NULL && cfg_obj_isstring(dialup)) {
-			char *str = cfg_obj_asstring(dialup);
+			const char *str = cfg_obj_asstring(dialup);
 			for (i = 0;
 			     i < sizeof(dialups) / sizeof(dialups[0]);
 			     i++)
@@ -970,9 +972,9 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab,
 }
 
 isc_result_t
-bind9_check_key(cfg_obj_t *key, isc_log_t *logctx) {
-	cfg_obj_t *algobj = NULL;
-	cfg_obj_t *secretobj = NULL;
+bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) {
+	const cfg_obj_t *algobj = NULL;
+	const cfg_obj_t *secretobj = NULL;
 	const char *keyname = cfg_obj_asstring(cfg_map_getname(key));
 	
 	(void)cfg_map_get(key, "algorithm", &algobj);
@@ -988,20 +990,20 @@ bind9_check_key(cfg_obj_t *key, isc_log_t *logctx) {
 }
 
 static isc_result_t
-check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) {
+check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
-	cfg_listelt_t *element;
+	const cfg_listelt_t *element;
 
 	for (element = cfg_list_first(keys);
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		cfg_obj_t *key = cfg_listelt_value(element);
+		const cfg_obj_t *key = cfg_listelt_value(element);
 		const char *keyname = cfg_obj_asstring(cfg_map_getname(key));
 		isc_symvalue_t symvalue;
 
-		symvalue.as_pointer = key;
+		symvalue.as_cpointer = key;
 		tresult = isc_symtab_define(symtab, keyname, 1,
 					    symvalue, isc_symexists_reject);
 		if (tresult == ISC_R_EXISTS) {
@@ -1010,8 +1012,8 @@ check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) {
 
 			RUNTIME_CHECK(isc_symtab_lookup(symtab, keyname,
 					    1, &symvalue) == ISC_R_SUCCESS);
-			file = cfg_obj_file(symvalue.as_pointer);
-			line = cfg_obj_line(symvalue.as_pointer);
+			file = cfg_obj_file(symvalue.as_cpointer);
+			line = cfg_obj_line(symvalue.as_cpointer);
 
 			if (file == NULL)
 				file = "<unknown file>";
@@ -1031,13 +1033,16 @@ check_keylist(cfg_obj_t *keys, isc_symtab_t *symtab, isc_log_t *logctx) {
 }
 
 static isc_result_t
-check_servers(cfg_obj_t *servers, isc_log_t *logctx) {
+check_servers(const cfg_obj_t *servers, isc_log_t *logctx) {
 	isc_result_t result = ISC_R_SUCCESS;
-	cfg_listelt_t *e1, *e2;
-	cfg_obj_t *v1, *v2;
-	isc_sockaddr_t *s1, *s2;
+	const cfg_listelt_t *e1;
+	const cfg_listelt_t *e2;
+	const cfg_obj_t *v1;
+	const cfg_obj_t *v2;
+	const isc_sockaddr_t *s1;
+	const isc_sockaddr_t *s2;
 	isc_netaddr_t na;
-	cfg_obj_t *ts;
+	const cfg_obj_t *ts;
 	char buf[128];
 	const char *xfr;
 	isc_buffer_t target;
@@ -1090,13 +1095,13 @@ check_servers(cfg_obj_t *servers, isc_log_t *logctx) {
 }
 		
 static isc_result_t
-check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass,
-	       isc_log_t *logctx, isc_mem_t *mctx)
+check_viewconf(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+	       dns_rdataclass_t vclass, isc_log_t *logctx, isc_mem_t *mctx)
 {
-	cfg_obj_t *servers = NULL;
-	cfg_obj_t *zones = NULL;
-	cfg_obj_t *keys = NULL;
-	cfg_listelt_t *element;
+	const cfg_obj_t *servers = NULL;
+	const cfg_obj_t *zones = NULL;
+	const cfg_obj_t *keys = NULL;
+	const cfg_listelt_t *element;
 	isc_symtab_t *symtab = NULL;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult = ISC_R_SUCCESS;
@@ -1120,7 +1125,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass,
 	     element = cfg_list_next(element))
 	{
 		isc_result_t tresult;
-		cfg_obj_t *zone = cfg_listelt_value(element);
+		const cfg_obj_t *zone = cfg_listelt_value(element);
 
 		tresult = check_zoneconf(zone, config, symtab, vclass,
 					 logctx, mctx);
@@ -1165,7 +1170,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass,
 	 * Check that forwarding is reasonable.
 	 */
 	if (vconfig == NULL) {
-		cfg_obj_t *options = NULL;
+		const cfg_obj_t *options = NULL;
 		(void)cfg_map_get(config, "options", &options);
 		if (options != NULL)
 			if (check_forward(options, logctx) != ISC_R_SUCCESS)
@@ -1178,7 +1183,7 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass,
 	 * Check that dual-stack-servers is reasonable.
 	 */
 	if (vconfig == NULL) {
-		cfg_obj_t *options = NULL;
+		const cfg_obj_t *options = NULL;
 		(void)cfg_map_get(config, "options", &options);
 		if (options != NULL)
 			if (check_dual_stack(options, logctx) != ISC_R_SUCCESS)
@@ -1215,14 +1220,16 @@ check_viewconf(cfg_obj_t *config, cfg_obj_t *vconfig, dns_rdataclass_t vclass,
 
 
 isc_result_t
-bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
-	cfg_obj_t *options = NULL;
-	cfg_obj_t *servers = NULL;
-	cfg_obj_t *views = NULL;
-	cfg_obj_t *acls = NULL;
-	cfg_obj_t *kals = NULL;
-	cfg_obj_t *obj;
-	cfg_listelt_t *velement;
+bind9_check_namedconf(const cfg_obj_t *config, isc_log_t *logctx,
+		      isc_mem_t *mctx)
+{
+	const cfg_obj_t *options = NULL;
+	const cfg_obj_t *servers = NULL;
+	const cfg_obj_t *views = NULL;
+	const cfg_obj_t *acls = NULL;
+	const cfg_obj_t *kals = NULL;
+	const cfg_obj_t *obj;
+	const cfg_listelt_t *velement;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 	isc_symtab_t *symtab = NULL;
@@ -1256,7 +1263,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 				   logctx, mctx) != ISC_R_SUCCESS)
 			result = ISC_R_FAILURE;
 	} else {
-		cfg_obj_t *zones = NULL;
+		const cfg_obj_t *zones = NULL;
 
 		(void)cfg_map_get(config, "zone", &zones);
 		if (zones != NULL) {
@@ -1274,10 +1281,10 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 	     velement != NULL;
 	     velement = cfg_list_next(velement))
 	{
-		cfg_obj_t *view = cfg_listelt_value(velement);
-		cfg_obj_t *vname = cfg_tuple_get(view, "name");
-		cfg_obj_t *voptions = cfg_tuple_get(view, "options");
-		cfg_obj_t *vclassobj = cfg_tuple_get(view, "class");
+		const cfg_obj_t *view = cfg_listelt_value(velement);
+		const cfg_obj_t *vname = cfg_tuple_get(view, "name");
+		const cfg_obj_t *voptions = cfg_tuple_get(view, "options");
+		const cfg_obj_t *vclassobj = cfg_tuple_get(view, "class");
 		dns_rdataclass_t vclass = dns_rdataclass_in;
 		isc_result_t tresult = ISC_R_SUCCESS;
 		const char *key = cfg_obj_asstring(vname);
@@ -1295,7 +1302,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 					    cfg_obj_asstring(vname), r.base);
 		}
 		if (tresult == ISC_R_SUCCESS && symtab != NULL) {
-			symvalue.as_pointer = view;
+			symvalue.as_cpointer = view;
 			tresult = isc_symtab_define(symtab, key, vclass,
 						    symvalue,
 						    isc_symexists_reject);
@@ -1304,8 +1311,8 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 				unsigned int line;
 				RUNTIME_CHECK(isc_symtab_lookup(symtab, key,
 				           vclass, &symvalue) == ISC_R_SUCCESS);
-				file = cfg_obj_file(symvalue.as_pointer);
-				line = cfg_obj_line(symvalue.as_pointer);
+				file = cfg_obj_file(symvalue.as_cpointer);
+				line = cfg_obj_line(symvalue.as_cpointer);
 				cfg_obj_log(view, logctx, ISC_LOG_ERROR,
 					    "view '%s': already exists "
 					    "previous definition: %s:%u",
@@ -1345,14 +1352,14 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 
         tresult = cfg_map_get(config, "acl", &acls);
         if (tresult == ISC_R_SUCCESS) {
-		cfg_listelt_t *elt;
-		cfg_listelt_t *elt2;
+		const cfg_listelt_t *elt;
+		const cfg_listelt_t *elt2;
 		const char *aclname;
 
 		for (elt = cfg_list_first(acls);
 		     elt != NULL;
 		     elt = cfg_list_next(elt)) {
-			cfg_obj_t *acl = cfg_listelt_value(elt);
+			const cfg_obj_t *acl = cfg_listelt_value(elt);
 			unsigned int i;
 
 			aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name"));
@@ -1371,7 +1378,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 			for (elt2 = cfg_list_next(elt);
 			     elt2 != NULL;
 			     elt2 = cfg_list_next(elt2)) {
-				cfg_obj_t *acl2 = cfg_listelt_value(elt2);
+				const cfg_obj_t *acl2 = cfg_listelt_value(elt2);
 				const char *name;
 				name = cfg_obj_asstring(cfg_tuple_get(acl2,
 								      "name"));
@@ -1395,21 +1402,21 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 
         tresult = cfg_map_get(config, "kal", &kals);
         if (tresult == ISC_R_SUCCESS) {
-		cfg_listelt_t *elt;
-		cfg_listelt_t *elt2;
+		const cfg_listelt_t *elt;
+		const cfg_listelt_t *elt2;
 		const char *aclname;
 
 		for (elt = cfg_list_first(kals);
 		     elt != NULL;
 		     elt = cfg_list_next(elt)) {
-			cfg_obj_t *acl = cfg_listelt_value(elt);
+			const cfg_obj_t *acl = cfg_listelt_value(elt);
 
 			aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name"));
 
 			for (elt2 = cfg_list_next(elt);
 			     elt2 != NULL;
 			     elt2 = cfg_list_next(elt2)) {
-				cfg_obj_t *acl2 = cfg_listelt_value(elt2);
+				const cfg_obj_t *acl2 = cfg_listelt_value(elt2);
 				const char *name;
 				name = cfg_obj_asstring(cfg_tuple_get(acl2,
 								      "name"));
diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h
index dcda517b..09e8b2e1 100644
--- a/lib/bind9/include/bind9/check.h
+++ b/lib/bind9/include/bind9/check.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.h,v 1.1.200.4 2004/03/08 09:04:28 marka Exp $ */
+/* $Id: check.h,v 1.1.200.6 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef BIND9_CHECK_H
 #define BIND9_CHECK_H 1
@@ -28,7 +28,8 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx);
+bind9_check_namedconf(const cfg_obj_t *config, isc_log_t *logctx,
+		      isc_mem_t *mctx);
 /*
  * Check the syntactic validity of a configuration parse tree generated from
  * a named.conf file.
@@ -44,7 +45,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx);
  */
 
 isc_result_t
-bind9_check_key(cfg_obj_t *config, isc_log_t *logctx);
+bind9_check_key(const cfg_obj_t *config, isc_log_t *logctx);
 /*
  * As above, but for a single 'key' statement.
  */
diff --git a/lib/bind9/win32/libbind9.dsp b/lib/bind9/win32/libbind9.dsp
index 9a943d6a..522eaec0 100644
--- a/lib/bind9/win32/libbind9.dsp
+++ b/lib/bind9/win32/libbind9.dsp
@@ -1,133 +1,133 @@
-# Microsoft Developer Studio Project File - Name="libbind9" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libbind9 - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libbind9.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../lib/dns/win32/include" /I "../..../lib/dns/sec/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /YX /FD /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libbind9.dll"

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR /YX /FD /GZ /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libbind9.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libbind9 - Win32 Release"

-# Name "libbind9 - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\check.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\DLLMain.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\getaddresses.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\bind9\check.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\bind9\version.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Source File

-

-SOURCE=.\libbind9.def

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="libbind9" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libbind9 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libbind9.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../lib/dns/win32/include" /I "../..../lib/dns/sec/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libbind9.dll"
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libbind9.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libbind9 - Win32 Release"
+# Name "libbind9 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\check.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\getaddresses.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\bind9\check.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\bind9\version.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=.\libbind9.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/bind9/win32/libbind9.dsw b/lib/bind9/win32/libbind9.dsw
index 08109824..b7f4664f 100644
--- a/lib/bind9/win32/libbind9.dsw
+++ b/lib/bind9/win32/libbind9.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libbind9"=.\libbind9.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libbind9"=.\libbind9.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/bind9/win32/libbind9.mak b/lib/bind9/win32/libbind9.mak
index 23ab7729..a6656935 100644
--- a/lib/bind9/win32/libbind9.mak
+++ b/lib/bind9/win32/libbind9.mak
@@ -1,355 +1,355 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libbind9.dsp

-!IF "$(CFG)" == ""

-CFG=libbind9 - Win32 Release

-!MESSAGE No configuration specified. Defaulting to libbind9 - Win32 Release.

-!ENDIF 

-

-!IF "$(CFG)" != "libbind9 - Win32 Release" && "$(CFG)" != "libbind9 - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\libbind9.dll"

-

-!ELSE 

-

-ALL : "libisccfg - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\libbind9.dll"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check.obj"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\getaddresses.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(OUTDIR)\libbind9.exp"

-	-@erase "$(OUTDIR)\libbind9.lib"

-	-@erase "..\..\..\Build\Release\libbind9.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../lib/dns/win32/include" /I "../..../lib/dns/sec/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libbind9.pdb" /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Release/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" 

-DEF_FILE= \

-	".\libbind9.def"

-LINK32_OBJS= \

-	"$(INTDIR)\check.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\getaddresses.obj" \

-	"$(INTDIR)\version.obj" \

-	"..\..\dns\win32\Release\libdns.lib" \

-	"..\..\isc\win32\Release\libisc.lib" \

-	"..\..\isccfg\win32\Release\libisccfg.lib"

-

-"..\..\..\Build\Release\libbind9.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"

-

-!ELSE 

-

-ALL : "libisccfg - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\check.obj"

-	-@erase "$(INTDIR)\check.sbr"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\getaddresses.obj"

-	-@erase "$(INTDIR)\getaddresses.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(OUTDIR)\libbind9.bsc"

-	-@erase "$(OUTDIR)\libbind9.exp"

-	-@erase "$(OUTDIR)\libbind9.lib"

-	-@erase "$(OUTDIR)\libbind9.pdb"

-	-@erase "..\..\..\Build\Debug\libbind9.dll"

-	-@erase "..\..\..\Build\Debug\libbind9.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\check.sbr" \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\getaddresses.sbr" \

-	"$(INTDIR)\version.sbr"

-

-"$(OUTDIR)\libbind9.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libbind9.pdb" /debug /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Debug/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\libbind9.def"

-LINK32_OBJS= \

-	"$(INTDIR)\check.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\getaddresses.obj" \

-	"$(INTDIR)\version.obj" \

-	"..\..\dns\win32\Debug\libdns.lib" \

-	"..\..\isc\win32\Debug\libisc.lib" \

-	"..\..\isccfg\win32\Debug\libisccfg.lib"

-

-"..\..\..\Build\Debug\libbind9.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("libbind9.dep")

-!INCLUDE "libbind9.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "libbind9.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "libbind9 - Win32 Release" || "$(CFG)" == "libbind9 - Win32 Debug"

-SOURCE=..\check.c

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-

-"$(INTDIR)\check.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-

-"$(INTDIR)\check.obj"	"$(INTDIR)\check.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\getaddresses.c

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-

-"$(INTDIR)\getaddresses.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-

-"$(INTDIR)\getaddresses.obj"	"$(INTDIR)\getaddresses.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-"libdns - Win32 Release" : 

-   cd "..\..\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 

-   cd "..\..\bind9\win32"

-

-"libdns - Win32 ReleaseCLEAN" : 

-   cd "..\..\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-"libdns - Win32 Debug" : 

-   cd "..\..\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 

-   cd "..\..\bind9\win32"

-

-"libdns - Win32 DebugCLEAN" : 

-   cd "..\..\dns\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\bind9\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\bind9\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libbind9 - Win32 Release"

-

-"libisccfg - Win32 Release" : 

-   cd "..\..\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 

-   cd "..\..\bind9\win32"

-

-"libisccfg - Win32 ReleaseCLEAN" : 

-   cd "..\..\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"

-

-"libisccfg - Win32 Debug" : 

-   cd "..\..\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 

-   cd "..\..\bind9\win32"

-

-"libisccfg - Win32 DebugCLEAN" : 

-   cd "..\..\isccfg\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\bind9\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on libbind9.dsp
+!IF "$(CFG)" == ""
+CFG=libbind9 - Win32 Release
+!MESSAGE No configuration specified. Defaulting to libbind9 - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "libbind9 - Win32 Release" && "$(CFG)" != "libbind9 - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\libbind9.dll"
+
+!ELSE 
+
+ALL : "libisccfg - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\libbind9.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check.obj"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\getaddresses.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(OUTDIR)\libbind9.exp"
+	-@erase "$(OUTDIR)\libbind9.lib"
+	-@erase "..\..\..\Build\Release\libbind9.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../lib/dns/win32/include" /I "../..../lib/dns/sec/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libbind9.pdb" /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Release/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" 
+DEF_FILE= \
+	".\libbind9.def"
+LINK32_OBJS= \
+	"$(INTDIR)\check.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\getaddresses.obj" \
+	"$(INTDIR)\version.obj" \
+	"..\..\dns\win32\Release\libdns.lib" \
+	"..\..\isc\win32\Release\libisc.lib" \
+	"..\..\isccfg\win32\Release\libisccfg.lib"
+
+"..\..\..\Build\Release\libbind9.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"
+
+!ELSE 
+
+ALL : "libisccfg - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\check.obj"
+	-@erase "$(INTDIR)\check.sbr"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\getaddresses.obj"
+	-@erase "$(INTDIR)\getaddresses.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(OUTDIR)\libbind9.bsc"
+	-@erase "$(OUTDIR)\libbind9.exp"
+	-@erase "$(OUTDIR)\libbind9.lib"
+	-@erase "$(OUTDIR)\libbind9.pdb"
+	-@erase "..\..\..\Build\Debug\libbind9.dll"
+	-@erase "..\..\..\Build\Debug\libbind9.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\check.sbr" \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\getaddresses.sbr" \
+	"$(INTDIR)\version.sbr"
+
+"$(OUTDIR)\libbind9.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libbind9.pdb" /debug /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Debug/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\libbind9.def"
+LINK32_OBJS= \
+	"$(INTDIR)\check.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\getaddresses.obj" \
+	"$(INTDIR)\version.obj" \
+	"..\..\dns\win32\Debug\libdns.lib" \
+	"..\..\isc\win32\Debug\libisc.lib" \
+	"..\..\isccfg\win32\Debug\libisccfg.lib"
+
+"..\..\..\Build\Debug\libbind9.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libbind9.dep")
+!INCLUDE "libbind9.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libbind9.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libbind9 - Win32 Release" || "$(CFG)" == "libbind9 - Win32 Debug"
+SOURCE=..\check.c
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+
+"$(INTDIR)\check.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+
+"$(INTDIR)\check.obj"	"$(INTDIR)\check.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\getaddresses.c
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+
+"$(INTDIR)\getaddresses.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+
+"$(INTDIR)\getaddresses.obj"	"$(INTDIR)\getaddresses.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+"libdns - Win32 Release" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   cd "..\..\bind9\win32"
+
+"libdns - Win32 ReleaseCLEAN" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+"libdns - Win32 Debug" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   cd "..\..\bind9\win32"
+
+"libdns - Win32 DebugCLEAN" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\bind9\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\bind9\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libbind9 - Win32 Release"
+
+"libisccfg - Win32 Release" : 
+   cd "..\..\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   cd "..\..\bind9\win32"
+
+"libisccfg - Win32 ReleaseCLEAN" : 
+   cd "..\..\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+
+"libisccfg - Win32 Debug" : 
+   cd "..\..\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   cd "..\..\bind9\win32"
+
+"libisccfg - Win32 DebugCLEAN" : 
+   cd "..\..\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\bind9\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index fbbec2eb..9c368d19 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -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.126.2.3.2.17 2004/12/09 04:07:15 marka Exp $
+# $Id: Makefile.in,v 1.126.2.3.2.19 2006/01/06 00:01:42 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -156,7 +156,8 @@ code.h:	gen
 	./gen -s ${srcdir} > code.h
 
 gen: gen.c
-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
+	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
 
 rbtdb64.@O@: rbtdb.c
 
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index d2814405..e81d5ef3 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.c,v 1.23.52.4 2004/03/09 05:21:08 marka Exp $ */
+/* $Id: acl.c,v 1.23.52.6 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -68,7 +68,7 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) {
 }
 
 isc_result_t
-dns_acl_appendelement(dns_acl_t *acl, dns_aclelement_t *elt) {
+dns_acl_appendelement(dns_acl_t *acl, const dns_aclelement_t *elt) {
 	if (acl->length + 1 > acl->alloc) {
 		/*
 		 * Resize the ACL.
@@ -123,12 +123,12 @@ dns_acl_none(isc_mem_t *mctx, dns_acl_t **target) {
 }
 
 isc_result_t
-dns_acl_match(isc_netaddr_t *reqaddr,
-	      dns_name_t *reqsigner,
-	      dns_acl_t *acl,
-	      dns_aclenv_t *env,
+dns_acl_match(const isc_netaddr_t *reqaddr,
+	      const dns_name_t *reqsigner,
+	      const dns_acl_t *acl,
+	      const dns_aclenv_t *env,
 	      int *match,
-	      dns_aclelement_t **matchelt)
+	      dns_aclelement_t const**matchelt)
 {
 	unsigned int i;
 
@@ -150,9 +150,9 @@ dns_acl_match(isc_netaddr_t *reqaddr,
 }
 
 isc_result_t
-dns_acl_elementmatch(dns_acl_t *acl,
-		     dns_aclelement_t *elt,
-		     dns_aclelement_t **matchelt)
+dns_acl_elementmatch(const dns_acl_t *acl,
+		     const dns_aclelement_t *elt,
+		     const dns_aclelement_t **matchelt)
 {
 	unsigned int i;
 
@@ -173,14 +173,14 @@ dns_acl_elementmatch(dns_acl_t *acl,
 }
 
 isc_boolean_t
-dns_aclelement_match(isc_netaddr_t *reqaddr,
-		     dns_name_t *reqsigner,
-		     dns_aclelement_t *e,
-		     dns_aclenv_t *env,
-		     dns_aclelement_t **matchelt)
+dns_aclelement_match(const isc_netaddr_t *reqaddr,
+		     const dns_name_t *reqsigner,
+		     const dns_aclelement_t *e,
+		     const dns_aclenv_t *env,
+		     const dns_aclelement_t **matchelt)
 {
 	dns_acl_t *inner = NULL;
-	isc_netaddr_t *addr;
+	const isc_netaddr_t *addr;
 	isc_netaddr_t v4addr;
 	int indirectmatch;
 	isc_result_t result;
@@ -312,7 +312,7 @@ dns_acl_detach(dns_acl_t **aclp) {
 }
 
 isc_boolean_t
-dns_aclelement_equal(dns_aclelement_t *ea, dns_aclelement_t *eb) {
+dns_aclelement_equal(const dns_aclelement_t *ea, const dns_aclelement_t *eb) {
 	if (ea->type != eb->type)
 		return (ISC_FALSE);
 	switch (ea->type) {
@@ -338,7 +338,7 @@ dns_aclelement_equal(dns_aclelement_t *ea, dns_aclelement_t *eb) {
 }
 
 isc_boolean_t
-dns_acl_equal(dns_acl_t *a, dns_acl_t *b) {
+dns_acl_equal(const dns_acl_t *a, const dns_acl_t *b) {
 	unsigned int i;
 	if (a == b)
 		return (ISC_TRUE);
@@ -353,7 +353,7 @@ dns_acl_equal(dns_acl_t *a, dns_acl_t *b) {
 }
 
 static isc_boolean_t
-is_loopback(dns_aclipprefix_t *p) {
+is_loopback(const dns_aclipprefix_t *p) {
 	switch (p->address.family) {
 	case AF_INET:
 		if (p->prefixlen == 32 &&
@@ -372,7 +372,7 @@ is_loopback(dns_aclipprefix_t *p) {
 }
 
 isc_boolean_t
-dns_acl_isinsecure(dns_acl_t *a) {
+dns_acl_isinsecure(const dns_acl_t *a) {
 	unsigned int i;
 	for (i = 0; i < a->length; i++) {
 		dns_aclelement_t *e = &a->elements[i];
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index c0b31db1..3fe436a2 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.181.2.11.2.24 2005/10/14 05:19:00 marka Exp $ */
+/* $Id: adb.c,v 1.181.2.11.2.26 2006/01/04 23:50:20 marka Exp $ */
 
 /*
  * Implementation notes
@@ -2587,8 +2587,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
 		}
 	}
 
-	if (bucket != DNS_ADB_INVALIDBUCKET)
-		UNLOCK(&adb->namelocks[bucket]);
+	UNLOCK(&adb->namelocks[bucket]);
 
 	return (result);
 }
diff --git a/lib/dns/api b/lib/dns/api
index 7df81573..bb347a47 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 21
-LIBREVISION = 1
+LIBINTERFACE = 22
+LIBREVISION = 0
 LIBAGE = 0
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 0e17a957..02a26ec4 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.45.2.4.8.9 2005/03/17 03:58:30 marka Exp $ */
+/* $Id: cache.c,v 1.45.2.4.8.14 2006/05/04 02:21:46 marka Exp $ */
 
 #include <config.h>
 
@@ -68,7 +68,6 @@ typedef enum {
  * Convenience macros for comprehensive assertion checking.
  */
 #define CLEANER_IDLE(c) ((c)->state == cleaner_s_idle && \
-			 (c)->iterator == NULL && \
 			 (c)->resched_event != NULL)
 #define CLEANER_BUSY(c) ((c)->state == cleaner_s_busy && \
 			 (c)->iterator != NULL && \
@@ -387,7 +386,7 @@ dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp) {
 }
 
 isc_result_t
-dns_cache_setfilename(dns_cache_t *cache, char *filename) {
+dns_cache_setfilename(dns_cache_t *cache, const char *filename) {
 	char *newname;
 
 	REQUIRE(VALID_CACHE(cache));
@@ -507,6 +506,11 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 	cleaner->resched_event = NULL;
 	cleaner->overmem_event = NULL;
 
+	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+				       &cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		goto cleanup;
+
 	if (taskmgr != NULL && timermgr != NULL) {
 		result = isc_task_create(taskmgr, 1, &cleaner->task);
 		if (result != ISC_R_SUCCESS) {
@@ -575,6 +579,8 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 		isc_timer_detach(&cleaner->cleaning_timer);
 	if (cleaner->task != NULL)
 		isc_task_detach(&cleaner->task);
+	if (cleaner->iterator != NULL)
+		dns_dbiterator_destroy(&cleaner->iterator);
 	DESTROYLOCK(&cleaner->lock);
  fail:
 	return (result);
@@ -582,15 +588,17 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 
 static void
 begin_cleaning(cache_cleaner_t *cleaner) {
-	isc_result_t result;
+	isc_result_t result = ISC_R_SUCCESS;
 
 	REQUIRE(CLEANER_IDLE(cleaner));
 
 	/*
-	 * Create an iterator and position it at the beginning of the cache.
+	 * Create an iterator, if it does not already exist, and
+         * position it at the beginning of the cache.
 	 */
-	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
-				       &cleaner->iterator);
+	if (cleaner->iterator == NULL)
+		result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+					       &cleaner->iterator);
 	if (result != ISC_R_SUCCESS)
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 			      DNS_LOGMODULE_CACHE, ISC_LOG_WARNING,
@@ -600,20 +608,21 @@ begin_cleaning(cache_cleaner_t *cleaner) {
 		dns_dbiterator_setcleanmode(cleaner->iterator, ISC_TRUE);
 		result = dns_dbiterator_first(cleaner->iterator);
 	}
-
 	if (result != ISC_R_SUCCESS) {
 		/*
 		 * If the result is ISC_R_NOMORE, the database is empty,
 		 * so there is nothing to be cleaned.
 		 */
-		if (result != ISC_R_NOMORE)
+		if (result != ISC_R_NOMORE && cleaner->iterator != NULL) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "cache cleaner: "
 					 "dns_dbiterator_first() failed: %s",
 					 dns_result_totext(result));
-
-		if (cleaner->iterator != NULL)
 			dns_dbiterator_destroy(&cleaner->iterator);
+		} else if (cleaner->iterator != NULL) {
+			result = dns_dbiterator_pause(cleaner->iterator);
+			RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		}
 	} else {
 		/*
 		 * Pause the iterator to free its lock.
@@ -634,10 +643,14 @@ begin_cleaning(cache_cleaner_t *cleaner) {
 
 static void
 end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) {
+	isc_result_t result;
+
 	REQUIRE(CLEANER_BUSY(cleaner));
 	REQUIRE(event != NULL);
 
-	dns_dbiterator_destroy(&cleaner->iterator);
+	result = dns_dbiterator_pause(cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		dns_dbiterator_destroy(&cleaner->iterator);
 
 	dns_cache_setcleaninginterval(cleaner->cache,
 				      cleaner->cleaning_interval);
@@ -774,7 +787,7 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
 			 * Either the end was reached (ISC_R_NOMORE) or
 			 * some error was signaled.  If the cache is still
 			 * overmem and no error was encountered,
-			 * keep trying to clean it, otherwise stop cleanng.
+			 * keep trying to clean it, otherwise stop cleaning.
 			 */
 			if (result != ISC_R_NOMORE)
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index e0fe8c27..21224368 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.c,v 1.50.206.2 2004/03/06 08:13:37 marka Exp $ */
+/* $Id: compress.c,v 1.50.206.4 2006/03/02 00:37:20 marka Exp $ */
 
 #define DNS_NAME_USEINLINE 1
 
@@ -111,7 +111,7 @@ do { \
  * If no match is found return ISC_FALSE.
  */
 isc_boolean_t
-dns_compress_findglobal(dns_compress_t *cctx, dns_name_t *name,
+dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name,
 			dns_name_t *prefix, isc_uint16_t *offset)
 {
 	dns_name_t tname, nname;
@@ -161,15 +161,15 @@ dns_compress_findglobal(dns_compress_t *cctx, dns_name_t *name,
 }
 
 static inline unsigned int
-name_length(dns_name_t *name) {
+name_length(const dns_name_t *name) {
 	isc_region_t r;
 	dns_name_toregion(name, &r);
 	return (r.length);
 }
 
 void
-dns_compress_add(dns_compress_t *cctx, dns_name_t *name, dns_name_t *prefix,
-		 isc_uint16_t offset)
+dns_compress_add(dns_compress_t *cctx, const dns_name_t *name,
+		 const dns_name_t *prefix, isc_uint16_t offset)
 {
 	dns_name_t tname;
 	unsigned int start;
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 8534fe15..1887c2ad 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.6.2.10 2004/09/01 04:27:41 marka Exp $ */
+/* $Id: dispatch.c,v 1.101.2.6.2.12 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -641,6 +641,50 @@ udp_recv(isc_task_t *task, isc_event_t *ev_in) {
 		free_buffer(disp, ev->region.base, ev->region.length);
 		goto unlock;
 	} 
+
+	/*
+	 * Now that we have the original dispatch the query was sent
+	 * from check that the address and port the response was
+	 * sent to make sense.
+	 */
+	if (disp != resp->disp) {
+		isc_sockaddr_t a1;
+		isc_sockaddr_t a2;
+		
+		/*
+		 * Check that the socket types and ports match.
+		 */
+		if (disp->socktype != resp->disp->socktype ||
+		    isc_sockaddr_getport(&disp->local) !=
+		    isc_sockaddr_getport(&resp->disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+
+		/*
+		 * If both dispatches are bound to an address then fail as
+		 * the addresses can't be equal (enforced by the IP stack).  
+		 *
+		 * Note under Linux a packet can be sent out via IPv4 socket
+		 * and the response be received via a IPv6 socket.
+		 * 
+		 * Requests sent out via IPv6 should always come back in
+		 * via IPv6.
+		 */
+		if (isc_sockaddr_pf(&resp->disp->local) == PF_INET6 &&
+		    isc_sockaddr_pf(&disp->local) != PF_INET6) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+		isc_sockaddr_anyofpf(&a1, isc_sockaddr_pf(&resp->disp->local));
+		isc_sockaddr_anyofpf(&a2, isc_sockaddr_pf(&disp->local));
+		if (!isc_sockaddr_eqaddr(&a1, &resp->disp->local) &&
+		    !isc_sockaddr_eqaddr(&a2, &disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+	}
+
 	queue_response = resp->item_out;
 	rev = allocate_event(resp->disp);
 	if (rev == NULL) {
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 34ff3d3a..91f7a99f 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.69.2.5.2.7 2004/06/11 00:30:54 marka Exp $
+ * $Id: dnssec.c,v 1.69.2.5.2.9 2006/01/04 23:50:20 marka Exp $
  */
 
 
@@ -330,8 +330,7 @@ cleanup_array:
 cleanup_context:
 	dst_context_destroy(&ctx);
 cleanup_databuf:
-	if (databuf != NULL)
-		isc_buffer_free(&databuf);
+	isc_buffer_free(&databuf);
 cleanup_signature:
 	isc_mem_put(mctx, sig.signature, sig.siglen);
 
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 19f60a27..b7b03e6e 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.1.4.1 2004/12/09 04:07:16 marka Exp $
+ * $Id: dst_api.c,v 1.1.4.3 2006/01/04 23:50:20 marka Exp $
  */
 
 #include <config.h>
@@ -1027,8 +1027,10 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
 	}
 
 	ret = dns_name_print(key->key_name, fp);
-	if (ret != ISC_R_SUCCESS)
+	if (ret != ISC_R_SUCCESS) {
+		fclose(fp);
 		return (ret);
+	}
 
 	fprintf(fp, " ");
 
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 4a6cc0d7..02e160f8 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,9 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.65.2.5.2.6 2004/03/15 01:02:54 marka Exp $ */
-
-#include <config.h>
+/* $Id: gen.c,v 1.65.2.5.2.8 2006/01/06 00:01:42 marka Exp $ */
 
 #include <sys/types.h>
 
diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index bc723f43..ce4c8b6a 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.h,v 1.20.52.3 2004/03/08 09:04:34 marka Exp $ */
+/* $Id: acl.h,v 1.20.52.5 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_ACL_H
 #define DNS_ACL_H 1
@@ -104,7 +104,7 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target);
  */
 
 isc_result_t
-dns_acl_appendelement(dns_acl_t *acl, dns_aclelement_t *elt);
+dns_acl_appendelement(dns_acl_t *acl, const dns_aclelement_t *elt);
 /*
  * Append an element to an existing ACL.
  */
@@ -128,13 +128,13 @@ void
 dns_acl_detach(dns_acl_t **aclp);
 
 isc_boolean_t
-dns_aclelement_equal(dns_aclelement_t *ea, dns_aclelement_t *eb);
+dns_aclelement_equal(const dns_aclelement_t *ea, const dns_aclelement_t *eb);
 
 isc_boolean_t
-dns_acl_equal(dns_acl_t *a, dns_acl_t *b);
+dns_acl_equal(const dns_acl_t *a, const dns_acl_t *b);
 
 isc_boolean_t
-dns_acl_isinsecure(dns_acl_t *a);
+dns_acl_isinsecure(const dns_acl_t *a);
 /*
  * Return ISC_TRUE iff the acl 'a' is considered insecure, that is,
  * if it contains IP addresses other than those of the local host.
@@ -154,12 +154,12 @@ void
 dns_aclenv_destroy(dns_aclenv_t *env);
 
 isc_result_t
-dns_acl_match(isc_netaddr_t *reqaddr,
-	      dns_name_t *reqsigner,
-	      dns_acl_t *acl,
-	      dns_aclenv_t *env,
+dns_acl_match(const isc_netaddr_t *reqaddr,
+	      const dns_name_t *reqsigner,
+	      const dns_acl_t *acl,
+	      const dns_aclenv_t *env,
 	      int *match,
-	      dns_aclelement_t **matchelt);
+	      const dns_aclelement_t **matchelt);
 /*
  * General, low-level ACL matching.  This is expected to
  * be useful even for weird stuff like the topology and sortlist statements.
@@ -185,11 +185,11 @@ dns_acl_match(isc_netaddr_t *reqaddr,
  */
 
 isc_boolean_t
-dns_aclelement_match(isc_netaddr_t *reqaddr,
-		     dns_name_t *reqsigner,
-		     dns_aclelement_t *e,
-		     dns_aclenv_t *env,		     
-		     dns_aclelement_t **matchelt);
+dns_aclelement_match(const isc_netaddr_t *reqaddr,
+		     const dns_name_t *reqsigner,
+		     const dns_aclelement_t *e,
+		     const dns_aclenv_t *env,		     
+		     const dns_aclelement_t **matchelt);
 /*
  * Like dns_acl_match, but matches against the single ACL element 'e'
  * rather than a complete list and returns ISC_TRUE iff it matched.
@@ -200,9 +200,9 @@ dns_aclelement_match(isc_netaddr_t *reqaddr,
  */
 
 isc_result_t
-dns_acl_elementmatch(dns_acl_t *acl,
-		     dns_aclelement_t *elt,
-		     dns_aclelement_t **matchelt);
+dns_acl_elementmatch(const dns_acl_t *acl,
+		     const dns_aclelement_t *elt,
+		     const dns_aclelement_t **matchelt);
 /*
  * Search for an ACL element in 'acl' which is exactly the same as 'elt'.
  * If there is one, and 'matchelt' is non NULL, then '*matchelt' will point
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index 79c53de8..4b775c9c 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.h,v 1.17.12.3 2004/03/08 09:04:34 marka Exp $ */
+/* $Id: cache.h,v 1.17.12.5 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_CACHE_H
 #define DNS_CACHE_H 1
@@ -151,7 +151,7 @@ dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp);
 
 
 isc_result_t
-dns_cache_setfilename(dns_cache_t *cahce, char *filename);
+dns_cache_setfilename(dns_cache_t *cahce, const char *filename);
 /*
  * If 'filename' is non-NULL, make the cache persistent.
  * The cache's data will be stored in the given file.
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index 0f6451cc..042a4ea5 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.h,v 1.29.2.2.8.1 2004/03/06 08:13:51 marka Exp $ */
+/* $Id: compress.h,v 1.29.2.2.8.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_COMPRESS_H
 #define DNS_COMPRESS_H 1
@@ -136,7 +136,7 @@ dns_compress_getedns(dns_compress_t *cctx);
  */
 
 isc_boolean_t
-dns_compress_findglobal(dns_compress_t *cctx, dns_name_t *name,
+dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name,
 			dns_name_t *prefix, isc_uint16_t *offset);
 /*
  *	Finds longest possible match of 'name' in the global compression table.
@@ -155,8 +155,8 @@ dns_compress_findglobal(dns_compress_t *cctx, dns_name_t *name,
  */
 
 void
-dns_compress_add(dns_compress_t *cctx, dns_name_t *name, dns_name_t *prefix,
-		 isc_uint16_t offset);
+dns_compress_add(dns_compress_t *cctx, const dns_name_t *name,
+		 const dns_name_t *prefix, isc_uint16_t offset);
 /*
  *	Add compression pointers for 'name' to the compression table,
  *	not replacing existing pointers.
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index a07c0520..f3a21a68 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.h,v 1.10.206.1 2004/03/06 08:13:56 marka Exp $ */
+/* $Id: keytable.h,v 1.10.206.3 2006/01/06 00:01:42 marka Exp $ */
 
 #ifndef DNS_KEYTABLE_H
 #define DNS_KEYTABLE_H 1
@@ -137,7 +137,8 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
 			 dns_keynode_t **keynodep);
 /*
  * Search for a key named 'name', matching 'algorithm' and 'tag' in
- * 'keytable'.
+ * 'keytable'.  This finds the first instance which matches.  Use
+ * dns_keytable_findnextkeynode() to find other instances.
  *
  * Requires:
  *
@@ -150,6 +151,7 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
  * Returns:
  *
  *	ISC_R_SUCCESS
+ *	DNS_R_PARTIALMATCH	the name existed in the keytable.
  *	ISC_R_NOTFOUND
  *
  *	Any other result indicates an error.
@@ -160,7 +162,7 @@ dns_keytable_findnextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode,
 		                             dns_keynode_t **nextnodep);
 /*
  * Search for the next key with the same properties as 'keynode' in
- * 'keytable'.
+ * 'keytable' as found by dns_keytable_findkeynode().
  *
  * Requires:
  *
diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index c8273221..960c11aa 100644
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.100.2.3.8.7 2004/03/08 02:08:00 marka Exp $ */
+/* $Id: message.h,v 1.100.2.3.8.10 2006/02/28 06:32:54 marka Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -236,7 +236,7 @@ struct dns_message {
 	isc_region_t			saved;
 
 	dns_rdatasetorderfunc_t		order;
-	void *				order_arg;
+	const void *			order_arg;
 };
 
 /***
@@ -710,6 +710,27 @@ dns_message_findtype(dns_name_t *name, dns_rdatatype_t type,
  *	ISC_R_NOTFOUND		-- the desired type does not exist.
  */
 
+isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset);
+/*%<
+ * Search the name for the specified rdclass and type.  If it is found,
+ * *rdataset is filled in with a pointer to that rdataset.
+ *
+ * Requires:
+ *\li	if '**rdataset' is non-NULL, *rdataset needs to be NULL.
+ *
+ *\li	'type' be a valid type, and NOT dns_rdatatype_any.
+ *
+ *\li	If 'type' is dns_rdatatype_rrsig, 'covers' must be a valid type.
+ *	Otherwise it should be 0.
+ *
+ * Returns:
+ *\li	#ISC_R_SUCCESS		-- all is well.
+ *\li	#ISC_R_NOTFOUND		-- the desired type does not exist.
+ */
+
 void
 dns_message_movename(dns_message_t *msg, dns_name_t *name,
 		     dns_section_t fromsection,
@@ -1260,7 +1281,7 @@ dns_message_getrawmessage(dns_message_t *msg);
 
 void
 dns_message_setsortorder(dns_message_t *msg, dns_rdatasetorderfunc_t order,
-			 void *order_arg);
+			 const void *order_arg);
 /*
  * Define the order in which RR sets get rendered by
  * dns_message_rendersection() to be the ascending order
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 5f6a3db9..ce9e1f15 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.95.2.3.2.12 2004/09/08 00:29:34 marka Exp $ */
+/* $Id: name.h,v 1.95.2.3.2.14 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -589,7 +589,7 @@ dns_name_getlabelsequence(const dns_name_t *source, unsigned int first,
 
 
 void
-dns_name_clone(dns_name_t *source, dns_name_t *target);
+dns_name_clone(const dns_name_t *source, dns_name_t *target);
 /*
  * Make 'target' refer to the same name as 'source'.
  *
@@ -703,7 +703,8 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
  */
 
 isc_result_t
-dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target);
+dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
+		isc_buffer_t *target);
 /*
  * Convert 'name' into wire format, compressing it as specified by the
  * compression context 'cctx', and storing the result in 'target'.
@@ -983,7 +984,7 @@ dns_name_split(dns_name_t *name, unsigned int suffixlabels,
  */
 
 isc_result_t
-dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target);
+dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target);
 /*
  * Make 'target' a dynamically allocated copy of 'source'.
  *
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 03f720af..90329646 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.h,v 1.16.2.1.10.3 2004/03/06 08:13:58 marka Exp $ */
+/* $Id: peer.h,v 1.16.2.1.10.5 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1
@@ -167,7 +167,8 @@ isc_result_t
 dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval);
 
 isc_result_t
-dns_peer_settransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source);
+dns_peer_settransfersource(dns_peer_t *peer,
+			   const isc_sockaddr_t *transfer_source);
 
 isc_result_t
 dns_peer_gettransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source);
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index d856784c..12cfbdea 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.41.2.5.2.8 2005/03/17 03:58:31 marka Exp $ */
+/* $Id: rdataset.h,v 1.41.2.5.2.10 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -365,11 +365,11 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
 
 isc_result_t
 dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
-			  dns_name_t *owner_name,
+			  const dns_name_t *owner_name,
 			  dns_compress_t *cctx,
 			  isc_buffer_t *target,
 			  dns_rdatasetorderfunc_t order,
-			  void *order_arg,
+			  const void *order_arg,
 			  unsigned int options,
 			  unsigned int *countp);
 /*
@@ -384,11 +384,11 @@ dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
 
 isc_result_t
 dns_rdataset_towirepartial(dns_rdataset_t *rdataset,
-			   dns_name_t *owner_name,
+			   const dns_name_t *owner_name,
 			   dns_compress_t *cctx,
 			   isc_buffer_t *target,
 			   dns_rdatasetorderfunc_t order,
-			   void *order_arg,
+			   const void *order_arg,
 			   unsigned int options,
 			   unsigned int *countp,
 			   void **state);
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 0a6080d2..8e3e6323 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.34.12.7 2004/04/15 23:56:31 marka Exp $ */
+/* $Id: resolver.h,v 1.34.12.9 2006/02/01 23:48:51 marka Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
@@ -136,7 +136,7 @@ dns_resolver_create(dns_view_t *view,
  *
  *	'dispatchv6' is a valid dispatcher with an IPv6 UDP socket, or is NULL.
  *
- *	*resp != NULL && *resp == NULL.
+ *	resp != NULL && *resp == NULL.
  *
  * Returns:
  *
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 2bad7ea0..27995deb 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.103.12.7 2004/03/08 09:04:39 marka Exp $ */
+/* $Id: types.h,v 1.103.12.9 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1
@@ -294,6 +294,6 @@ typedef void
 (*dns_updatecallback_t)(void *, isc_result_t, dns_message_t *);
 
 typedef int 
-(*dns_rdatasetorderfunc_t)(dns_rdata_t *rdata, void *arg);
+(*dns_rdatasetorderfunc_t)(const dns_rdata_t *rdata, const void *arg);
 
 #endif /* DNS_TYPES_H */
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 24769f3c..00e9ee32 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.18.12.9 2005/09/06 02:12:41 marka Exp $ */
+/* $Id: validator.h,v 1.18.12.11 2006/01/06 00:01:42 marka Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
@@ -24,27 +24,35 @@
  ***** Module Info
  *****/
 
-/*
+/*! \file
+ *
+ * \brief
  * DNS Validator
+ * This is the BIND 9 validator, the module responsible for validating the
+ * rdatasets and negative responses (messages).  It makes use of zones in
+ * the view and may fetch RRset to complete trust chains.  It implements
+ * DNSSEC as specified in RFC 4033, 4034 and 4035.
  *
- * XXX <TBS> XXX
+ * It can also optionally implement ISC's DNSSEC look-aside validation.
+ *
+ * Correct operation is critical to preventing spoofed answers from secure
+ * zones being accepted.
  *
  * MP:
- *	The module ensures appropriate synchronization of data structures it
+ *\li	The module ensures appropriate synchronization of data structures it
  *	creates and manipulates.
  *
  * Reliability:
- *	No anticipated impact.
+ *\li	No anticipated impact.
  *
  * Resources:
- *	<TBS>
+ *\li	TBS
  *
  * Security:
- *	No anticipated impact.
+ *\li	No anticipated impact.
  *
  * Standards:
- *	RFCs:	1034, 1035, 2181, 2535, <TBS>
- *	Drafts:	<TBS>
+ *\li	RFCs:	1034, 1035, 2181, 4033, 4034, 4035.
  */
 
 #include <isc/lang.h>
@@ -58,12 +66,16 @@
 
 #include <dst/dst.h>
 
-/*
+/*%
  * A dns_validatorevent_t is sent when a 'validation' completes.
- *
+ * \brief
  * 'name', 'rdataset', 'sigrdataset', and 'message' are the values that were
  * supplied when dns_validator_create() was called.  They are returned to the
  * caller so that they may be freed.
+ *
+ * If the RESULT is ISC_R_SUCCESS and the answer is secure then
+ * proofs[] will contain the the names of the NSEC records that hold the
+ * various proofs.  Note the same name may appear multiple times.
  */
 typedef struct dns_validatorevent {
 	ISC_EVENT_COMMON(struct dns_validatorevent);
@@ -81,9 +93,9 @@ typedef struct dns_validatorevent {
 #define DNS_VALIDATOR_NODATAPROOF 1
 #define DNS_VALIDATOR_NOWILDCARDPROOF 2
 
-/*
- * A validator object represents a validation in procgress.
- *
+/*%
+ * A validator object represents a validation in progress.
+ * \brief
  * Clients are strongly discouraged from using this type directly, with
  * the exception of the 'link' field, which may be used directly for
  * whatever purpose the client desires.
@@ -128,7 +140,10 @@ struct dns_validator {
 	unsigned int			depth;
 };
 
-#define DNS_VALIDATOR_DLV 1
+/*%
+ * dns_validator_create() options.
+ */
+#define DNS_VALIDATOR_DLV 1U
 
 ISC_LANG_BEGINDECLS
 
@@ -138,7 +153,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
 		     dns_message_t *message, unsigned int options,
 		     isc_task_t *task, isc_taskaction_t action, void *arg,
 		     dns_validator_t **validatorp);
-/*
+/*%<
  * Start a DNSSEC validation.
  *
  * This validates a response to the question given by
@@ -163,41 +178,45 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
  * arguments must be provided.
  *
  * The validation is performed in the context of 'view'.
- * 'options' must be zero.
  *
  * When the validation finishes, a dns_validatorevent_t with
  * the given 'action' and 'arg' are sent to 'task'.
  * Its 'result' field will be ISC_R_SUCCESS iff the
  * response was successfully proven to be either secure or
  * part of a known insecure domain.
+ *
+ * options:
+ * If DNS_VALIDATOR_DLV is set the caller knows there is not a
+ * trusted key and the validator should immediately attempt to validate
+ * the answer by looking for a appopriate DLV RRset.
  */
 
 void
 dns_validator_cancel(dns_validator_t *validator);
-/*
+/*%<
  * Cancel a DNSSEC validation in progress.
  *
  * Requires:
- *	'validator' points to a valid DNSSEC validator, which
+ *\li	'validator' points to a valid DNSSEC validator, which
  *	may or may not already have completed.
  *
  * Ensures:
- *	It the validator has not already sent its completion
+ *\li	It the validator has not already sent its completion
  *	event, it will send it with result code ISC_R_CANCELED.
  */
 
 void
 dns_validator_destroy(dns_validator_t **validatorp);
-/*
+/*%<
  * Destroy a DNSSEC validator.
  *
  * Requires:
- *	'*validatorp' points to a valid DNSSEC validator.
- * 	The validator must have completed and sent its completion
+ *\li	'*validatorp' points to a valid DNSSEC validator.
+ * \li	The validator must have completed and sent its completion
  * 	event.
  *
  * Ensures:
- *	All resources used by the validator are freed.
+ *\li	All resources used by the validator are freed.
  */
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index b7680fa2..cd3e9610 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.106.2.7.4.15 2004/10/26 02:08:43 marka Exp $ */
+/* $Id: zone.h,v 1.106.2.7.4.17 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -163,7 +163,7 @@ dns_zone_getview(dns_zone_t *zone);
  */
 
 isc_result_t
-dns_zone_setorigin(dns_zone_t *zone, dns_name_t *origin);
+dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin);
 /*
  *	Sets the zones origin to 'origin'.
  *
@@ -414,11 +414,13 @@ dns_zone_maintenance(dns_zone_t *zone);
  */
 
 isc_result_t
-dns_zone_setmasters(dns_zone_t *zone, isc_sockaddr_t *masters,
+dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters,
 		    isc_uint32_t count);
 isc_result_t
-dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
-			    dns_name_t **keynames, isc_uint32_t count);
+dns_zone_setmasterswithkeys(dns_zone_t *zone,
+			    const isc_sockaddr_t *masters,
+			    dns_name_t **keynames,
+			    isc_uint32_t count);
 /*
  *	Set the list of master servers for the zone.
  *
@@ -440,7 +442,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
  */
 
 isc_result_t
-dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
+dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
 		       isc_uint32_t count);
 /*
  *	Set the list of additional servers to be notified when
@@ -525,9 +527,10 @@ dns_zone_setmaxretrytime(dns_zone_t *zone, isc_uint32_t val);
  */
 
 isc_result_t
-dns_zone_setxfrsource4(dns_zone_t *zone, isc_sockaddr_t *xfrsource);
+dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource);
 isc_result_t
-dns_zone_setaltxfrsource4(dns_zone_t *zone, isc_sockaddr_t *xfrsource);
+dns_zone_setaltxfrsource4(dns_zone_t *zone,
+			  const isc_sockaddr_t *xfrsource);
 /*
  * 	Set the source address to be used in IPv4 zone transfers.
  *
@@ -552,9 +555,10 @@ dns_zone_getaltxfrsource4(dns_zone_t *zone);
  */
 
 isc_result_t
-dns_zone_setxfrsource6(dns_zone_t *zone, isc_sockaddr_t *xfrsource);
+dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource);
 isc_result_t
-dns_zone_setaltxfrsource6(dns_zone_t *zone, isc_sockaddr_t *xfrsource);
+dns_zone_setaltxfrsource6(dns_zone_t *zone,
+			 const isc_sockaddr_t *xfrsource);
 /*
  * 	Set the source address to be used in IPv6 zone transfers.
  *
@@ -579,7 +583,7 @@ dns_zone_getaltxfrsource6(dns_zone_t *zone);
  */
 
 isc_result_t
-dns_zone_setnotifysrc4(dns_zone_t *zone, isc_sockaddr_t *notifysrc);
+dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc);
 /*
  * 	Set the source address to be used with IPv4 NOTIFY messages.
  *
@@ -602,7 +606,7 @@ dns_zone_getnotifysrc4(dns_zone_t *zone);
  */
 
 isc_result_t
-dns_zone_setnotifysrc6(dns_zone_t *zone, isc_sockaddr_t *notifysrc);
+dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc);
 /*
  * 	Set the source address to be used with IPv6 NOTIFY messages.
  *
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index 922c09af..7f3e3cff 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.26.12.3 2004/03/08 09:04:30 marka Exp $ */
+/* $Id: keytable.c,v 1.26.12.5 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -244,6 +244,13 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
 
 	RWLOCK(&keytable->rwlock, isc_rwlocktype_read);
 
+	/*
+	 * Note we don't want the DNS_R_PARTIALMATCH from dns_rbt_findname()
+	 * as that indicates that 'name' was not found.
+	 *
+	 * DNS_R_PARTIALMATCH indicates that the name was found but we
+	 * didn't get a match on algorithm and key id arguments.
+	 */
 	knode = NULL;
 	data = NULL;
 	result = dns_rbt_findname(keytable->table, name, 0, NULL, &data);
@@ -261,7 +268,7 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
 			UNLOCK(&keytable->lock);
 			*keynodep = knode;
 		} else
-			result = ISC_R_NOTFOUND;
+			result = DNS_R_PARTIALMATCH;
 	} else if (result == DNS_R_PARTIALMATCH)
 		result = ISC_R_NOTFOUND;
 
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index e593c7be..1cf57214 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.9.12.5 2004/04/15 02:10:40 marka Exp $ */
+/* $Id: lookup.c,v 1.9.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -154,11 +154,6 @@ build_event(dns_lookup_t *lookup) {
 			dns_rdataset_disassociate(rdataset);
 		isc_mem_put(lookup->mctx, rdataset, sizeof(dns_rdataset_t));
 	}
-	if (sigrdataset != NULL) {
-		if (dns_rdataset_isassociated(sigrdataset))
-			dns_rdataset_disassociate(sigrdataset);
-		isc_mem_put(lookup->mctx, sigrdataset, sizeof(dns_rdataset_t));
-	}
 	return (result);
 }
 
@@ -229,13 +224,14 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
 					send_event = ISC_TRUE;
 				goto done;
 			}
-		} else {
+		} else if (event != NULL) {
 			result = event->result;
 			fname = dns_fixedname_name(&event->foundname);
 			dns_resolver_destroyfetch(&lookup->fetch);
 			INSIST(event->rdataset == &lookup->rdataset);
 			INSIST(event->sigrdataset == &lookup->sigrdataset);
-		}
+		} else
+			fname = NULL;	/* Silence compiler warning. */
 
 		/*
 		 * If we've been canceled, forget about the result.
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 0225d724..0f4716d5 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.56.2.5.2.12 2004/08/28 06:25:19 marka Exp $ */
+/* $Id: masterdump.c,v 1.56.2.5.2.15 2006/03/10 00:17:21 marka Exp $ */
 
 #include <config.h>
 
@@ -1160,7 +1160,8 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
 	}
 
 	if (dctx->nodes != 0 && result == ISC_R_SUCCESS) {
-		dns_dbiterator_pause(dctx->dbiter);
+		result = dns_dbiterator_pause(dctx->dbiter);
+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		result = DNS_R_CONTINUE;
 	} else if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
@@ -1197,9 +1198,8 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db,
 		dns_dumpctx_attach(dctx, dctxp);
 		return (DNS_R_CONTINUE);
 	}
-	if (dctx != NULL)
-		dns_dumpctx_detach(&dctx);
 
+	dns_dumpctx_detach(&dctx);
 	return (result);
 }
 
diff --git a/lib/dns/message.c b/lib/dns/message.c
index d4b2e196..33875433 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.194.2.10.2.20 2005/06/07 01:42:23 marka Exp $ */
+/* $Id: message.c,v 1.194.2.10.2.24 2006/02/28 06:32:54 marka Exp $ */
 
 /***
  *** Imports
@@ -801,11 +801,37 @@ findname(dns_name_t **foundname, dns_name_t *target,
 }
 
 isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset)
+{
+	dns_rdataset_t *curr;
+
+	if (rdataset != NULL) {
+		REQUIRE(*rdataset == NULL);
+	}
+
+	for (curr = ISC_LIST_TAIL(name->list);
+	     curr != NULL;
+	     curr = ISC_LIST_PREV(curr, link)) {
+		if (curr->rdclass == rdclass &&
+		    curr->type == type && curr->covers == covers) {
+			if (rdataset != NULL)
+				*rdataset = curr;
+			return (ISC_R_SUCCESS);
+		}
+	}
+
+	return (ISC_R_NOTFOUND);
+}
+
+isc_result_t
 dns_message_findtype(dns_name_t *name, dns_rdatatype_t type,
 		     dns_rdatatype_t covers, dns_rdataset_t **rdataset)
 {
 	dns_rdataset_t *curr;
 
+	REQUIRE(name != NULL);
 	if (rdataset != NULL) {
 		REQUIRE(*rdataset == NULL);
 	}
@@ -1030,7 +1056,7 @@ getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		/*
 		 * Can't ask the same question twice.
 		 */
-		result = dns_message_findtype(name, rdtype, 0, NULL);
+		result = dns_message_find(name, rdclass, rdtype, 0, NULL);
 		if (result == ISC_R_SUCCESS)
 			DO_FORMERR;
 
@@ -1190,6 +1216,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		    && rdtype != dns_rdatatype_dnskey /* in a TKEY query */
 		    && rdtype != dns_rdatatype_sig /* SIG(0) */
 		    && rdtype != dns_rdatatype_tkey /* Win2000 TKEY */
+		    && msg->rdclass != dns_rdataclass_any
 		    && msg->rdclass != rdclass)
 			DO_FORMERR;
 
@@ -1279,12 +1306,9 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 			rdata->type = rdtype;
 			rdata->flags = DNS_RDATA_UPDATE;
 			result = ISC_R_SUCCESS;
-		} else if (rdtype == dns_rdatatype_tsig)
+		} else
 			result = getrdata(source, msg, dctx, rdclass,
 					  rdtype, rdatalen, rdata);
-		else
-			result = getrdata(source, msg, dctx, msg->rdclass,
-					  rdtype, rdatalen, rdata);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
 		rdata->rdclass = rdclass;
@@ -1360,8 +1384,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 				DO_FORMERR;
 
 			rdataset = NULL;
-			result = dns_message_findtype(name, rdtype, covers,
-						      &rdataset);
+			result = dns_message_find(name, rdclass, rdtype,
+						   covers, &rdataset);
 		}
 
 		/*
@@ -1799,7 +1823,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
 		if (rdataset != NULL &&
 		    (rdataset->attributes & DNS_RDATASETATTR_REQUIREDGLUE) != 0 &&
 		    (rdataset->attributes & DNS_RDATASETATTR_RENDERED) == 0) {
-			void *order_arg = msg->order_arg;
+			const void *order_arg = msg->order_arg;
 			st = *(msg->buffer);
 			count = 0;
 			if (partial)
@@ -3187,7 +3211,7 @@ dns_message_getrawmessage(dns_message_t *msg) {
 
 void
 dns_message_setsortorder(dns_message_t *msg, dns_rdatasetorderfunc_t order,
-			 void *order_arg)
+			 const void *order_arg)
 {
 	REQUIRE(DNS_MESSAGE_VALID(msg));
 	msg->order = order;
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 116a56a8..1a257de8 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.127.2.7.2.14 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: name.c,v 1.127.2.7.2.16 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -856,7 +856,7 @@ dns_name_getlabelsequence(const dns_name_t *source,
 }
 
 void
-dns_name_clone(dns_name_t *source, dns_name_t *target) {
+dns_name_clone(const dns_name_t *source, dns_name_t *target) {
 
 	/*
 	 * Make 'target' refer to the same name as 'source'.
@@ -1748,7 +1748,9 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
 }
 
 isc_result_t
-dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target) {
+dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
+		isc_buffer_t *target)
+{
 	unsigned int methods;
 	isc_uint16_t offset;
 	dns_name_t gp;	/* Global compression prefix */
@@ -1962,7 +1964,9 @@ dns_name_split(dns_name_t *name, unsigned int suffixlabels,
 }
 
 isc_result_t
-dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) {
+dns_name_dup(const dns_name_t *source, isc_mem_t *mctx,
+	     dns_name_t *target)
+{
 	/*
 	 * Make 'target' a dynamically allocated copy of 'source'.
 	 */
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 62eac05f..525905c1 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssl_link.c,v 1.1.4.3 2006/05/23 23:51:03 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -39,7 +39,7 @@
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 
-#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L)
+#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER != 0x00907000L)
 #define USE_ENGINE 1
 #endif
 
@@ -160,7 +160,7 @@ dst__openssl_init() {
 		goto cleanup_rm;
 	}
 	ENGINE_set_RAND(e, rm);
-	RAND_set_rand_method(e);
+	RAND_set_rand_method(rm);
 #else
 	RAND_set_rand_method(rm);
 #endif
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 24255834..74ba39af 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssldh_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $
  */
 
 #ifdef OPENSSL
@@ -138,6 +138,79 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DH_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+static DH *
+DH_generate_parameters(int prime_len, int generator,
+		       void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        DH *dh = NULL;
+
+	dh = DH_new();
+	if (dh != NULL) {
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+
+		if (DH_generate_parameters_ex(dh, prime_len, generator, &cb))
+			return (dh);
+		DH_free(dh);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldh_generate(dst_key_t *key, int generator) {
 	DH *dh = NULL;
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index ac84a656..267bfe8d 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifdef OPENSSL
 
@@ -169,6 +169,83 @@ openssldsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DSA_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+static DSA *
+DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
+			int *counter_ret, unsigned long *h_ret,
+			void (*callback)(int, int, void *),
+			void *cb_arg)
+{
+        BN_GENCB cb;
+        DSA *dsa;
+ 
+        dsa = DSA_new();
+	if (dsa != NULL) {
+ 
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+  
+		if (DSA_generate_parameters_ex(dsa, bits, seed_in, seed_len,  
+					       counter_ret, h_ret, &cb))
+			return (dsa);
+		DSA_free(dsa);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldsa_generate(dst_key_t *key, int unused) {
 	DSA *dsa;
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 0d4426bf..caf2efba 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.4 2006/03/01 02:40:17 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -68,6 +68,12 @@
 	(rsa)->flags &= ~(RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE); \
 	(rsa)->flags &= ~RSA_FLAG_BLINDING; \
 	} while (0)
+#elif defined(RSA_FLAG_NO_BLINDING)
+#define SET_FLAGS(rsa) \
+	do { \
+		(rsa)->flags &= ~RSA_FLAG_BLINDING; \
+		(rsa)->flags |= RSA_FLAG_NO_BLINDING; \
+	} while (0)
 #else
 #define SET_FLAGS(rsa) \
 	do { \
@@ -87,12 +93,16 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) {
 		isc_md5_t *md5ctx;
 
 		md5ctx = isc_mem_get(dctx->mctx, sizeof(isc_md5_t));
+		if (md5ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_md5_init(md5ctx);
 		dctx->opaque = md5ctx;
 	} else {
 		isc_sha1_t *sha1ctx;
 
 		sha1ctx = isc_mem_get(dctx->mctx, sizeof(isc_sha1_t));
+		if (sha1ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_sha1_init(sha1ctx);
 		dctx->opaque = sha1ctx;
 	}
@@ -258,6 +268,94 @@ opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_RSA_GENERATE_KEY
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+static RSA *
+RSA_generate_key(int bits, unsigned long e_value,
+		 void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        size_t i;
+        RSA *rsa = RSA_new();
+        BIGNUM *e = BN_new();
+
+        if (rsa == NULL || e == NULL)
+		goto err;
+
+        /* The problem is when building with 8, 16, or 32 BN_ULONG,
+         * unsigned long can be larger */
+        for (i = 0; i < sizeof(unsigned long) * 8; i++) {
+                if ((e_value & (1UL<<i)) != 0)
+                        BN_set_bit(e, i);
+	}
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if (RSA_generate_key_ex(rsa, bits, e, &cb)) {
+                BN_free(e);
+                return (rsa);
+        }
+err:
+        if (e != NULL)
+		BN_free(e);
+        if (rsa != NULL)
+		RSA_free(rsa);
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 opensslrsa_generate(dst_key_t *key, int exp) {
 	RSA *rsa;
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index a50ff0c9..8b6ccdb2 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.c,v 1.14.2.1.10.4 2004/03/06 08:13:41 marka Exp $ */
+/* $Id: peer.c,v 1.14.2.1.10.6 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -491,7 +491,9 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) {
 }
 
 isc_result_t
-dns_peer_settransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source) {
+dns_peer_settransfersource(dns_peer_t *peer,
+			   const isc_sockaddr_t *transfer_source)
+{
 	REQUIRE(DNS_PEER_VALID(peer));
 
 	if (peer->transfer_source != NULL) {
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index f399dd17..8930d355 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.168.2.11.2.22 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: rbtdb.c,v 1.168.2.11.2.26 2006/03/02 23:18:20 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -1011,6 +1011,47 @@ cleanup_nondirty(rbtdb_version_t *version, rbtdb_changedlist_t *cleanup_list) {
 	}
 }
 
+static isc_boolean_t
+iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
+	dns_rdataset_t keyset;
+	dns_rdataset_t nsecset, signsecset;
+	isc_boolean_t haszonekey = ISC_FALSE;
+	isc_boolean_t hasnsec = ISC_FALSE;
+	isc_result_t result;
+
+	dns_rdataset_init(&keyset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
+				     0, &keyset, NULL);
+	if (result == ISC_R_SUCCESS) {
+		dns_rdata_t keyrdata = DNS_RDATA_INIT;
+		result = dns_rdataset_first(&keyset);
+		while (result == ISC_R_SUCCESS) {
+			dns_rdataset_current(&keyset, &keyrdata);
+			if (dns_zonekey_iszonekey(&keyrdata)) {
+				haszonekey = ISC_TRUE;
+				break;
+			}
+			result = dns_rdataset_next(&keyset);
+		}
+		dns_rdataset_disassociate(&keyset);
+	}
+	if (!haszonekey)
+		return (ISC_FALSE);
+
+	dns_rdataset_init(&nsecset);
+	dns_rdataset_init(&signsecset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
+				     0, &nsecset, &signsecset);
+	if (result == ISC_R_SUCCESS) {
+		if (dns_rdataset_isassociated(&signsecset)) {
+			hasnsec = ISC_TRUE;
+			dns_rdataset_disassociate(&signsecset);
+		}
+		dns_rdataset_disassociate(&nsecset);
+	}
+	return (hasnsec);
+}
+
 static void
 closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
@@ -1136,6 +1177,12 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	least_serial = rbtdb->least_serial;
 	UNLOCK(&rbtdb->lock);
 
+	/*
+	 * Update the zone's secure status.
+	 */
+	if (version->writer && commit && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	if (cleanup_version != NULL) {
 		INSIST(EMPTY(cleanup_version->changed_list));
 		isc_mem_put(rbtdb->common.mctx, cleanup_version,
@@ -2184,12 +2231,12 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2247,9 +2294,15 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 				search.need_cleanup = ISC_TRUE;
 				maybe_zonecut = ISC_FALSE;
 				at_zonecut = ISC_TRUE;
+				/*
+				 * It is not clear if KEY should still be
+				 * allowed at the parent side of the zone
+				 * cut or not.  It is needed for RFC3007
+				 * validated updates.
+				 */
 				if ((search.options & DNS_DBFIND_GLUEOK) == 0
 				    && type != dns_rdatatype_nsec
-				    && type != dns_rdatatype_dnskey) {
+				    && type != dns_rdatatype_key) {
 					/*
 					 * Glue is not OK, but any answer we
 					 * could return would be glue.  Return
@@ -2430,8 +2483,14 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 		 * and the type is NSEC or KEY.
 		 */
 		if (search.zonecut == node) {
+			/*
+			 * It is not clear if KEY should still be
+			 * allowed at the parent side of the zone
+			 * cut or not.  It is needed for RFC3007
+			 * validated updates.
+			 */
 			if (type == dns_rdatatype_nsec ||
-			    type == dns_rdatatype_dnskey)
+			    type == dns_rdatatype_key)
 				result = ISC_R_SUCCESS;
 			else if (type == dns_rdatatype_any)
 				result = DNS_R_ZONECUT;
@@ -2860,7 +2919,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 	rdatasetheader_t *header, *header_prev, *header_next;
 	rdatasetheader_t *found, *nsheader;
 	rdatasetheader_t *foundsig, *nssig, *cnamesig;
-	rbtdb_rdatatype_t sigtype, nsectype;
+	rbtdb_rdatatype_t sigtype, negtype;
 
 	UNUSED(version);
 
@@ -2918,12 +2977,12 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2935,7 +2994,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 	found = NULL;
 	foundsig = NULL;
 	sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	nsheader = NULL;
 	nssig = NULL;
 	cnamesig = NULL;
@@ -3007,7 +3066,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 				 */
 				foundsig = header;
 			} else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				   header->type == nsectype) {
+				   header->type == negtype) {
 				/*
 				 * We've found a negative cache entry.
 				 */
@@ -3618,7 +3677,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
 	dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
 	rdatasetheader_t *header, *header_next, *found, *foundsig;
-	rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype;
+	rbtdb_rdatatype_t matchtype, sigmatchtype, negtype;
 	isc_result_t result;
 
 	REQUIRE(VALID_RBTDB(rbtdb));
@@ -3636,7 +3695,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	found = NULL;
 	foundsig = NULL;
 	matchtype = RBTDB_RDATATYPE_VALUE(type, covers);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	if (covers == 0)
 		sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
 	else
@@ -3659,7 +3718,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 			if (header->type == matchtype)
 				found = header;
 			else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				 header->type == nsectype)
+				 header->type == negtype)
 				found = header;
 			else if (header->type == sigmatchtype)
 				foundsig = header;
@@ -3785,16 +3844,13 @@ cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) {
 			 * Look for active extant "other data".
 			 *
 			 * "Other data" is any rdataset whose type is not
-			 * DNSKEY, RRSIG DNSKEY, NSEC, RRSIG NSEC,
-			 * or RRSIG CNAME.
+			 * KEY, RRSIG KEY, NSEC, RRSIG NSEC or RRSIG CNAME.
 			 */
 			rdtype = RBTDB_RDATATYPE_BASE(header->type);
 			if (rdtype == dns_rdatatype_rrsig ||
 			    rdtype == dns_rdatatype_sig)
 				rdtype = RBTDB_RDATATYPE_EXT(header->type);
 			if (rdtype != dns_rdatatype_nsec &&
-			    rdtype != dns_rdatatype_dnskey &&
-			    rdtype != dns_rdatatype_nxt &&
 			    rdtype != dns_rdatatype_key &&
 			    rdtype != dns_rdatatype_cname) {
 				/*
@@ -3839,7 +3895,8 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 	isc_boolean_t header_nx;
 	isc_boolean_t newheader_nx;
 	isc_boolean_t merge;
-	dns_rdatatype_t nsectype, rdtype, covers;
+	dns_rdatatype_t rdtype, covers;
+	rbtdb_rdatatype_t negtype;
 	dns_trust_t trust;
 
 	/*
@@ -3877,7 +3934,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 	newheader_nx = NONEXISTENT(newheader) ? ISC_TRUE : ISC_FALSE;
 	topheader_prev = NULL;
 
-	nsectype = 0;
+	negtype = 0;
 	if (rbtversion == NULL && !newheader_nx) {
 		rdtype = RBTDB_RDATATYPE_BASE(newheader->type);
 		if (rdtype == 0) {
@@ -3887,12 +3944,13 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 			covers = RBTDB_RDATATYPE_EXT(newheader->type);
 			if (covers == dns_rdatatype_any) {
 				/*
-				 * We're adding an NXDOMAIN negative cache
-				 * entry.
+				 * We're adding an negative cache entry
+				 * which covers all types (NXDOMAIN,
+				 * NODATA(QTYPE=ANY)).
 				 *
 				 * We make all other data stale so that the
 				 * only rdataset that can be found at this
-				 * node is the NXDOMAIN negative cache entry.
+				 * node is the negative cache entry.
 				 */
 				for (topheader = rbtnode->data;
 				     topheader != NULL;
@@ -3904,17 +3962,19 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 				rbtnode->dirty = 1;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(covers, 0);
+			negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
 		} else {
 			/*
 			 * We're adding something that isn't a
 			 * negative cache entry.  Look for an extant
-			 * non-stale NXDOMAIN negative cache entry.
+			 * non-stale NXDOMAIN/NODATA(QTYPE=ANY) negative
+			 * cache entry.
 			 */
 			for (topheader = rbtnode->data;
 			     topheader != NULL;
 			     topheader = topheader->next) {
-				if (NXDOMAIN(topheader))
+				if (topheader->type == 
+				    RBTDB_RDATATYPE_NCACHEANY)
 					break;
 			}
 			if (topheader != NULL && EXISTS(topheader) &&
@@ -3924,7 +3984,8 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 				 */
 				if (trust < topheader->trust) {
 					/*
-					 * The NXDOMAIN is more trusted.
+					 * The NXDOMAIN/NODATA(QTYPE=ANY)
+					 * is more trusted.
 					 */
 					free_rdataset(rbtdb->common.mctx,
 						      newheader);
@@ -3936,7 +3997,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 				}
 				/*
 				 * The new rdataset is better.  Expire the
-				 * NXDOMAIN.
+				 * NXDOMAIN/NODATA(QTYPE=ANY).
 				 */
 				topheader->ttl = 0;
 				topheader->attributes |= RDATASET_ATTR_STALE;
@@ -3944,7 +4005,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 				topheader = NULL;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(0, rdtype);
+			negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 		}
 	}
 
@@ -3952,7 +4013,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 	     topheader != NULL;
 	     topheader = topheader->next) {
 		if (topheader->type == newheader->type ||
-		    topheader->type == nsectype)
+		    topheader->type == negtype)
 			break;
 		topheader_prev = topheader;
 	}
@@ -4118,6 +4179,10 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 			rbtnode->dirty = 1;
 			if (changed != NULL)
 				changed->dirty = ISC_TRUE;
+			if (rbtversion == NULL) {
+				header->ttl = 0;
+				header->attributes |= RDATASET_ATTR_STALE;
+			}
 		}
 	} else {
 		/*
@@ -4318,6 +4383,13 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	if (delegating)
 		RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4460,6 +4532,13 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  unlock:
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4501,6 +4580,13 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4615,48 +4701,6 @@ beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp) {
 	return (ISC_R_SUCCESS);
 }
 
-static isc_boolean_t
-iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
-	dns_rdataset_t keyset;
-	dns_rdataset_t nsecset, signsecset;
-	isc_boolean_t haszonekey = ISC_FALSE;
-	isc_boolean_t hasnsec = ISC_FALSE;
-	isc_result_t result;
-
-	dns_rdataset_init(&keyset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
-				     0, &keyset, NULL);
-	if (result == ISC_R_SUCCESS) {
-		dns_rdata_t keyrdata = DNS_RDATA_INIT;
-		result = dns_rdataset_first(&keyset);
-		while (result == ISC_R_SUCCESS) {
-			dns_rdataset_current(&keyset, &keyrdata);
-			if (dns_zonekey_iszonekey(&keyrdata)) {
-				haszonekey = ISC_TRUE;
-				break;
-			}
-			result = dns_rdataset_next(&keyset);
-		}
-		dns_rdataset_disassociate(&keyset);
-	}
-	if (!haszonekey)
-		return (ISC_FALSE);
-
-	dns_rdataset_init(&nsecset);
-	dns_rdataset_init(&signsecset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
-				     0, &nsecset, &signsecset);
-	if (result == ISC_R_SUCCESS) {
-		if (dns_rdataset_isassociated(&signsecset)) {
-			hasnsec = ISC_TRUE;
-			dns_rdataset_disassociate(&signsecset);
-		}
-		dns_rdataset_disassociate(&nsecset);
-	}
-	return (hasnsec);
-
-}
-
 static isc_result_t
 endload(dns_db_t *db, dns_dbload_t **dbloadp) {
 	rbtdb_load_t *loadctx;
@@ -5235,7 +5279,8 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
 	rdatasetheader_t *header, *top_next;
 	rbtdb_serial_t serial;
 	isc_stdtime_t now;
-	rbtdb_rdatatype_t type;
+	rbtdb_rdatatype_t type, negtype;
+	dns_rdatatype_t rdtype, covers;
 
 	header = rbtiterator->current;
 	if (header == NULL)
@@ -5252,9 +5297,18 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
 	type = header->type;
+	rdtype = RBTDB_RDATATYPE_BASE(header->type);
+	if (rdtype == 0) {
+		covers = RBTDB_RDATATYPE_EXT(header->type);
+		negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
+	} else 
+		negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 	for (header = header->next; header != NULL; header = top_next) {
 		top_next = header->next;
-		if (header->type != type) {
+		/*
+		 * If not walking back up the down list.
+		 */
+		if (header->type != type && header->type != negtype) {
 			do {
 				if (header->serial <= serial &&
 				    !IGNORE(header)) {
diff --git a/lib/dns/rdata/generic/dlv_65323.c b/lib/dns/rdata/generic/dlv_32769.c
index 2d91758b..b28435c8 100644
--- a/lib/dns/rdata/generic/dlv_65323.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,12 +14,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.c,v 1.2.2.4 2004/03/16 12:38:14 marka Exp $ */
+/* $Id: dlv_32769.c,v 1.2.4.2 2006/02/19 06:50:46 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 
-#ifndef RDATA_GENERIC_DLV_65323_C
-#define RDATA_GENERIC_DLV_65323_C
+#ifndef RDATA_GENERIC_DLV_32769_C
+#define RDATA_GENERIC_DLV_32769_C
 
 #define RRTYPE_DLV_ATTRIBUTES 0
 
@@ -27,7 +27,7 @@ static inline isc_result_t
 fromtext_dlv(ARGS_FROMTEXT) {
 	isc_token_t token;
 
-	REQUIRE(type == 65323);
+	REQUIRE(type == 32769);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -75,7 +75,7 @@ totext_dlv(ARGS_TOTEXT) {
 	char buf[sizeof("64000 ")];
 	unsigned int n;
 
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 	REQUIRE(rdata->length != 0);
 
 	UNUSED(tctx);
@@ -122,7 +122,7 @@ static inline isc_result_t
 fromwire_dlv(ARGS_FROMWIRE) {
 	isc_region_t sr;
 
-	REQUIRE(type == 65323);
+	REQUIRE(type == 32769);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -141,7 +141,7 @@ static inline isc_result_t
 towire_dlv(ARGS_TOWIRE) {
 	isc_region_t sr;
 
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 	REQUIRE(rdata->length != 0);
 
 	UNUSED(cctx);
@@ -157,7 +157,7 @@ compare_dlv(ARGS_COMPARE) {
 
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
-	REQUIRE(rdata1->type == 65323);
+	REQUIRE(rdata1->type == 32769);
 	REQUIRE(rdata1->length != 0);
 	REQUIRE(rdata2->length != 0);
 
@@ -170,7 +170,7 @@ static inline isc_result_t
 fromstruct_dlv(ARGS_FROMSTRUCT) {
 	dns_rdata_dlv_t *dlv = source;
 
-	REQUIRE(type == 65323);
+	REQUIRE(type == 32769);
 	REQUIRE(source != NULL);
 	REQUIRE(dlv->common.rdtype == type);
 	REQUIRE(dlv->common.rdclass == rdclass);
@@ -190,7 +190,7 @@ tostruct_dlv(ARGS_TOSTRUCT) {
 	dns_rdata_dlv_t *dlv = target;
 	isc_region_t region;
 
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 	REQUIRE(target != NULL);
 	REQUIRE(rdata->length != 0);
 
@@ -221,7 +221,7 @@ freestruct_dlv(ARGS_FREESTRUCT) {
 	dns_rdata_dlv_t *dlv = source;
 
 	REQUIRE(dlv != NULL);
-	REQUIRE(dlv->common.rdtype == 65323);
+	REQUIRE(dlv->common.rdtype == 32769);
 
 	if (dlv->mctx == NULL)
 		return;
@@ -233,7 +233,7 @@ freestruct_dlv(ARGS_FREESTRUCT) {
 
 static inline isc_result_t
 additionaldata_dlv(ARGS_ADDLDATA) {
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 
 	UNUSED(rdata);
 	UNUSED(add);
@@ -246,7 +246,7 @@ static inline isc_result_t
 digest_dlv(ARGS_DIGEST) {
 	isc_region_t r;
 
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 
 	dns_rdata_toregion(rdata, &r);
 
@@ -256,7 +256,7 @@ digest_dlv(ARGS_DIGEST) {
 static inline isc_boolean_t
 checkowner_dlv(ARGS_CHECKOWNER) {
 
-	REQUIRE(type == 65323);
+	REQUIRE(type == 32769);
 
 	UNUSED(name);
 	UNUSED(type);
@@ -269,7 +269,7 @@ checkowner_dlv(ARGS_CHECKOWNER) {
 static inline isc_boolean_t
 checknames_dlv(ARGS_CHECKNAMES) {
 
-	REQUIRE(rdata->type == 65323);
+	REQUIRE(rdata->type == 32769);
 
 	UNUSED(rdata);
 	UNUSED(owner);
@@ -278,4 +278,4 @@ checknames_dlv(ARGS_CHECKNAMES) {
 	return (ISC_TRUE);
 }
 
-#endif	/* RDATA_GENERIC_DLV_65323_C */
+#endif	/* RDATA_GENERIC_DLV_32769_C */
diff --git a/lib/dns/rdata/generic/dlv_65323.h b/lib/dns/rdata/generic/dlv_32769.h
index 689fd4b3..08a9b1d4 100644
--- a/lib/dns/rdata/generic/dlv_65323.h
+++ b/lib/dns/rdata/generic/dlv_32769.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,11 +14,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.h,v 1.2.2.3 2004/03/15 01:02:55 marka Exp $ */
+/* $Id: dlv_32769.h,v 1.2.4.2 2006/02/19 06:50:46 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
-#ifndef GENERIC_DLV_65323_H
-#define GENERIC_DLV_65323_H 1
+#ifndef GENERIC_DLV_32769_H
+#define GENERIC_DLV_32769_H 1
 
 typedef struct dns_rdata_dlv {
 	dns_rdatacommon_t	common;
@@ -30,4 +30,4 @@ typedef struct dns_rdata_dlv {
 	unsigned char		*digest;
 } dns_rdata_dlv_t;
 
-#endif /* GENERIC_DLV_65323_H */
+#endif /* GENERIC_DLV_32769_H */
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 672777b0..8af71c3f 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.58.2.2.2.10 2004/03/08 09:04:31 marka Exp $ */
+/* $Id: rdataset.c,v 1.58.2.2.2.12 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -280,9 +280,9 @@ towire_compare(const void *av, const void *bv) {
 }
 
 static isc_result_t
-towiresorted(dns_rdataset_t *rdataset, dns_name_t *owner_name,
+towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 	     dns_compress_t *cctx, isc_buffer_t *target,
-	     dns_rdatasetorderfunc_t order, void *order_arg,
+	     dns_rdatasetorderfunc_t order, const void *order_arg,
 	     isc_boolean_t partial, unsigned int options,
 	     unsigned int *countp, void **state)
 {
@@ -528,11 +528,11 @@ towiresorted(dns_rdataset_t *rdataset, dns_name_t *owner_name,
 
 isc_result_t
 dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
-			  dns_name_t *owner_name,
+			  const dns_name_t *owner_name,
 			  dns_compress_t *cctx,
 			  isc_buffer_t *target,
 			  dns_rdatasetorderfunc_t order,
-			  void *order_arg,
+			  const void *order_arg,
 			  unsigned int options,
 			  unsigned int *countp)
 {
@@ -543,11 +543,11 @@ dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
 
 isc_result_t
 dns_rdataset_towirepartial(dns_rdataset_t *rdataset,
-			   dns_name_t *owner_name,
+			   const dns_name_t *owner_name,
 			   dns_compress_t *cctx,
 			   isc_buffer_t *target,
 			   dns_rdatasetorderfunc_t order,
-			   void *order_arg,
+			   const void *order_arg,
 			   unsigned int options,
 			   unsigned int *countp,
 			   void **state)
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 3ec845f8..ede3266a 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.64.2.1.10.6 2004/03/08 09:04:31 marka Exp $ */
+/* $Id: request.c,v 1.64.2.1.10.8 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -512,6 +512,7 @@ create_tcp_dispatch(dns_requestmgr_t *requestmgr, isc_sockaddr_t *srcaddr,
 				   isc_sockettype_tcp, &socket);
 	if (result != ISC_R_SUCCESS)
 		return (result);
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	if (srcaddr == NULL) {
 		isc_sockaddr_anyofpf(&bind_any,
 				     isc_sockaddr_pf(destaddr));
@@ -523,6 +524,7 @@ create_tcp_dispatch(dns_requestmgr_t *requestmgr, isc_sockaddr_t *srcaddr,
 	}
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
+#endif
 	attrs = 0;
 	attrs |= DNS_DISPATCHATTR_TCP;
 	attrs |= DNS_DISPATCHATTR_PRIVATE;
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 6f803eb1..ff644143 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.63 2006/01/06 01:21:08 marka Exp $ */
 
 #include <config.h>
 
@@ -27,8 +27,10 @@
 
 #include <dns/acl.h>
 #include <dns/adb.h>
+#include <dns/cache.h>
 #include <dns/db.h>
 #include <dns/dispatch.h>
+#include <dns/ds.h>
 #include <dns/events.h>
 #include <dns/forward.h>
 #include <dns/keytable.h>
@@ -47,6 +49,7 @@
 #include <dns/rdatatype.h>
 #include <dns/resolver.h>
 #include <dns/result.h>
+#include <dns/rootns.h>
 #include <dns/tsig.h>
 #include <dns/validator.h>
 
@@ -461,8 +464,7 @@ fctx_starttimer(fetchctx_t *fctx) {
 	 * no further idle events are delivered.
 	 */
 	return (isc_timer_reset(fctx->timer, isc_timertype_once,
-				&fctx->expires, NULL,
-				ISC_TRUE));
+				&fctx->expires, NULL, ISC_TRUE));
 }
 
 static inline void
@@ -1027,9 +1029,11 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_query;
 
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 		result = isc_socket_bind(query->tcpsocket, &addr);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_socket;
+#endif
 
 		/*
 		 * A dispatch will be created once the connect succeeds.
@@ -1287,6 +1291,12 @@ resquery_send(resquery_t *query) {
 	}
 
 	/*
+	 * Clear CD if EDNS is not in use.
+	 */
+	if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0)
+		fctx->qmessage->flags &= ~DNS_MESSAGEFLAG_CD;
+
+	/*
 	 * Add TSIG record tailored to the current recipient.
 	 */
 	result = dns_view_getpeertsig(fctx->res->view, &ipaddr, &tsigkey);
@@ -3155,10 +3165,12 @@ validated(isc_task_t *task, isc_event_t *event) {
 	 * so, destroy the fctx.
 	 */
 	if (SHUTTINGDOWN(fctx) && !sentresponse) {
-		maybe_destroy(fctx);
+		maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
+	LOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
 	/*
 	 * If chaining, we need to make sure that the right result code is
 	 * returned, and that the rdatasets are bound.
@@ -3217,10 +3229,11 @@ validated(isc_task_t *task, isc_event_t *event) {
 		result = vevent->result;
 		add_bad(fctx, &addrinfo->sockaddr, result);
 		isc_event_free(&event);
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (sentresponse)
-			fctx_done(fctx, result);
+			fctx_done(fctx, result);	/* Locks bucket. */
 		else
-			fctx_try(fctx);
+			fctx_try(fctx);			/* Locks bucket. */
 		return;
 	}
 
@@ -3265,6 +3278,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 		result = dns_rdataset_addnoqname(vevent->rdataset,
 				   vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF]);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		INSIST(vevent->sigrdataset != NULL);
 		vevent->sigrdataset->ttl = vevent->rdataset->ttl;
 	}
 
@@ -3297,9 +3311,9 @@ validated(isc_task_t *task, isc_event_t *event) {
 		 * If we only deferred the destroy because we wanted to cache
 		 * the data, destroy now.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (SHUTTINGDOWN(fctx))
-			maybe_destroy(fctx);
-
+			maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
@@ -3312,6 +3326,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 		 * more rdatasets that still need to
 		 * be validated.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		goto cleanup_event;
 	}
 
@@ -3384,7 +3399,9 @@ validated(isc_task_t *task, isc_event_t *event) {
 	if (node != NULL)
 		dns_db_detachnode(fctx->cache, &node);
 
-	fctx_done(fctx, result);
+	UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
+	fctx_done(fctx, result);	/* Locks bucket. */
 
  cleanup_event:
 	isc_event_free(&event);
@@ -3763,23 +3780,28 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
 		  isc_result_t *eresultp)
 {
 	isc_result_t result;
+	dns_rdataset_t rdataset;
+
+	if (ardataset == NULL) {
+		dns_rdataset_init(&rdataset);
+		ardataset = &rdataset;
+	}
 	result = dns_ncache_add(message, cache, node, covers, now,
 				maxttl, ardataset);
-	if (result == DNS_R_UNCHANGED) {
+	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
 		/*
-		 * The data in the cache are better than the negative cache
-		 * entry we're trying to add.
+		 * If the cache now contains a negative entry and we
+		 * care about whether it is DNS_R_NCACHENXDOMAIN or
+		 * DNS_R_NCACHENXRRSET then extract it.
 		 */
-		if (ardataset != NULL && ardataset->type == 0) {
+		if (ardataset->type == 0) {
 			/*
-			 * The cache data is also a negative cache
-			 * entry.
+			 * The cache data is a negative cache entry.
 			 */
 			if (NXDOMAIN(ardataset))
 				*eresultp = DNS_R_NCACHENXDOMAIN;
 			else
 				*eresultp = DNS_R_NCACHENXRRSET;
-			result = ISC_R_SUCCESS;
 		} else {
 			/*
 			 * Either we don't care about the nature of the
@@ -3791,14 +3813,11 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
 			 * XXXRTH  There's a CNAME/DNAME problem here.
 			 */
 			*eresultp = ISC_R_SUCCESS;
-			result = ISC_R_SUCCESS;
 		}
-	} else if (result == ISC_R_SUCCESS) {
-		if (NXDOMAIN(ardataset))
-			*eresultp = DNS_R_NCACHENXDOMAIN;
-		else
-			*eresultp = DNS_R_NCACHENXRRSET;
+		result = ISC_R_SUCCESS;
 	}
+	if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset))
+		dns_rdataset_disassociate(ardataset);
 
 	return (result);
 }
@@ -4914,6 +4933,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
 		fctx_try(fctx);
 	} else {
 		unsigned int n;
+		dns_rdataset_t *nsrdataset = NULL;
 
 		/*
 		 * Retrieve state from fctx->nsfetch before we destroy it.
@@ -4921,13 +4941,20 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
 		dns_fixedname_init(&fixed);
 		domain = dns_fixedname_name(&fixed);
 		dns_name_copy(&fctx->nsfetch->private->domain, domain, NULL);
-		dns_rdataset_clone(&fctx->nsfetch->private->nameservers,
-				   &nameservers);
-		dns_resolver_destroyfetch(&fctx->nsfetch);
 		if (dns_name_equal(&fctx->nsname, domain)) {
 			fctx_done(fctx, DNS_R_SERVFAIL);
+			dns_resolver_destroyfetch(&fctx->nsfetch);
 			goto cleanup;
 		}
+		if (dns_rdataset_isassociated(
+		    &fctx->nsfetch->private->nameservers)) {
+			dns_rdataset_clone(
+			    &fctx->nsfetch->private->nameservers,
+			    &nameservers);
+			nsrdataset = &nameservers;
+		} else
+			domain = NULL;
+		dns_resolver_destroyfetch(&fctx->nsfetch);
 		n = dns_name_countlabels(&fctx->nsname);
 		dns_name_getlabelsequence(&fctx->nsname, 1, n - 1,
 					  &fctx->nsname);
@@ -4937,7 +4964,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
 		FCTXTRACE("continuing to look for parent's NS records");
 		result = dns_resolver_createfetch(fctx->res, &fctx->nsname,
 						  dns_rdatatype_ns, domain,
-						  &nameservers, NULL, 0, task,
+						  nsrdataset, NULL, 0, task,
 						  resume_dslookup, fctx,
 						  &fctx->nsrrset, NULL,
 						  &fctx->nsfetch);
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 43c8db0e..ca793d2b 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.71.2.1.10.7 2005/06/12 00:02:26 marka Exp $
+ * $Id: tkey.c,v 1.71.2.1.10.9 2006/01/04 23:50:20 marka Exp $
  */
 
 #include <config.h>
@@ -441,15 +441,17 @@ process_gsstkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name,
 					   dstkey, ISC_TRUE, signer,
 					   tkeyin->inception, tkeyin->expire,
 					   msg->mctx, ring, NULL);
+#if 1
 	if (result != ISC_R_SUCCESS)
 		goto failure;
-
+#else
 	if (result == ISC_R_NOTFOUND) {
 		tkeyout->error = dns_tsigerror_badalg;
 		return (ISC_R_SUCCESS);
 	}
 	if (result != ISC_R_SUCCESS)
 		goto failure;
+#endif
 
 	/* This key is good for a long time */
 	isc_stdtime_get(&now);
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 6a8d774a..9bdde06e 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.112.2.3.8.6 2005/03/17 03:58:31 marka Exp $
+ * $Id: tsig.c,v 1.112.2.3.8.10 2006/05/02 04:21:42 marka Exp $
  */
 
 #include <config.h>
@@ -363,7 +363,7 @@ dns_tsig_sign(dns_message_t *msg) {
 	isc_buffer_t databuf, sigbuf;
 	isc_buffer_t *dynbuf;
 	dns_name_t *owner;
-	dns_rdata_t *rdata;
+	dns_rdata_t *rdata = NULL;
 	dns_rdatalist_t *datalist;
 	dns_rdataset_t *dataset;
 	isc_region_t r;
@@ -555,13 +555,12 @@ dns_tsig_sign(dns_message_t *msg) {
 		tsig.signature = NULL;
 	}
 
-	rdata = NULL;
 	ret = dns_message_gettemprdata(msg, &rdata);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_signature;
 	ret = isc_buffer_allocate(msg->mctx, &dynbuf, 512);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_signature;
+		goto cleanup_rdata;
 	ret = dns_rdata_fromstruct(rdata, dns_rdataclass_any,
 				   dns_rdatatype_tsig, &tsig, dynbuf);
 	if (ret != ISC_R_SUCCESS)
@@ -577,7 +576,7 @@ dns_tsig_sign(dns_message_t *msg) {
 	owner = NULL;
 	ret = dns_message_gettempname(msg, &owner);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_dynbuf;
+		goto cleanup_rdata;
 	dns_name_init(owner, NULL);
 	ret = dns_name_dup(&key->name, msg->mctx, owner);
 	if (ret != ISC_R_SUCCESS)
@@ -587,16 +586,16 @@ dns_tsig_sign(dns_message_t *msg) {
 	ret = dns_message_gettemprdatalist(msg, &datalist);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_owner;
+	dataset = NULL;
+	ret = dns_message_gettemprdataset(msg, &dataset);
+	if (ret != ISC_R_SUCCESS)
+		goto cleanup_rdatalist;
 	datalist->rdclass = dns_rdataclass_any;
 	datalist->type = dns_rdatatype_tsig;
 	datalist->covers = 0;
 	datalist->ttl = 0;
 	ISC_LIST_INIT(datalist->rdata);
 	ISC_LIST_APPEND(datalist->rdata, rdata, link);
-	dataset = NULL;
-	ret = dns_message_gettemprdataset(msg, &dataset);
-	if (ret != ISC_R_SUCCESS)
-		goto cleanup_owner;
 	dns_rdataset_init(dataset);
 	RUNTIME_CHECK(dns_rdatalist_tordataset(datalist, dataset)
 		      == ISC_R_SUCCESS);
@@ -605,16 +604,19 @@ dns_tsig_sign(dns_message_t *msg) {
 
 	return (ISC_R_SUCCESS);
 
-cleanup_owner:
-	if (owner != NULL)
-		dns_message_puttempname(msg, &owner);
-cleanup_dynbuf:
-	if (dynbuf != NULL)
-		isc_buffer_free(&dynbuf);
-cleanup_signature:
+ cleanup_rdatalist:
+	dns_message_puttemprdatalist(msg, &datalist);
+ cleanup_owner:
+	dns_message_puttempname(msg, &owner);
+	goto cleanup_rdata;
+ cleanup_dynbuf:
+	isc_buffer_free(&dynbuf);
+ cleanup_rdata:
+	dns_message_puttemprdata(msg, &rdata);
+ cleanup_signature:
 	if (tsig.signature != NULL)
 		isc_mem_put(mctx, tsig.signature, sigsize);
-cleanup_context:
+ cleanup_context:
 	if (ctx != NULL)
 		dst_context_destroy(&ctx);
 	return (ret);
@@ -646,8 +648,11 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 
 	msg->verify_attempted = 1;
 
-	if (msg->tcp_continuation)
+	if (msg->tcp_continuation) {
+		if (tsigkey == NULL || msg->querytsig == NULL)
+			return (DNS_R_UNEXPECTEDTSIG);
 		return (tsig_verify_tcp(source, msg));
+	}
 
 	/*
 	 * There should be a TSIG record...
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index a62db341..ec727b71 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.5.8.21 2005/11/02 02:07:47 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */
 
 #include <config.h>
 
@@ -43,20 +43,65 @@
 #include <dns/validator.h>
 #include <dns/view.h>
 
+/*! \file
+ * \brief
+ * Basic processing sequences.
+ *
+ * \li When called with rdataset and sigrdataset:
+ * validator_start -> validate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> validate -> proveunsecure
+ *
+ * validator_start -> validate -> nsecvalidate	(secure wildcard answer)
+ * 
+ * \li When called with rdataset, sigrdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> validate -> proveunsecure
+ *
+ * \li When called with rdataset:
+ * validator_start -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> proveunsecure
+ *
+ * \li When called with rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> proveunsecure
+ *
+ * \li When called without a rdataset:
+ * validator_start -> nsecvalidate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> nsecvalidate -> proveunsecure
+ *
+ * \li When called without a rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> nsecvalidate -> proveunsecure
+ *
+ * validator_start: determines what type of validation to do.
+ * validate: attempts to perform a positive validation.
+ * proveunsecure: attempts to prove the answer comes from a unsecure zone.
+ * nsecvalidate: attempts to prove a negative response.
+ * startfinddlvsep: starts the DLV record lookup.
+ * dlv_validator_start: resets state and restarts the lookup using the
+ *	DLV RRset found by startfinddlvsep.
+ */
+
 #define VALIDATOR_MAGIC			ISC_MAGIC('V', 'a', 'l', '?')
 #define VALID_VALIDATOR(v)		ISC_MAGIC_VALID(v, VALIDATOR_MAGIC)
 
-#define VALATTR_SHUTDOWN		0x0001
-#define VALATTR_FOUNDNONEXISTENCE	0x0002
-#define VALATTR_TRIEDVERIFY		0x0004
-#define VALATTR_NEGATIVE		0x0008
-#define VALATTR_INSECURITY		0x0010
-#define VALATTR_DLVTRIED		0x0020
+#define VALATTR_SHUTDOWN		0x0001	/*%< Shutting down. */
+#define VALATTR_TRIEDVERIFY		0x0004  /*%< We have found a key and
+						 * have attempted a verify. */
+#define VALATTR_INSECURITY		0x0010	/*%< Attempting proveunsecure. */
+#define VALATTR_DLVTRIED		0x0020	/*%< Looked for a DLV record. */
+#define VALATTR_AUTHNONPENDING		0x0040	/*%< Tidy up pending auth. */
 
+/*!
+ * NSEC proofs to be looked for.
+ */
 #define VALATTR_NEEDNOQNAME		0x0100
 #define VALATTR_NEEDNOWILDCARD		0x0200
 #define VALATTR_NEEDNODATA		0x0400
 
+/*!
+ * NSEC proofs that have been found.
+ */
 #define VALATTR_FOUNDNOQNAME		0x1000
 #define VALATTR_FOUNDNOWILDCARD		0x2000
 #define VALATTR_FOUNDNODATA		0x4000
@@ -104,19 +149,35 @@ validator_logcreate(dns_validator_t *val,
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val);
 
-static isc_result_t
+static void
 dlv_validator_start(dns_validator_t *val);
 
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume);
 
+static void
+auth_nonpending(dns_message_t *message);
+
+static isc_result_t
+startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure);
+
+/*%
+ * Mark the RRsets as a answer.
+ *
+ * If VALATTR_AUTHNONPENDING is set then this is a negative answer
+ * in a insecure zone.  We need to mark any pending RRsets as
+ * dns_trust_authauthority answers (this is deferred from resolver.c).
+ */
 static inline void
 markanswer(dns_validator_t *val) {
 	validator_log(val, ISC_LOG_DEBUG(3), "marking as answer");
-	if (val->event->rdataset)
+	if (val->event->rdataset != NULL)
 		val->event->rdataset->trust = dns_trust_answer;
-	if (val->event->sigrdataset)
+	if (val->event->sigrdataset != NULL)
 		val->event->sigrdataset->trust = dns_trust_answer;
+	if (val->event->message != NULL &&
+	    (val->attributes & VALATTR_AUTHNONPENDING) != 0)
+		auth_nonpending(val->event->message);
 }
 
 static void
@@ -155,6 +216,9 @@ exit_check(dns_validator_t *val) {
 	return (ISC_TRUE);
 }
 
+/*%
+ * Mark pending answers in the authority section as dns_trust_authauthority.
+ */
 static void
 auth_nonpending(dns_message_t *message) {
 	isc_result_t result;
@@ -177,6 +241,10 @@ auth_nonpending(dns_message_t *message) {
 	}
 }
 
+/*%
+ * Look in the NSEC record returned from a DS query to see if there is
+ * a NS RRset at this name.  If it is found we are at a delegation point.
+ */
 static isc_boolean_t
 isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
 	     isc_result_t dbresult)
@@ -210,6 +278,11 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
 	return (found);
 }
 
+/*%
+ * We have been asked to to look for a key.
+ * If found resume the validation process.
+ * If not found fail the validation process.
+ */
 static void
 fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -269,6 +342,11 @@ fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
+/*%
+ * We were asked to look for a DS record as part of following a key chain
+ * upwards.  If found resume the validation process.  If not found fail the
+ * validation process.
+ */
 static void
 dsfetched(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -330,8 +408,16 @@ dsfetched(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
-/*
- * XXX there's too much duplicated code here.
+/*%
+ * We were asked to look for the DS record as part of proving that a
+ * name is unsecure.
+ *
+ * If the DS record doesn't exist and the query name corresponds to
+ * a delegation point we are transitioning from a secure zone to a
+ * unsecure zone.
+ *
+ * If the DS record exists it will be secure.  We can continue looking
+ * for the break point in the chain of trust.
  */
 static void
 dsfetched2(isc_task_t *task, isc_event_t *event) {
@@ -359,7 +445,8 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
 
 	INSIST(val->event != NULL);
 
-	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2");
+	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2: %s",
+		      dns_result_totext(eresult));
 	LOCK(&val->lock);
 	if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NCACHENXRRSET) {
 		/*
@@ -371,9 +458,13 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
 				validator_log(val, ISC_LOG_WARNING,
 					      "must be secure failure");
 				validator_done(val, DNS_R_MUSTBESECURE);
-			} else {
+			} else if (val->view->dlv == NULL || DLVTRIED(val)) {
 				markanswer(val);
 				validator_done(val, ISC_R_SUCCESS);
+			} else {
+				result = startfinddlvsep(val, tname);
+				if (result != DNS_R_WAIT)
+					validator_done(val, result);
 			}
 		} else {
 			result = proveunsecure(val, ISC_TRUE);
@@ -385,7 +476,9 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
 		   eresult == DNS_R_NCACHENXDOMAIN)
 	{
 		/*
-		 * Either there is a DS or this is not a zone cut.  Continue.
+		 * There is a DS which may or may not be a zone cut. 
+		 * In either case we are still in a secure zone resume
+		 * validation.
 		 */
 		result = proveunsecure(val, ISC_TRUE);
 		if (result != DNS_R_WAIT)
@@ -403,6 +496,11 @@ dsfetched2(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
+/*%
+ * Callback from when a DNSKEY RRset has been validated.
+ *
+ * Resumes the stalled validation process.
+ */
 static void
 keyvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -448,6 +546,11 @@ keyvalidated(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
+/*%
+ * Callback when the DS record has been validated.
+ *
+ * Resumes validation of the zone key or the unsecure zone proof.
+ */
 static void
 dsvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -491,10 +594,12 @@ dsvalidated(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
-/*
+/*%
  * Return ISC_R_SUCCESS if we can determine that the name doesn't exist
  * or we can determine whether there is data or not at the name.
  * If the name does not exist return the wildcard name.
+ *
+ * Return ISC_R_IGNORE when the NSEC is not the appropriate one.
  */
 static isc_result_t
 nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname,
@@ -627,7 +732,7 @@ nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname,
 					       wild, NULL);
 		if (result != ISC_R_SUCCESS) {
 			validator_log(val, ISC_LOG_DEBUG(3),
-				    "failure generating wilcard name");
+				    "failure generating wildcard name");
 			return (result);
 		}
 	}
@@ -637,6 +742,13 @@ nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname,
 	return (ISC_R_SUCCESS);
 }
 
+/*%
+ * Callback for when NSEC records have been validated.
+ *
+ * Looks for NOQNAME and NODATA proofs.
+ *
+ * Resumes nsecvalidate.
+ */
 static void
 authvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -715,44 +827,20 @@ authvalidated(isc_task_t *task, isc_event_t *event) {
 	isc_event_free(&event);
 }
 
-static void
-negauthvalidated(isc_task_t *task, isc_event_t *event) {
-	dns_validatorevent_t *devent;
-	dns_validator_t *val;
-	isc_boolean_t want_destroy;
-	isc_result_t eresult;
-
-	UNUSED(task);
-	INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE);
-
-	devent = (dns_validatorevent_t *)event;
-	val = devent->ev_arg;
-	eresult = devent->result;
-	isc_event_free(&event);
-	dns_validator_destroy(&val->subvalidator);
-
-	INSIST(val->event != NULL);
-
-	validator_log(val, ISC_LOG_DEBUG(3), "in negauthvalidated");
-	LOCK(&val->lock);
-	if (eresult == ISC_R_SUCCESS) {
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
-		auth_nonpending(val->event->message);
-		validator_done(val, ISC_R_SUCCESS);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "negauthvalidated: got %s",
-			      isc_result_totext(eresult));
-		validator_done(val, eresult);
-	}
-	want_destroy = exit_check(val);
-	UNLOCK(&val->lock);
-	if (want_destroy)
-		destroy(val);
-}
-
+/*%
+ * Looks for the requested name and type in the view (zones and cache).
+ *
+ * When looking for a DLV record also checks to make sure the NSEC record
+ * returns covers the query name as part of aggressive negative caching.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_NCACHENXDOMAIN
+ * \li	DNS_R_NCACHENXRRSET
+ * \li	DNS_R_NXRRSET
+ * \li	DNS_R_NXDOMAIN
+ */
 static inline isc_result_t
 view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_fixedname_t fixedname;
@@ -855,12 +943,9 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 		dns_rdata_freestruct(&nsec);
 		result = DNS_R_NCACHENXDOMAIN;
 	} else if (result != ISC_R_SUCCESS &&
-                   result != DNS_R_GLUE &&
-                   result != DNS_R_HINT &&
                    result != DNS_R_NCACHENXDOMAIN &&
                    result != DNS_R_NCACHENXRRSET &&
                    result != DNS_R_NXRRSET &&
-                   result != DNS_R_HINTNXRRSET &&
                    result != ISC_R_NOTFOUND) {
 		goto  notfound;
 	}
@@ -874,11 +959,15 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	return (ISC_R_NOTFOUND);
 }
 
+/*%
+ * Checks to make sure we are not going to loop.  As we use a SHARED fetch
+ * the validation process will stall if looping was to occur.
+ */
 static inline isc_boolean_t
 check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_validator_t *parent;
 
-	for (parent = val->parent; parent != NULL; parent = parent->parent) {
+	for (parent = val; parent != NULL; parent = parent->parent) {
 		if (parent->event != NULL &&
 		    parent->event->type == type &&
 		    dns_name_equal(parent->event->name, name))
@@ -892,6 +981,9 @@ check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	return (ISC_FALSE);
 }
 
+/*%
+ * Start a fetch for the requested name and type.
+ */
 static inline isc_result_t
 create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 	     isc_taskaction_t callback, const char *caller)
@@ -914,6 +1006,9 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 					 &val->fetch));
 }
 
+/*%
+ * Start a subvalidation process.
+ */
 static inline isc_result_t
 create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 		 dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
@@ -936,7 +1031,7 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 	return (result);
 }
 
-/*
+/*%
  * Try to find a key that could have signed 'siginfo' among those
  * in 'rdataset'.  If found, build a dst_key_t for it and point
  * val->key at it.
@@ -1004,6 +1099,9 @@ get_dst_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo,
 	return (result);
 }
 
+/*%
+ * Get the key that genertated this signature.
+ */
 static isc_result_t
 get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
 	isc_result_t result;
@@ -1130,7 +1228,7 @@ compute_keytag(dns_rdata_t *rdata, dns_rdata_dnskey_t *key) {
 	return (dst_region_computeid(&r, key->algorithm));
 }
 
-/*
+/*%
  * Is this keyset self-signed?
  */
 static isc_boolean_t
@@ -1172,8 +1270,19 @@ isselfsigned(dns_validator_t *val) {
 	return (ISC_FALSE);
 }
 
+/*%
+ * Attempt to verify the rdataset using the given key and rdata (RRSIG).
+ * The signature was good and from a wildcard record and the QNAME does
+ * not match the wildcard we need to look for a NOQNAME proof.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS if the verification succeeds.
+ * \li	Others if the verification fails.
+ */
 static isc_result_t
-verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata) {
+verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata,
+       isc_uint16_t keyid)
+{
 	isc_result_t result;
 	dns_fixedname_t fixed;
 
@@ -1183,8 +1292,8 @@ verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata) {
 				    key, ISC_FALSE, val->view->mctx, rdata,
 				    dns_fixedname_name(&fixed));
 	validator_log(val, ISC_LOG_DEBUG(3),
-		      "verify rdataset: %s",
-		      isc_result_totext(result));
+		      "verify rdataset (keyid=%u): %s",
+		      keyid, isc_result_totext(result));
 	if (result == DNS_R_FROMWILDCARD) {
 		if (!dns_name_equal(val->event->name,
 				    dns_fixedname_name(&fixed)))
@@ -1194,14 +1303,14 @@ verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata) {
 	return (result);
 }
 
-/*
+/*%
  * Attempts positive response validation of a normal RRset.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validate(dns_validator_t *val, isc_boolean_t resume) {
@@ -1272,7 +1381,8 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
 		}
 
 		do {
-			result = verify(val, val->key, &rdata);
+			result = verify(val, val->key, &rdata,
+					val->siginfo->keyid);
 			if (result == ISC_R_SUCCESS)
 				break;
 			if (val->keynode != NULL) {
@@ -1356,6 +1466,10 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
 	return (DNS_R_NOVALIDSIG);
 }
 
+/*%
+ * Validate the DNSKEY RRset by looking for a DNSKEY that matches a
+ * DLV record and that also verifies the DNSKEY RRset.
+ */
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val) {
 	dns_keytag_t keytag;
@@ -1373,12 +1487,12 @@ dlv_validatezonekey(dns_validator_t *val) {
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
 
 	validator_log(val, ISC_LOG_DEBUG(3), "dlv_validatezonekey");
+
 	/*
 	 * Look through the DLV record and find the keys that can sign the
 	 * key set and the matching signature.  For each such key, attempt
 	 * verification.
 	 */
-
 	supported_algorithm = ISC_FALSE;
 
 	for (result = dns_rdataset_first(&val->dlv);
@@ -1456,7 +1570,7 @@ dlv_validatezonekey(dns_validator_t *val) {
 				 */
 				continue;
 
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1486,14 +1600,14 @@ dlv_validatezonekey(dns_validator_t *val) {
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Attempts positive response validation of an RRset containing zone keys.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validatezonekey(dns_validator_t *val) {
@@ -1505,12 +1619,14 @@ validatezonekey(dns_validator_t *val) {
 	dns_rdata_t keyrdata = DNS_RDATA_INIT;
 	dns_rdata_t sigrdata = DNS_RDATA_INIT;
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
+	char namebuf[DNS_NAME_FORMATSIZE];
 	dns_keytag_t keytag;
 	dns_rdata_ds_t ds;
 	dns_rdata_dnskey_t key;
 	dns_rdata_rrsig_t sig;
 	dst_key_t *dstkey;
 	isc_boolean_t supported_algorithm;
+	isc_boolean_t atsep = ISC_FALSE;
 
 	/*
 	 * Caller must be holding the validator lock.
@@ -1541,9 +1657,13 @@ validatezonekey(dns_validator_t *val) {
 							  sig.algorithm,
 							  sig.keyid,
 							  &keynode);
+			if (result == DNS_R_PARTIALMATCH ||
+			    result == ISC_R_SUCCESS)
+				atsep = ISC_TRUE;
 			while (result == ISC_R_SUCCESS) {
 				dstkey = dns_keynode_key(keynode);
-				result = verify(val, dstkey, &sigrdata);
+				result = verify(val, dstkey, &sigrdata,
+						sig.keyid);
 				if (result == ISC_R_SUCCESS) {
 					dns_keytable_detachkeynode(val->keytable,
 								   &keynode);
@@ -1578,6 +1698,22 @@ validatezonekey(dns_validator_t *val) {
 				return (DNS_R_NOVALIDDS);
 		}
 
+		if (atsep) {
+			/*
+			 * We have not found a key to verify this DNSKEY
+			 * RRset.  As this is a SEP we have to assume that
+			 * the RRset is invalid.
+			 */
+			dns_name_format(val->event->name, namebuf,
+				        sizeof(namebuf));
+			validator_log(val, ISC_LOG_DEBUG(2),
+				      "unable to find a DNSKEY which verifies "
+				      "the DNSKEY RRset and also matches one "
+				      "of specified trusted-keys for '%s'",
+				      namebuf);
+			return (DNS_R_NOVALIDKEY);
+		}
+
 		/*
 		 * Otherwise, try to find the DS record.
 		 */
@@ -1680,6 +1816,9 @@ validatezonekey(dns_validator_t *val) {
 		dns_rdataset_init(&trdataset);
 		dns_rdataset_clone(val->event->rdataset, &trdataset);
 
+		/*
+		 * Look for the KEY that matches the DS record.
+		 */
 		for (result = dns_rdataset_first(&trdataset);
 		     result == ISC_R_SUCCESS;
 		     result = dns_rdataset_next(&trdataset))
@@ -1714,7 +1853,7 @@ validatezonekey(dns_validator_t *val) {
 			dns_rdataset_current(val->event->sigrdataset,
 					     &sigrdata);
 			(void)dns_rdata_tostruct(&sigrdata, &sig, NULL);
-			if (ds.key_tag != sig.keyid &&
+			if (ds.key_tag != sig.keyid ||
 			    ds.algorithm != sig.algorithm)
 				continue;
 
@@ -1728,8 +1867,7 @@ validatezonekey(dns_validator_t *val) {
 				 * This really shouldn't happen, but...
 				 */
 				continue;
-
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1759,14 +1897,14 @@ validatezonekey(dns_validator_t *val) {
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Starts a positive response validation.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 start_positive_validation(dns_validator_t *val) {
@@ -1779,6 +1917,14 @@ start_positive_validation(dns_validator_t *val) {
 	return (validatezonekey(val));
 }
 
+/*%
+ * Look for NODATA at the wildcard and NOWILDCARD proofs in the
+ * previously validated NSEC records.  As these proofs are mutually
+ * exclusive we stop when one is found.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS 
+ */
 static isc_result_t
 checkwildcard(dns_validator_t *val) {
 	dns_name_t *name, *wild;
@@ -1851,6 +1997,18 @@ checkwildcard(dns_validator_t *val) {
 	return (result);
 }
 
+/*%
+ * Prove a negative answer is good or that there is a NOQNAME when the
+ * answer is from a wildcard.
+ *
+ * Loop through the authority section looking for NODATA, NOWILDCARD
+ * and NOQNAME proofs in the NSEC records by calling authvalidated().
+ *
+ * If the required proofs are found we are done.
+ *
+ * If the proofs are not found attempt to prove this is a unsecure
+ * response.
+ */
 static isc_result_t
 nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 	dns_name_t *name;
@@ -1946,7 +2104,8 @@ nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 		return (result);
 
 	/*
-	 * Do we only need to check for NOQNAME?
+	 * Do we only need to check for NOQNAME?  To get here we must have
+	 * had a secure wildcard answer.
 	 */
 	if ((val->attributes & VALATTR_NEEDNODATA) == 0 &&
 	    (val->attributes & VALATTR_NEEDNOWILDCARD) == 0 &&
@@ -1982,28 +2141,17 @@ nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 	    ((val->attributes & VALATTR_NEEDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_FOUNDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_NEEDNOWILDCARD) != 0 &&
-	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0))
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-
-	if ((val->attributes & VALATTR_FOUNDNONEXISTENCE) == 0) {
-		if (!val->seensig && val->soaset != NULL) {
-			result = create_validator(val, val->soaname,
-						  dns_rdatatype_soa,
-						  val->soaset, NULL,
-						  negauthvalidated,
-						  "nsecvalidate");
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			return (DNS_R_WAIT);
-		}
+	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0)) {
 		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof not found");
-		return (DNS_R_NOVALIDNSEC);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
+			      "nonexistence proof(s) found");
 		return (ISC_R_SUCCESS);
 	}
+
+	validator_log(val, ISC_LOG_DEBUG(3),
+		      "nonexistence proof(s) not found");
+	val->attributes |= VALATTR_AUTHNONPENDING;
+	val->attributes |= VALATTR_INSECURITY;
+	return (proveunsecure(val, ISC_FALSE));
 }
 
 static isc_boolean_t
@@ -2029,6 +2177,11 @@ check_ds(dns_validator_t *val, dns_name_t *name, dns_rdataset_t *rdataset) {
 	return (ISC_FALSE);
 }
 
+/*%
+ * Callback from fetching a DLV record.
+ * 
+ * Resumes the DLV lookup process.
+ */
 static void
 dlvfetched(isc_task_t *task, isc_event_t *event) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2065,9 +2218,7 @@ dlvfetched(isc_task_t *task, isc_event_t *event) {
 		dns_rdataset_clone(&val->frdataset, &val->dlv);
 		val->havedlvsep = ISC_TRUE;
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-		result = dlv_validator_start(val);
-		if (result != DNS_R_WAIT)
-			validator_done(val, result);
+		dlv_validator_start(val);
 	} else if (eresult == DNS_R_NXRRSET ||
 		   eresult == DNS_R_NXDOMAIN ||
 		   eresult == DNS_R_NCACHENXRRSET ||
@@ -2078,9 +2229,7 @@ dlvfetched(isc_task_t *task, isc_event_t *event) {
 					namebuf, sizeof(namebuf));
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
 				      namebuf);
-			result = dlv_validator_start(val);
-			if (result != DNS_R_WAIT)
-				validator_done(val, result);
+			dlv_validator_start(val);
 		} else if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV not found");
 			markanswer(val);
@@ -2094,6 +2243,7 @@ dlvfetched(isc_task_t *task, isc_event_t *event) {
 	} else {
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV lookup: %s",
 			      dns_result_totext(eresult));
+		validator_done(val, eresult);
 	}
 	want_destroy = exit_check(val);
 	UNLOCK(&val->lock);
@@ -2101,6 +2251,14 @@ dlvfetched(isc_task_t *task, isc_event_t *event) {
 		destroy(val);
 }
 
+/*%
+ * Start the DLV lookup proccess.
+ * 
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failures.
+ */
 static isc_result_t
 startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2135,9 +2293,19 @@ startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure) {
 	dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf,
 			sizeof(namebuf));
 	validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-	return (dlv_validator_start(val));
+	dlv_validator_start(val);
+	return (DNS_R_WAIT);
 }
 
+/*%
+ * Continue the DLV lookup process.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failure.
+ */
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2147,7 +2315,7 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
 	dns_name_t noroot;
 	isc_result_t result;
 	unsigned int labels;
-		
+
 	INSIST(val->view->dlv != NULL);
 
 	if (!resume) {
@@ -2231,11 +2399,24 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
 	return (ISC_R_NOTFOUND);
 }
 
-/*
+/*%
  * proveunsecure walks down from the SEP looking for a break in the
- * chain of trust.   That occurs when we can prove the DS record does
+ * chain of trust.  That occurs when we can prove the DS record does
  * not exist at a delegation point or the DS exists at a delegation
  * but we don't support the algorithm/digest.
+ *
+ * If DLV is active and we look for a DLV record at or below the
+ * point we go insecure.  If found we restart the validation process.
+ * If not found or DLV isn't active we mark the response as a answer.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS		val->event->name is in a unsecure zone
+ * \li	DNS_R_WAIT		validation is in progress.
+ * \li	DNS_R_MUSTBESECURE	val->event->name is supposed to be secure
+ *				(policy) but we proved that it is unsecure.
+ * \li	DNS_R_NOVALIDSIG
+ * \li	DNS_R_NOVALIDNSEC
+ * \li	DNS_R_NOTINSECURE
  */
 static isc_result_t
 proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
@@ -2253,7 +2434,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
 		result = dns_keytable_finddeepestmatch(val->keytable,
 						       val->event->name,
 						       secroot);
-
+	
 		if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3),
 				      "not beneath secure root");
@@ -2395,8 +2576,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
 				goto out;
 			return (DNS_R_WAIT);
 		} else if (result == DNS_R_NXDOMAIN ||
-			   result == DNS_R_NCACHENXDOMAIN)
-		{
+			   result == DNS_R_NCACHENXDOMAIN) {
 			/*
 			 * This is not a zone cut.  Assuming things are
 			 * as expected, continue.
@@ -2441,7 +2621,10 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
 	return (result);
 }
 
-static isc_result_t
+/*%
+ * Reset state and revalidate the answer using DLV.
+ */
+static void
 dlv_validator_start(dns_validator_t *val) {
 	isc_event_t *event;
 
@@ -2455,9 +2638,20 @@ dlv_validator_start(dns_validator_t *val) {
 
 	event = (isc_event_t *)val->event;
 	isc_task_send(val->task, &event);
-	return (DNS_R_WAIT);
 }
 
+/*%
+ * Start the validation process.
+ *
+ * Attempt to valididate the answer based on the category it appears to
+ * fall in.
+ * \li	1. secure positive answer.
+ * \li	2. unsecure positive answer.
+ * \li	3. a negative answer (secure or unsecure).
+ *
+ * Note a answer that appears to be a secure positive answer may actually
+ * be a unsecure positive answer.
+ */
 static void
 validator_start(isc_task_t *task, isc_event_t *event) {
 	dns_validator_t *val;
@@ -2529,7 +2723,6 @@ validator_start(isc_task_t *task, isc_event_t *event) {
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting negative response validation");
 
-		val->attributes |= VALATTR_NEGATIVE;
 		if (val->event->message->rcode == dns_rcode_nxdomain) {
 			val->attributes |= VALATTR_NEEDNOQNAME;
 			val->attributes |= VALATTR_NEEDNOWILDCARD;
@@ -2640,7 +2833,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
 
  cleanup_event:
 	isc_task_detach(&tclone);
-	isc_event_free((isc_event_t **)&val->event);
+	isc_event_free(ISC_EVENT_PTR(&event));
 
  cleanup_val:
 	dns_view_weakdetach(&val->view);
diff --git a/lib/dns/win32/gen.dsp b/lib/dns/win32/gen.dsp
index 1d0fc34e..a176787a 100644
--- a/lib/dns/win32/gen.dsp
+++ b/lib/dns/win32/gen.dsp
@@ -1,107 +1,107 @@
-# Microsoft Developer Studio Project File - Name="gen" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=gen - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "gen.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "gen - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../gen.exe"

-

-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR /FD /GZ /c

-# SUBTRACT CPP /X /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "gen - Win32 Release"

-# Name "gen - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\gen.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE="..\gen-win32.h"

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="gen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=gen - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gen.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../gen.exe"
+
+!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gen - Win32 Release"
+# Name "gen - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\gen.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="..\gen-win32.h"
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/lib/dns/win32/gen.dsw b/lib/dns/win32/gen.dsw
index e44f5893..e4c143cc 100644
--- a/lib/dns/win32/gen.dsw
+++ b/lib/dns/win32/gen.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "gen"=".\gen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "gen"=".\gen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/dns/win32/gen.mak b/lib/dns/win32/gen.mak
index 09f67883..35044e54 100644
--- a/lib/dns/win32/gen.mak
+++ b/lib/dns/win32/gen.mak
@@ -1,170 +1,170 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on gen.dsp

-!IF "$(CFG)" == ""

-CFG=gen - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to gen - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "gen - Win32 Release" && "$(CFG)" != "gen - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "gen - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\gen.exe"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\gen.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "..\gen.exe"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\gen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gen.pdb" /machine:I386 /out:"../gen.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\gen.obj"

-

-"..\gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\gen.exe" "$(OUTDIR)\gen.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\gen.obj"

-	-@erase "$(INTDIR)\gen.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\gen.bsc"

-	-@erase "$(OUTDIR)\gen.pdb"

-	-@erase "..\gen.exe"

-	-@erase "..\gen.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\gen.sbr"

-

-"$(OUTDIR)\gen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gen.pdb" /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\gen.obj"

-

-"..\gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("gen.dep")

-!INCLUDE "gen.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "gen.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "gen - Win32 Release" || "$(CFG)" == "gen - Win32 Debug"

-SOURCE=..\gen.c

-

-!IF  "$(CFG)" == "gen - Win32 Release"

-

-

-"$(INTDIR)\gen.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"

-

-

-"$(INTDIR)\gen.obj"	"$(INTDIR)\gen.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on gen.dsp
+!IF "$(CFG)" == ""
+CFG=gen - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to gen - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "gen - Win32 Release" && "$(CFG)" != "gen - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gen - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\gen.exe"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\gen.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\gen.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\gen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gen.pdb" /machine:I386 /out:"../gen.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\gen.obj"
+
+"..\gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\gen.exe" "$(OUTDIR)\gen.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\gen.obj"
+	-@erase "$(INTDIR)\gen.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\gen.bsc"
+	-@erase "$(OUTDIR)\gen.pdb"
+	-@erase "..\gen.exe"
+	-@erase "..\gen.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\gen.sbr"
+
+"$(OUTDIR)\gen.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gen.pdb" /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\gen.obj"
+
+"..\gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("gen.dep")
+!INCLUDE "gen.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "gen.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "gen - Win32 Release" || "$(CFG)" == "gen - Win32 Debug"
+SOURCE=..\gen.c
+
+!IF  "$(CFG)" == "gen - Win32 Release"
+
+
+"$(INTDIR)\gen.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+
+
+"$(INTDIR)\gen.obj"	"$(INTDIR)\gen.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index d4c8027c..8bde3f0e 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -237,6 +237,7 @@ dns_message_renderreset
 dns_message_firstname
 dns_message_nextname
 dns_message_currentname
+dns_message_find
 dns_message_findname
 dns_message_findtype
 dns_message_movename
diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp
index bb8185d7..fef4f592 100644
--- a/lib/dns/win32/libdns.dsp
+++ b/lib/dns/win32/libdns.dsp
@@ -1,693 +1,693 @@
-# Microsoft Developer Studio Project File - Name="libdns" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libdns - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libdns.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libdns - Win32 Release"

-# Name "libdns - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\dns\acl.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\adb.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\bit.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\byaddr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\cache.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\callbacks.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\cert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\code.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\compress.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\db.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\dbiterator.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\dbtable.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\diff.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\dispatch.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\dnssec.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\ds.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\enumclass.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\enumtype.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\events.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\fixedname.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\forward.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\journal.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\keyflags.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\keytable.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\keyvalues.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\lib.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\log.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\lookup.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\master.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\masterdump.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\message.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\name.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\ncache.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\nsec.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\order.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\peer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\portlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rbt.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\rbtdb.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\rbtdb64.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rcode.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdata.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdataclass.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdatalist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdataset.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdatasetiter.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdataslab.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdatastruct.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rdatatype.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\request.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\resolver.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\result.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\rootns.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\sdb.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\secalg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\secproto.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\soa.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\ssu.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\stats.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\tcpmsg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\time.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\timer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\tkey.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\tsig.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\ttl.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\validator.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\version.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\view.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\xfrin.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\zone.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\zonekey.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\dns\zt.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Group "Main Dns Lib"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=..\acl.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\adb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\byaddr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\cache.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\callbacks.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\compress.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\db.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dbiterator.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dbtable.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\diff.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dispatch.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\DLLMain.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dnssec.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ds.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\forward.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\journal.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\keytable.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\log.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lookup.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\master.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\masterdump.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\message.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\name.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ncache.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\nsec.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\order.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\peer.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\portlist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rbt.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rbtdb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rbtdb64.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rcode.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rdata.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rdatalist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rdataset.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rdatasetiter.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rdataslab.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\request.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\resolver.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\result.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\rootns.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\sdb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\soa.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ssu.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\stats.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\tcpmsg.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\time.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\timer.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\tkey.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\tsig.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ttl.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\validator.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\view.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\xfrin.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\zone.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\zonekey.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\zt.c

-# End Source File

-# End Group

-# Begin Group "dst"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=..\dst_api.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dst_lib.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dst_parse.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\dst_result.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\gssapi_link.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\gssapictx.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\hmac_link.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\key.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\openssl_link.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\openssldh_link.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\openssldsa_link.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\opensslrsa_link.c

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\libdns.def

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="libdns" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libdns - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libdns.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libdns - Win32 Release"
+# Name "libdns - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\dns\acl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\adb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\bit.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\byaddr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\callbacks.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\cert.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\code.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\compress.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\db.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\dbiterator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\dbtable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\diff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\dispatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\dnssec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\ds.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\enumclass.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\enumtype.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\events.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\fixedname.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\forward.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\journal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\keyflags.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\keytable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\keyvalues.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\lookup.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\master.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\masterdump.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\name.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\ncache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\nsec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\order.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\peer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\portlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\rbtdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\rbtdb64.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rcode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdataclass.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdatalist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdataset.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdatasetiter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdataslab.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdatastruct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rdatatype.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\request.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\resolver.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\result.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\rootns.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\sdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\secalg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\secproto.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\soa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\ssu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\stats.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\tcpmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\time.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\timer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\tkey.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\tsig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\ttl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\validator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\version.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\view.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\xfrin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\zone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\zonekey.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\dns\zt.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Group "Main Dns Lib"
+
+# PROP Default_Filter "c"
+# Begin Source File
+
+SOURCE=..\acl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\adb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\byaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\callbacks.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dbiterator.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dbtable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\diff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dispatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dnssec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ds.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\forward.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\journal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\keytable.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lookup.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\master.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\masterdump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\message.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\name.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ncache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\nsec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\order.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\peer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\portlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rbt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rbtdb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rbtdb64.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rdatalist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rdataset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rdatasetiter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rdataslab.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\request.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\resolver.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\result.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\rootns.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sdb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\soa.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ssu.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\stats.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\tcpmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\timer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\tkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\tsig.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ttl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\validator.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\view.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\xfrin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\zone.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\zonekey.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\zt.c
+# End Source File
+# End Group
+# Begin Group "dst"
+
+# PROP Default_Filter "c"
+# Begin Source File
+
+SOURCE=..\dst_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dst_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dst_parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dst_result.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\gssapi_link.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\gssapictx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\hmac_link.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\key.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\openssl_link.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\openssldh_link.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\openssldsa_link.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\opensslrsa_link.c
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\libdns.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/dns/win32/libdns.dsw b/lib/dns/win32/libdns.dsw
index 424a2cbb..c1685a0e 100644
--- a/lib/dns/win32/libdns.dsw
+++ b/lib/dns/win32/libdns.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libdns"=".\libdns.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libdns"=".\libdns.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index a9d61976..caee8ee8 100644
--- a/lib/dns/win32/libdns.mak
+++ b/lib/dns/win32/libdns.mak
@@ -1,1949 +1,1949 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libdns.dsp

-!IF "$(CFG)" == ""

-CFG=libdns - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to libdns - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "libdns - Win32 Release" && "$(CFG)" != "libdns - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\libdns.dll"

-

-!ELSE 

-

-ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libdns.dll"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\acl.obj"

-	-@erase "$(INTDIR)\adb.obj"

-	-@erase "$(INTDIR)\byaddr.obj"

-	-@erase "$(INTDIR)\cache.obj"

-	-@erase "$(INTDIR)\callbacks.obj"

-	-@erase "$(INTDIR)\compress.obj"

-	-@erase "$(INTDIR)\db.obj"

-	-@erase "$(INTDIR)\dbiterator.obj"

-	-@erase "$(INTDIR)\dbtable.obj"

-	-@erase "$(INTDIR)\diff.obj"

-	-@erase "$(INTDIR)\dispatch.obj"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\dnssec.obj"

-	-@erase "$(INTDIR)\ds.obj"

-	-@erase "$(INTDIR)\dst_api.obj"

-	-@erase "$(INTDIR)\dst_lib.obj"

-	-@erase "$(INTDIR)\dst_parse.obj"

-	-@erase "$(INTDIR)\dst_result.obj"

-	-@erase "$(INTDIR)\forward.obj"

-	-@erase "$(INTDIR)\gssapi_link.obj"

-	-@erase "$(INTDIR)\gssapictx.obj"

-	-@erase "$(INTDIR)\hmac_link.obj"

-	-@erase "$(INTDIR)\journal.obj"

-	-@erase "$(INTDIR)\key.obj"

-	-@erase "$(INTDIR)\keytable.obj"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\lookup.obj"

-	-@erase "$(INTDIR)\master.obj"

-	-@erase "$(INTDIR)\masterdump.obj"

-	-@erase "$(INTDIR)\message.obj"

-	-@erase "$(INTDIR)\name.obj"

-	-@erase "$(INTDIR)\ncache.obj"

-	-@erase "$(INTDIR)\nsec.obj"

-	-@erase "$(INTDIR)\openssl_link.obj"

-	-@erase "$(INTDIR)\openssldh_link.obj"

-	-@erase "$(INTDIR)\openssldsa_link.obj"

-	-@erase "$(INTDIR)\opensslrsa_link.obj"

-	-@erase "$(INTDIR)\order.obj"

-	-@erase "$(INTDIR)\peer.obj"

-	-@erase "$(INTDIR)\portlist.obj"

-	-@erase "$(INTDIR)\rbt.obj"

-	-@erase "$(INTDIR)\rbtdb.obj"

-	-@erase "$(INTDIR)\rbtdb64.obj"

-	-@erase "$(INTDIR)\rcode.obj"

-	-@erase "$(INTDIR)\rdata.obj"

-	-@erase "$(INTDIR)\rdatalist.obj"

-	-@erase "$(INTDIR)\rdataset.obj"

-	-@erase "$(INTDIR)\rdatasetiter.obj"

-	-@erase "$(INTDIR)\rdataslab.obj"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\resolver.obj"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\rootns.obj"

-	-@erase "$(INTDIR)\sdb.obj"

-	-@erase "$(INTDIR)\soa.obj"

-	-@erase "$(INTDIR)\ssu.obj"

-	-@erase "$(INTDIR)\stats.obj"

-	-@erase "$(INTDIR)\tcpmsg.obj"

-	-@erase "$(INTDIR)\time.obj"

-	-@erase "$(INTDIR)\timer.obj"

-	-@erase "$(INTDIR)\tkey.obj"

-	-@erase "$(INTDIR)\tsig.obj"

-	-@erase "$(INTDIR)\ttl.obj"

-	-@erase "$(INTDIR)\validator.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\view.obj"

-	-@erase "$(INTDIR)\xfrin.obj"

-	-@erase "$(INTDIR)\zone.obj"

-	-@erase "$(INTDIR)\zonekey.obj"

-	-@erase "$(INTDIR)\zt.obj"

-	-@erase "$(OUTDIR)\libdns.exp"

-	-@erase "$(OUTDIR)\libdns.lib"

-	-@erase "..\..\..\Build\Release\libdns.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 

-DEF_FILE= \

-	".\libdns.def"

-LINK32_OBJS= \

-	"$(INTDIR)\acl.obj" \

-	"$(INTDIR)\adb.obj" \

-	"$(INTDIR)\byaddr.obj" \

-	"$(INTDIR)\cache.obj" \

-	"$(INTDIR)\callbacks.obj" \

-	"$(INTDIR)\compress.obj" \

-	"$(INTDIR)\db.obj" \

-	"$(INTDIR)\dbiterator.obj" \

-	"$(INTDIR)\dbtable.obj" \

-	"$(INTDIR)\diff.obj" \

-	"$(INTDIR)\dispatch.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\dnssec.obj" \

-	"$(INTDIR)\ds.obj" \

-	"$(INTDIR)\forward.obj" \

-	"$(INTDIR)\journal.obj" \

-	"$(INTDIR)\keytable.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\lookup.obj" \

-	"$(INTDIR)\master.obj" \

-	"$(INTDIR)\masterdump.obj" \

-	"$(INTDIR)\message.obj" \

-	"$(INTDIR)\name.obj" \

-	"$(INTDIR)\ncache.obj" \

-	"$(INTDIR)\nsec.obj" \

-	"$(INTDIR)\order.obj" \

-	"$(INTDIR)\peer.obj" \

-	"$(INTDIR)\portlist.obj" \

-	"$(INTDIR)\rbt.obj" \

-	"$(INTDIR)\rbtdb.obj" \

-	"$(INTDIR)\rbtdb64.obj" \

-	"$(INTDIR)\rcode.obj" \

-	"$(INTDIR)\rdata.obj" \

-	"$(INTDIR)\rdatalist.obj" \

-	"$(INTDIR)\rdataset.obj" \

-	"$(INTDIR)\rdatasetiter.obj" \

-	"$(INTDIR)\rdataslab.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\resolver.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\rootns.obj" \

-	"$(INTDIR)\sdb.obj" \

-	"$(INTDIR)\soa.obj" \

-	"$(INTDIR)\ssu.obj" \

-	"$(INTDIR)\stats.obj" \

-	"$(INTDIR)\tcpmsg.obj" \

-	"$(INTDIR)\time.obj" \

-	"$(INTDIR)\timer.obj" \

-	"$(INTDIR)\tkey.obj" \

-	"$(INTDIR)\tsig.obj" \

-	"$(INTDIR)\ttl.obj" \

-	"$(INTDIR)\validator.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\view.obj" \

-	"$(INTDIR)\xfrin.obj" \

-	"$(INTDIR)\zone.obj" \

-	"$(INTDIR)\zonekey.obj" \

-	"$(INTDIR)\zt.obj" \

-	"$(INTDIR)\dst_api.obj" \

-	"$(INTDIR)\dst_lib.obj" \

-	"$(INTDIR)\dst_parse.obj" \

-	"$(INTDIR)\dst_result.obj" \

-	"$(INTDIR)\gssapi_link.obj" \

-	"$(INTDIR)\gssapictx.obj" \

-	"$(INTDIR)\hmac_link.obj" \

-	"$(INTDIR)\key.obj" \

-	"$(INTDIR)\openssl_link.obj" \

-	"$(INTDIR)\openssldh_link.obj" \

-	"$(INTDIR)\openssldsa_link.obj" \

-	"$(INTDIR)\opensslrsa_link.obj" \

-	"..\..\isc\win32\Release\libisc.lib"

-

-"..\..\..\Build\Release\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"

-

-!ELSE 

-

-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\acl.obj"

-	-@erase "$(INTDIR)\acl.sbr"

-	-@erase "$(INTDIR)\adb.obj"

-	-@erase "$(INTDIR)\adb.sbr"

-	-@erase "$(INTDIR)\byaddr.obj"

-	-@erase "$(INTDIR)\byaddr.sbr"

-	-@erase "$(INTDIR)\cache.obj"

-	-@erase "$(INTDIR)\cache.sbr"

-	-@erase "$(INTDIR)\callbacks.obj"

-	-@erase "$(INTDIR)\callbacks.sbr"

-	-@erase "$(INTDIR)\compress.obj"

-	-@erase "$(INTDIR)\compress.sbr"

-	-@erase "$(INTDIR)\db.obj"

-	-@erase "$(INTDIR)\db.sbr"

-	-@erase "$(INTDIR)\dbiterator.obj"

-	-@erase "$(INTDIR)\dbiterator.sbr"

-	-@erase "$(INTDIR)\dbtable.obj"

-	-@erase "$(INTDIR)\dbtable.sbr"

-	-@erase "$(INTDIR)\diff.obj"

-	-@erase "$(INTDIR)\diff.sbr"

-	-@erase "$(INTDIR)\dispatch.obj"

-	-@erase "$(INTDIR)\dispatch.sbr"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\dnssec.obj"

-	-@erase "$(INTDIR)\dnssec.sbr"

-	-@erase "$(INTDIR)\ds.obj"

-	-@erase "$(INTDIR)\ds.sbr"

-	-@erase "$(INTDIR)\dst_api.obj"

-	-@erase "$(INTDIR)\dst_api.sbr"

-	-@erase "$(INTDIR)\dst_lib.obj"

-	-@erase "$(INTDIR)\dst_lib.sbr"

-	-@erase "$(INTDIR)\dst_parse.obj"

-	-@erase "$(INTDIR)\dst_parse.sbr"

-	-@erase "$(INTDIR)\dst_result.obj"

-	-@erase "$(INTDIR)\dst_result.sbr"

-	-@erase "$(INTDIR)\forward.obj"

-	-@erase "$(INTDIR)\forward.sbr"

-	-@erase "$(INTDIR)\gssapi_link.obj"

-	-@erase "$(INTDIR)\gssapi_link.sbr"

-	-@erase "$(INTDIR)\gssapictx.obj"

-	-@erase "$(INTDIR)\gssapictx.sbr"

-	-@erase "$(INTDIR)\hmac_link.obj"

-	-@erase "$(INTDIR)\hmac_link.sbr"

-	-@erase "$(INTDIR)\journal.obj"

-	-@erase "$(INTDIR)\journal.sbr"

-	-@erase "$(INTDIR)\key.obj"

-	-@erase "$(INTDIR)\key.sbr"

-	-@erase "$(INTDIR)\keytable.obj"

-	-@erase "$(INTDIR)\keytable.sbr"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\lib.sbr"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\log.sbr"

-	-@erase "$(INTDIR)\lookup.obj"

-	-@erase "$(INTDIR)\lookup.sbr"

-	-@erase "$(INTDIR)\master.obj"

-	-@erase "$(INTDIR)\master.sbr"

-	-@erase "$(INTDIR)\masterdump.obj"

-	-@erase "$(INTDIR)\masterdump.sbr"

-	-@erase "$(INTDIR)\message.obj"

-	-@erase "$(INTDIR)\message.sbr"

-	-@erase "$(INTDIR)\name.obj"

-	-@erase "$(INTDIR)\name.sbr"

-	-@erase "$(INTDIR)\ncache.obj"

-	-@erase "$(INTDIR)\ncache.sbr"

-	-@erase "$(INTDIR)\nsec.obj"

-	-@erase "$(INTDIR)\nsec.sbr"

-	-@erase "$(INTDIR)\openssl_link.obj"

-	-@erase "$(INTDIR)\openssl_link.sbr"

-	-@erase "$(INTDIR)\openssldh_link.obj"

-	-@erase "$(INTDIR)\openssldh_link.sbr"

-	-@erase "$(INTDIR)\openssldsa_link.obj"

-	-@erase "$(INTDIR)\openssldsa_link.sbr"

-	-@erase "$(INTDIR)\opensslrsa_link.obj"

-	-@erase "$(INTDIR)\opensslrsa_link.sbr"

-	-@erase "$(INTDIR)\order.obj"

-	-@erase "$(INTDIR)\order.sbr"

-	-@erase "$(INTDIR)\peer.obj"

-	-@erase "$(INTDIR)\peer.sbr"

-	-@erase "$(INTDIR)\portlist.obj"

-	-@erase "$(INTDIR)\portlist.sbr"

-	-@erase "$(INTDIR)\rbt.obj"

-	-@erase "$(INTDIR)\rbt.sbr"

-	-@erase "$(INTDIR)\rbtdb.obj"

-	-@erase "$(INTDIR)\rbtdb.sbr"

-	-@erase "$(INTDIR)\rbtdb64.obj"

-	-@erase "$(INTDIR)\rbtdb64.sbr"

-	-@erase "$(INTDIR)\rcode.obj"

-	-@erase "$(INTDIR)\rcode.sbr"

-	-@erase "$(INTDIR)\rdata.obj"

-	-@erase "$(INTDIR)\rdata.sbr"

-	-@erase "$(INTDIR)\rdatalist.obj"

-	-@erase "$(INTDIR)\rdatalist.sbr"

-	-@erase "$(INTDIR)\rdataset.obj"

-	-@erase "$(INTDIR)\rdataset.sbr"

-	-@erase "$(INTDIR)\rdatasetiter.obj"

-	-@erase "$(INTDIR)\rdatasetiter.sbr"

-	-@erase "$(INTDIR)\rdataslab.obj"

-	-@erase "$(INTDIR)\rdataslab.sbr"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\request.sbr"

-	-@erase "$(INTDIR)\resolver.obj"

-	-@erase "$(INTDIR)\resolver.sbr"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\result.sbr"

-	-@erase "$(INTDIR)\rootns.obj"

-	-@erase "$(INTDIR)\rootns.sbr"

-	-@erase "$(INTDIR)\sdb.obj"

-	-@erase "$(INTDIR)\sdb.sbr"

-	-@erase "$(INTDIR)\soa.obj"

-	-@erase "$(INTDIR)\soa.sbr"

-	-@erase "$(INTDIR)\ssu.obj"

-	-@erase "$(INTDIR)\ssu.sbr"

-	-@erase "$(INTDIR)\stats.obj"

-	-@erase "$(INTDIR)\stats.sbr"

-	-@erase "$(INTDIR)\tcpmsg.obj"

-	-@erase "$(INTDIR)\tcpmsg.sbr"

-	-@erase "$(INTDIR)\time.obj"

-	-@erase "$(INTDIR)\time.sbr"

-	-@erase "$(INTDIR)\timer.obj"

-	-@erase "$(INTDIR)\timer.sbr"

-	-@erase "$(INTDIR)\tkey.obj"

-	-@erase "$(INTDIR)\tkey.sbr"

-	-@erase "$(INTDIR)\tsig.obj"

-	-@erase "$(INTDIR)\tsig.sbr"

-	-@erase "$(INTDIR)\ttl.obj"

-	-@erase "$(INTDIR)\ttl.sbr"

-	-@erase "$(INTDIR)\validator.obj"

-	-@erase "$(INTDIR)\validator.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(INTDIR)\view.obj"

-	-@erase "$(INTDIR)\view.sbr"

-	-@erase "$(INTDIR)\xfrin.obj"

-	-@erase "$(INTDIR)\xfrin.sbr"

-	-@erase "$(INTDIR)\zone.obj"

-	-@erase "$(INTDIR)\zone.sbr"

-	-@erase "$(INTDIR)\zonekey.obj"

-	-@erase "$(INTDIR)\zonekey.sbr"

-	-@erase "$(INTDIR)\zt.obj"

-	-@erase "$(INTDIR)\zt.sbr"

-	-@erase "$(OUTDIR)\libdns.bsc"

-	-@erase "$(OUTDIR)\libdns.exp"

-	-@erase "$(OUTDIR)\libdns.lib"

-	-@erase "$(OUTDIR)\libdns.map"

-	-@erase "$(OUTDIR)\libdns.pdb"

-	-@erase "..\..\..\Build\Debug\libdns.dll"

-	-@erase "..\..\..\Build\Debug\libdns.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\acl.sbr" \

-	"$(INTDIR)\adb.sbr" \

-	"$(INTDIR)\byaddr.sbr" \

-	"$(INTDIR)\cache.sbr" \

-	"$(INTDIR)\callbacks.sbr" \

-	"$(INTDIR)\compress.sbr" \

-	"$(INTDIR)\db.sbr" \

-	"$(INTDIR)\dbiterator.sbr" \

-	"$(INTDIR)\dbtable.sbr" \

-	"$(INTDIR)\diff.sbr" \

-	"$(INTDIR)\dispatch.sbr" \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\dnssec.sbr" \

-	"$(INTDIR)\ds.sbr" \

-	"$(INTDIR)\forward.sbr" \

-	"$(INTDIR)\journal.sbr" \

-	"$(INTDIR)\keytable.sbr" \

-	"$(INTDIR)\lib.sbr" \

-	"$(INTDIR)\log.sbr" \

-	"$(INTDIR)\lookup.sbr" \

-	"$(INTDIR)\master.sbr" \

-	"$(INTDIR)\masterdump.sbr" \

-	"$(INTDIR)\message.sbr" \

-	"$(INTDIR)\name.sbr" \

-	"$(INTDIR)\ncache.sbr" \

-	"$(INTDIR)\nsec.sbr" \

-	"$(INTDIR)\order.sbr" \

-	"$(INTDIR)\peer.sbr" \

-	"$(INTDIR)\portlist.sbr" \

-	"$(INTDIR)\rbt.sbr" \

-	"$(INTDIR)\rbtdb.sbr" \

-	"$(INTDIR)\rbtdb64.sbr" \

-	"$(INTDIR)\rcode.sbr" \

-	"$(INTDIR)\rdata.sbr" \

-	"$(INTDIR)\rdatalist.sbr" \

-	"$(INTDIR)\rdataset.sbr" \

-	"$(INTDIR)\rdatasetiter.sbr" \

-	"$(INTDIR)\rdataslab.sbr" \

-	"$(INTDIR)\request.sbr" \

-	"$(INTDIR)\resolver.sbr" \

-	"$(INTDIR)\result.sbr" \

-	"$(INTDIR)\rootns.sbr" \

-	"$(INTDIR)\sdb.sbr" \

-	"$(INTDIR)\soa.sbr" \

-	"$(INTDIR)\ssu.sbr" \

-	"$(INTDIR)\stats.sbr" \

-	"$(INTDIR)\tcpmsg.sbr" \

-	"$(INTDIR)\time.sbr" \

-	"$(INTDIR)\timer.sbr" \

-	"$(INTDIR)\tkey.sbr" \

-	"$(INTDIR)\tsig.sbr" \

-	"$(INTDIR)\ttl.sbr" \

-	"$(INTDIR)\validator.sbr" \

-	"$(INTDIR)\version.sbr" \

-	"$(INTDIR)\view.sbr" \

-	"$(INTDIR)\xfrin.sbr" \

-	"$(INTDIR)\zone.sbr" \

-	"$(INTDIR)\zonekey.sbr" \

-	"$(INTDIR)\zt.sbr" \

-	"$(INTDIR)\dst_api.sbr" \

-	"$(INTDIR)\dst_lib.sbr" \

-	"$(INTDIR)\dst_parse.sbr" \

-	"$(INTDIR)\dst_result.sbr" \

-	"$(INTDIR)\gssapi_link.sbr" \

-	"$(INTDIR)\gssapictx.sbr" \

-	"$(INTDIR)\hmac_link.sbr" \

-	"$(INTDIR)\key.sbr" \

-	"$(INTDIR)\openssl_link.sbr" \

-	"$(INTDIR)\openssldh_link.sbr" \

-	"$(INTDIR)\openssldsa_link.sbr" \

-	"$(INTDIR)\opensslrsa_link.sbr"

-

-"$(OUTDIR)\libdns.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\libdns.def"

-LINK32_OBJS= \

-	"$(INTDIR)\acl.obj" \

-	"$(INTDIR)\adb.obj" \

-	"$(INTDIR)\byaddr.obj" \

-	"$(INTDIR)\cache.obj" \

-	"$(INTDIR)\callbacks.obj" \

-	"$(INTDIR)\compress.obj" \

-	"$(INTDIR)\db.obj" \

-	"$(INTDIR)\dbiterator.obj" \

-	"$(INTDIR)\dbtable.obj" \

-	"$(INTDIR)\diff.obj" \

-	"$(INTDIR)\dispatch.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\dnssec.obj" \

-	"$(INTDIR)\ds.obj" \

-	"$(INTDIR)\forward.obj" \

-	"$(INTDIR)\journal.obj" \

-	"$(INTDIR)\keytable.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\lookup.obj" \

-	"$(INTDIR)\master.obj" \

-	"$(INTDIR)\masterdump.obj" \

-	"$(INTDIR)\message.obj" \

-	"$(INTDIR)\name.obj" \

-	"$(INTDIR)\ncache.obj" \

-	"$(INTDIR)\nsec.obj" \

-	"$(INTDIR)\order.obj" \

-	"$(INTDIR)\peer.obj" \

-	"$(INTDIR)\portlist.obj" \

-	"$(INTDIR)\rbt.obj" \

-	"$(INTDIR)\rbtdb.obj" \

-	"$(INTDIR)\rbtdb64.obj" \

-	"$(INTDIR)\rcode.obj" \

-	"$(INTDIR)\rdata.obj" \

-	"$(INTDIR)\rdatalist.obj" \

-	"$(INTDIR)\rdataset.obj" \

-	"$(INTDIR)\rdatasetiter.obj" \

-	"$(INTDIR)\rdataslab.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\resolver.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\rootns.obj" \

-	"$(INTDIR)\sdb.obj" \

-	"$(INTDIR)\soa.obj" \

-	"$(INTDIR)\ssu.obj" \

-	"$(INTDIR)\stats.obj" \

-	"$(INTDIR)\tcpmsg.obj" \

-	"$(INTDIR)\time.obj" \

-	"$(INTDIR)\timer.obj" \

-	"$(INTDIR)\tkey.obj" \

-	"$(INTDIR)\tsig.obj" \

-	"$(INTDIR)\ttl.obj" \

-	"$(INTDIR)\validator.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\view.obj" \

-	"$(INTDIR)\xfrin.obj" \

-	"$(INTDIR)\zone.obj" \

-	"$(INTDIR)\zonekey.obj" \

-	"$(INTDIR)\zt.obj" \

-	"$(INTDIR)\dst_api.obj" \

-	"$(INTDIR)\dst_lib.obj" \

-	"$(INTDIR)\dst_parse.obj" \

-	"$(INTDIR)\dst_result.obj" \

-	"$(INTDIR)\gssapi_link.obj" \

-	"$(INTDIR)\gssapictx.obj" \

-	"$(INTDIR)\hmac_link.obj" \

-	"$(INTDIR)\key.obj" \

-	"$(INTDIR)\openssl_link.obj" \

-	"$(INTDIR)\openssldh_link.obj" \

-	"$(INTDIR)\openssldsa_link.obj" \

-	"$(INTDIR)\opensslrsa_link.obj" \

-	"..\..\isc\win32\Debug\libisc.lib"

-

-"..\..\..\Build\Debug\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("libdns.dep")

-!INCLUDE "libdns.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "libdns.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "libdns - Win32 Release" || "$(CFG)" == "libdns - Win32 Debug"

-SOURCE=..\acl.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\acl.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\acl.obj"	"$(INTDIR)\acl.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\adb.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\adb.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\adb.obj"	"$(INTDIR)\adb.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\byaddr.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\byaddr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\byaddr.obj"	"$(INTDIR)\byaddr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\cache.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\cache.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\cache.obj"	"$(INTDIR)\cache.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\callbacks.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\callbacks.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\callbacks.obj"	"$(INTDIR)\callbacks.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\compress.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\compress.obj"	"$(INTDIR)\compress.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\db.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\db.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\db.obj"	"$(INTDIR)\db.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dbiterator.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dbiterator.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dbiterator.obj"	"$(INTDIR)\dbiterator.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dbtable.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dbtable.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dbtable.obj"	"$(INTDIR)\dbtable.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\diff.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\diff.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\diff.obj"	"$(INTDIR)\diff.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dispatch.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-"$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-"$(INTDIR)\dispatch.obj"	"$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ENDIF 

-

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\dnssec.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dnssec.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dnssec.obj"	"$(INTDIR)\dnssec.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ds.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\ds.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\ds.obj"	"$(INTDIR)\ds.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\forward.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\forward.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\forward.obj"	"$(INTDIR)\forward.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\journal.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\journal.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\journal.obj"	"$(INTDIR)\journal.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\keytable.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\keytable.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\keytable.obj"	"$(INTDIR)\keytable.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lib.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\log.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lookup.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\lookup.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\lookup.obj"	"$(INTDIR)\lookup.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\master.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\master.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\master.obj"	"$(INTDIR)\master.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\masterdump.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\masterdump.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\masterdump.obj"	"$(INTDIR)\masterdump.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\message.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\message.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\message.obj"	"$(INTDIR)\message.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\name.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\name.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\name.obj"	"$(INTDIR)\name.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ncache.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\ncache.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\ncache.obj"	"$(INTDIR)\ncache.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\nsec.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\nsec.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\nsec.obj"	"$(INTDIR)\nsec.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\order.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\order.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\order.obj"	"$(INTDIR)\order.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\peer.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\peer.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\peer.obj"	"$(INTDIR)\peer.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-SOURCE=..\portlist.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\portlist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\portlist.obj"	"$(INTDIR)\portlist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rbt.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rbt.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rbt.obj"	"$(INTDIR)\rbt.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rbtdb.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rbtdb.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rbtdb.obj"	"$(INTDIR)\rbtdb.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rbtdb64.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rbtdb64.obj" : $(SOURCE) "$(INTDIR)" "..\rbtdb.c"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rbtdb64.obj"	"$(INTDIR)\rbtdb64.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rcode.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rcode.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rcode.obj"	"$(INTDIR)\rcode.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rdata.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rdata.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rdata.obj"	"$(INTDIR)\rdata.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rdatalist.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rdatalist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rdatalist.obj"	"$(INTDIR)\rdatalist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rdataset.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rdataset.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rdataset.obj"	"$(INTDIR)\rdataset.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rdatasetiter.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rdatasetiter.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rdatasetiter.obj"	"$(INTDIR)\rdatasetiter.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rdataslab.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rdataslab.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rdataslab.obj"	"$(INTDIR)\rdataslab.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\request.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\request.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\request.obj"	"$(INTDIR)\request.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\resolver.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\resolver.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\resolver.obj"	"$(INTDIR)\resolver.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\result.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rootns.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\rootns.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\rootns.obj"	"$(INTDIR)\rootns.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\sdb.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\sdb.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\sdb.obj"	"$(INTDIR)\sdb.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\soa.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\soa.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\soa.obj"	"$(INTDIR)\soa.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ssu.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\ssu.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\ssu.obj"	"$(INTDIR)\ssu.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\stats.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\stats.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\stats.obj"	"$(INTDIR)\stats.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\tcpmsg.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\tcpmsg.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\tcpmsg.obj"	"$(INTDIR)\tcpmsg.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\time.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\time.obj"	"$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\timer.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\timer.obj"	"$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\tkey.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\tkey.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\tkey.obj"	"$(INTDIR)\tkey.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\tsig.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\tsig.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\tsig.obj"	"$(INTDIR)\tsig.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ttl.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\ttl.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\ttl.obj"	"$(INTDIR)\ttl.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\validator.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\validator.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\validator.obj"	"$(INTDIR)\validator.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\view.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\view.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\view.obj"	"$(INTDIR)\view.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\xfrin.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\xfrin.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\xfrin.obj"	"$(INTDIR)\xfrin.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\zone.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\zone.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\zone.obj"	"$(INTDIR)\zone.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\zonekey.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\zonekey.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\zonekey.obj"	"$(INTDIR)\zonekey.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\zt.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\zt.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\zt.obj"	"$(INTDIR)\zt.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dst_api.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dst_api.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dst_api.obj"	"$(INTDIR)\dst_api.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dst_lib.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dst_lib.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dst_lib.obj"	"$(INTDIR)\dst_lib.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dst_parse.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dst_parse.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dst_parse.obj"	"$(INTDIR)\dst_parse.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\dst_result.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\dst_result.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\dst_result.obj"	"$(INTDIR)\dst_result.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\gssapi_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\gssapi_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\gssapi_link.obj"	"$(INTDIR)\gssapi_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\gssapictx.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\gssapictx.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\gssapictx.obj"	"$(INTDIR)\gssapictx.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\hmac_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\hmac_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\hmac_link.obj"	"$(INTDIR)\hmac_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\key.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\key.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\key.obj"	"$(INTDIR)\key.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\openssl_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\openssl_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\openssl_link.obj"	"$(INTDIR)\openssl_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\openssldh_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\openssldh_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\openssldh_link.obj"	"$(INTDIR)\openssldh_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\openssldsa_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\openssldsa_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\openssldsa_link.obj"	"$(INTDIR)\openssldsa_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\opensslrsa_link.c

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-

-"$(INTDIR)\opensslrsa_link.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-

-"$(INTDIR)\opensslrsa_link.obj"	"$(INTDIR)\opensslrsa_link.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libdns - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\dns\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\dns\win32"

-

-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\dns\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\dns\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on libdns.dsp
+!IF "$(CFG)" == ""
+CFG=libdns - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to libdns - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "libdns - Win32 Release" && "$(CFG)" != "libdns - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\libdns.dll"
+
+!ELSE 
+
+ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libdns.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\acl.obj"
+	-@erase "$(INTDIR)\adb.obj"
+	-@erase "$(INTDIR)\byaddr.obj"
+	-@erase "$(INTDIR)\cache.obj"
+	-@erase "$(INTDIR)\callbacks.obj"
+	-@erase "$(INTDIR)\compress.obj"
+	-@erase "$(INTDIR)\db.obj"
+	-@erase "$(INTDIR)\dbiterator.obj"
+	-@erase "$(INTDIR)\dbtable.obj"
+	-@erase "$(INTDIR)\diff.obj"
+	-@erase "$(INTDIR)\dispatch.obj"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\dnssec.obj"
+	-@erase "$(INTDIR)\ds.obj"
+	-@erase "$(INTDIR)\dst_api.obj"
+	-@erase "$(INTDIR)\dst_lib.obj"
+	-@erase "$(INTDIR)\dst_parse.obj"
+	-@erase "$(INTDIR)\dst_result.obj"
+	-@erase "$(INTDIR)\forward.obj"
+	-@erase "$(INTDIR)\gssapi_link.obj"
+	-@erase "$(INTDIR)\gssapictx.obj"
+	-@erase "$(INTDIR)\hmac_link.obj"
+	-@erase "$(INTDIR)\journal.obj"
+	-@erase "$(INTDIR)\key.obj"
+	-@erase "$(INTDIR)\keytable.obj"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\lookup.obj"
+	-@erase "$(INTDIR)\master.obj"
+	-@erase "$(INTDIR)\masterdump.obj"
+	-@erase "$(INTDIR)\message.obj"
+	-@erase "$(INTDIR)\name.obj"
+	-@erase "$(INTDIR)\ncache.obj"
+	-@erase "$(INTDIR)\nsec.obj"
+	-@erase "$(INTDIR)\openssl_link.obj"
+	-@erase "$(INTDIR)\openssldh_link.obj"
+	-@erase "$(INTDIR)\openssldsa_link.obj"
+	-@erase "$(INTDIR)\opensslrsa_link.obj"
+	-@erase "$(INTDIR)\order.obj"
+	-@erase "$(INTDIR)\peer.obj"
+	-@erase "$(INTDIR)\portlist.obj"
+	-@erase "$(INTDIR)\rbt.obj"
+	-@erase "$(INTDIR)\rbtdb.obj"
+	-@erase "$(INTDIR)\rbtdb64.obj"
+	-@erase "$(INTDIR)\rcode.obj"
+	-@erase "$(INTDIR)\rdata.obj"
+	-@erase "$(INTDIR)\rdatalist.obj"
+	-@erase "$(INTDIR)\rdataset.obj"
+	-@erase "$(INTDIR)\rdatasetiter.obj"
+	-@erase "$(INTDIR)\rdataslab.obj"
+	-@erase "$(INTDIR)\request.obj"
+	-@erase "$(INTDIR)\resolver.obj"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\rootns.obj"
+	-@erase "$(INTDIR)\sdb.obj"
+	-@erase "$(INTDIR)\soa.obj"
+	-@erase "$(INTDIR)\ssu.obj"
+	-@erase "$(INTDIR)\stats.obj"
+	-@erase "$(INTDIR)\tcpmsg.obj"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\timer.obj"
+	-@erase "$(INTDIR)\tkey.obj"
+	-@erase "$(INTDIR)\tsig.obj"
+	-@erase "$(INTDIR)\ttl.obj"
+	-@erase "$(INTDIR)\validator.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\view.obj"
+	-@erase "$(INTDIR)\xfrin.obj"
+	-@erase "$(INTDIR)\zone.obj"
+	-@erase "$(INTDIR)\zonekey.obj"
+	-@erase "$(INTDIR)\zt.obj"
+	-@erase "$(OUTDIR)\libdns.exp"
+	-@erase "$(OUTDIR)\libdns.lib"
+	-@erase "..\..\..\Build\Release\libdns.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
+DEF_FILE= \
+	".\libdns.def"
+LINK32_OBJS= \
+	"$(INTDIR)\acl.obj" \
+	"$(INTDIR)\adb.obj" \
+	"$(INTDIR)\byaddr.obj" \
+	"$(INTDIR)\cache.obj" \
+	"$(INTDIR)\callbacks.obj" \
+	"$(INTDIR)\compress.obj" \
+	"$(INTDIR)\db.obj" \
+	"$(INTDIR)\dbiterator.obj" \
+	"$(INTDIR)\dbtable.obj" \
+	"$(INTDIR)\diff.obj" \
+	"$(INTDIR)\dispatch.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\dnssec.obj" \
+	"$(INTDIR)\ds.obj" \
+	"$(INTDIR)\forward.obj" \
+	"$(INTDIR)\journal.obj" \
+	"$(INTDIR)\keytable.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\lookup.obj" \
+	"$(INTDIR)\master.obj" \
+	"$(INTDIR)\masterdump.obj" \
+	"$(INTDIR)\message.obj" \
+	"$(INTDIR)\name.obj" \
+	"$(INTDIR)\ncache.obj" \
+	"$(INTDIR)\nsec.obj" \
+	"$(INTDIR)\order.obj" \
+	"$(INTDIR)\peer.obj" \
+	"$(INTDIR)\portlist.obj" \
+	"$(INTDIR)\rbt.obj" \
+	"$(INTDIR)\rbtdb.obj" \
+	"$(INTDIR)\rbtdb64.obj" \
+	"$(INTDIR)\rcode.obj" \
+	"$(INTDIR)\rdata.obj" \
+	"$(INTDIR)\rdatalist.obj" \
+	"$(INTDIR)\rdataset.obj" \
+	"$(INTDIR)\rdatasetiter.obj" \
+	"$(INTDIR)\rdataslab.obj" \
+	"$(INTDIR)\request.obj" \
+	"$(INTDIR)\resolver.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\rootns.obj" \
+	"$(INTDIR)\sdb.obj" \
+	"$(INTDIR)\soa.obj" \
+	"$(INTDIR)\ssu.obj" \
+	"$(INTDIR)\stats.obj" \
+	"$(INTDIR)\tcpmsg.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\timer.obj" \
+	"$(INTDIR)\tkey.obj" \
+	"$(INTDIR)\tsig.obj" \
+	"$(INTDIR)\ttl.obj" \
+	"$(INTDIR)\validator.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\view.obj" \
+	"$(INTDIR)\xfrin.obj" \
+	"$(INTDIR)\zone.obj" \
+	"$(INTDIR)\zonekey.obj" \
+	"$(INTDIR)\zt.obj" \
+	"$(INTDIR)\dst_api.obj" \
+	"$(INTDIR)\dst_lib.obj" \
+	"$(INTDIR)\dst_parse.obj" \
+	"$(INTDIR)\dst_result.obj" \
+	"$(INTDIR)\gssapi_link.obj" \
+	"$(INTDIR)\gssapictx.obj" \
+	"$(INTDIR)\hmac_link.obj" \
+	"$(INTDIR)\key.obj" \
+	"$(INTDIR)\openssl_link.obj" \
+	"$(INTDIR)\openssldh_link.obj" \
+	"$(INTDIR)\openssldsa_link.obj" \
+	"$(INTDIR)\opensslrsa_link.obj" \
+	"..\..\isc\win32\Release\libisc.lib"
+
+"..\..\..\Build\Release\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"
+
+!ELSE 
+
+ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\acl.obj"
+	-@erase "$(INTDIR)\acl.sbr"
+	-@erase "$(INTDIR)\adb.obj"
+	-@erase "$(INTDIR)\adb.sbr"
+	-@erase "$(INTDIR)\byaddr.obj"
+	-@erase "$(INTDIR)\byaddr.sbr"
+	-@erase "$(INTDIR)\cache.obj"
+	-@erase "$(INTDIR)\cache.sbr"
+	-@erase "$(INTDIR)\callbacks.obj"
+	-@erase "$(INTDIR)\callbacks.sbr"
+	-@erase "$(INTDIR)\compress.obj"
+	-@erase "$(INTDIR)\compress.sbr"
+	-@erase "$(INTDIR)\db.obj"
+	-@erase "$(INTDIR)\db.sbr"
+	-@erase "$(INTDIR)\dbiterator.obj"
+	-@erase "$(INTDIR)\dbiterator.sbr"
+	-@erase "$(INTDIR)\dbtable.obj"
+	-@erase "$(INTDIR)\dbtable.sbr"
+	-@erase "$(INTDIR)\diff.obj"
+	-@erase "$(INTDIR)\diff.sbr"
+	-@erase "$(INTDIR)\dispatch.obj"
+	-@erase "$(INTDIR)\dispatch.sbr"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\dnssec.obj"
+	-@erase "$(INTDIR)\dnssec.sbr"
+	-@erase "$(INTDIR)\ds.obj"
+	-@erase "$(INTDIR)\ds.sbr"
+	-@erase "$(INTDIR)\dst_api.obj"
+	-@erase "$(INTDIR)\dst_api.sbr"
+	-@erase "$(INTDIR)\dst_lib.obj"
+	-@erase "$(INTDIR)\dst_lib.sbr"
+	-@erase "$(INTDIR)\dst_parse.obj"
+	-@erase "$(INTDIR)\dst_parse.sbr"
+	-@erase "$(INTDIR)\dst_result.obj"
+	-@erase "$(INTDIR)\dst_result.sbr"
+	-@erase "$(INTDIR)\forward.obj"
+	-@erase "$(INTDIR)\forward.sbr"
+	-@erase "$(INTDIR)\gssapi_link.obj"
+	-@erase "$(INTDIR)\gssapi_link.sbr"
+	-@erase "$(INTDIR)\gssapictx.obj"
+	-@erase "$(INTDIR)\gssapictx.sbr"
+	-@erase "$(INTDIR)\hmac_link.obj"
+	-@erase "$(INTDIR)\hmac_link.sbr"
+	-@erase "$(INTDIR)\journal.obj"
+	-@erase "$(INTDIR)\journal.sbr"
+	-@erase "$(INTDIR)\key.obj"
+	-@erase "$(INTDIR)\key.sbr"
+	-@erase "$(INTDIR)\keytable.obj"
+	-@erase "$(INTDIR)\keytable.sbr"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\lib.sbr"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\log.sbr"
+	-@erase "$(INTDIR)\lookup.obj"
+	-@erase "$(INTDIR)\lookup.sbr"
+	-@erase "$(INTDIR)\master.obj"
+	-@erase "$(INTDIR)\master.sbr"
+	-@erase "$(INTDIR)\masterdump.obj"
+	-@erase "$(INTDIR)\masterdump.sbr"
+	-@erase "$(INTDIR)\message.obj"
+	-@erase "$(INTDIR)\message.sbr"
+	-@erase "$(INTDIR)\name.obj"
+	-@erase "$(INTDIR)\name.sbr"
+	-@erase "$(INTDIR)\ncache.obj"
+	-@erase "$(INTDIR)\ncache.sbr"
+	-@erase "$(INTDIR)\nsec.obj"
+	-@erase "$(INTDIR)\nsec.sbr"
+	-@erase "$(INTDIR)\openssl_link.obj"
+	-@erase "$(INTDIR)\openssl_link.sbr"
+	-@erase "$(INTDIR)\openssldh_link.obj"
+	-@erase "$(INTDIR)\openssldh_link.sbr"
+	-@erase "$(INTDIR)\openssldsa_link.obj"
+	-@erase "$(INTDIR)\openssldsa_link.sbr"
+	-@erase "$(INTDIR)\opensslrsa_link.obj"
+	-@erase "$(INTDIR)\opensslrsa_link.sbr"
+	-@erase "$(INTDIR)\order.obj"
+	-@erase "$(INTDIR)\order.sbr"
+	-@erase "$(INTDIR)\peer.obj"
+	-@erase "$(INTDIR)\peer.sbr"
+	-@erase "$(INTDIR)\portlist.obj"
+	-@erase "$(INTDIR)\portlist.sbr"
+	-@erase "$(INTDIR)\rbt.obj"
+	-@erase "$(INTDIR)\rbt.sbr"
+	-@erase "$(INTDIR)\rbtdb.obj"
+	-@erase "$(INTDIR)\rbtdb.sbr"
+	-@erase "$(INTDIR)\rbtdb64.obj"
+	-@erase "$(INTDIR)\rbtdb64.sbr"
+	-@erase "$(INTDIR)\rcode.obj"
+	-@erase "$(INTDIR)\rcode.sbr"
+	-@erase "$(INTDIR)\rdata.obj"
+	-@erase "$(INTDIR)\rdata.sbr"
+	-@erase "$(INTDIR)\rdatalist.obj"
+	-@erase "$(INTDIR)\rdatalist.sbr"
+	-@erase "$(INTDIR)\rdataset.obj"
+	-@erase "$(INTDIR)\rdataset.sbr"
+	-@erase "$(INTDIR)\rdatasetiter.obj"
+	-@erase "$(INTDIR)\rdatasetiter.sbr"
+	-@erase "$(INTDIR)\rdataslab.obj"
+	-@erase "$(INTDIR)\rdataslab.sbr"
+	-@erase "$(INTDIR)\request.obj"
+	-@erase "$(INTDIR)\request.sbr"
+	-@erase "$(INTDIR)\resolver.obj"
+	-@erase "$(INTDIR)\resolver.sbr"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\result.sbr"
+	-@erase "$(INTDIR)\rootns.obj"
+	-@erase "$(INTDIR)\rootns.sbr"
+	-@erase "$(INTDIR)\sdb.obj"
+	-@erase "$(INTDIR)\sdb.sbr"
+	-@erase "$(INTDIR)\soa.obj"
+	-@erase "$(INTDIR)\soa.sbr"
+	-@erase "$(INTDIR)\ssu.obj"
+	-@erase "$(INTDIR)\ssu.sbr"
+	-@erase "$(INTDIR)\stats.obj"
+	-@erase "$(INTDIR)\stats.sbr"
+	-@erase "$(INTDIR)\tcpmsg.obj"
+	-@erase "$(INTDIR)\tcpmsg.sbr"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\time.sbr"
+	-@erase "$(INTDIR)\timer.obj"
+	-@erase "$(INTDIR)\timer.sbr"
+	-@erase "$(INTDIR)\tkey.obj"
+	-@erase "$(INTDIR)\tkey.sbr"
+	-@erase "$(INTDIR)\tsig.obj"
+	-@erase "$(INTDIR)\tsig.sbr"
+	-@erase "$(INTDIR)\ttl.obj"
+	-@erase "$(INTDIR)\ttl.sbr"
+	-@erase "$(INTDIR)\validator.obj"
+	-@erase "$(INTDIR)\validator.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(INTDIR)\view.obj"
+	-@erase "$(INTDIR)\view.sbr"
+	-@erase "$(INTDIR)\xfrin.obj"
+	-@erase "$(INTDIR)\xfrin.sbr"
+	-@erase "$(INTDIR)\zone.obj"
+	-@erase "$(INTDIR)\zone.sbr"
+	-@erase "$(INTDIR)\zonekey.obj"
+	-@erase "$(INTDIR)\zonekey.sbr"
+	-@erase "$(INTDIR)\zt.obj"
+	-@erase "$(INTDIR)\zt.sbr"
+	-@erase "$(OUTDIR)\libdns.bsc"
+	-@erase "$(OUTDIR)\libdns.exp"
+	-@erase "$(OUTDIR)\libdns.lib"
+	-@erase "$(OUTDIR)\libdns.map"
+	-@erase "$(OUTDIR)\libdns.pdb"
+	-@erase "..\..\..\Build\Debug\libdns.dll"
+	-@erase "..\..\..\Build\Debug\libdns.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\acl.sbr" \
+	"$(INTDIR)\adb.sbr" \
+	"$(INTDIR)\byaddr.sbr" \
+	"$(INTDIR)\cache.sbr" \
+	"$(INTDIR)\callbacks.sbr" \
+	"$(INTDIR)\compress.sbr" \
+	"$(INTDIR)\db.sbr" \
+	"$(INTDIR)\dbiterator.sbr" \
+	"$(INTDIR)\dbtable.sbr" \
+	"$(INTDIR)\diff.sbr" \
+	"$(INTDIR)\dispatch.sbr" \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\dnssec.sbr" \
+	"$(INTDIR)\ds.sbr" \
+	"$(INTDIR)\forward.sbr" \
+	"$(INTDIR)\journal.sbr" \
+	"$(INTDIR)\keytable.sbr" \
+	"$(INTDIR)\lib.sbr" \
+	"$(INTDIR)\log.sbr" \
+	"$(INTDIR)\lookup.sbr" \
+	"$(INTDIR)\master.sbr" \
+	"$(INTDIR)\masterdump.sbr" \
+	"$(INTDIR)\message.sbr" \
+	"$(INTDIR)\name.sbr" \
+	"$(INTDIR)\ncache.sbr" \
+	"$(INTDIR)\nsec.sbr" \
+	"$(INTDIR)\order.sbr" \
+	"$(INTDIR)\peer.sbr" \
+	"$(INTDIR)\portlist.sbr" \
+	"$(INTDIR)\rbt.sbr" \
+	"$(INTDIR)\rbtdb.sbr" \
+	"$(INTDIR)\rbtdb64.sbr" \
+	"$(INTDIR)\rcode.sbr" \
+	"$(INTDIR)\rdata.sbr" \
+	"$(INTDIR)\rdatalist.sbr" \
+	"$(INTDIR)\rdataset.sbr" \
+	"$(INTDIR)\rdatasetiter.sbr" \
+	"$(INTDIR)\rdataslab.sbr" \
+	"$(INTDIR)\request.sbr" \
+	"$(INTDIR)\resolver.sbr" \
+	"$(INTDIR)\result.sbr" \
+	"$(INTDIR)\rootns.sbr" \
+	"$(INTDIR)\sdb.sbr" \
+	"$(INTDIR)\soa.sbr" \
+	"$(INTDIR)\ssu.sbr" \
+	"$(INTDIR)\stats.sbr" \
+	"$(INTDIR)\tcpmsg.sbr" \
+	"$(INTDIR)\time.sbr" \
+	"$(INTDIR)\timer.sbr" \
+	"$(INTDIR)\tkey.sbr" \
+	"$(INTDIR)\tsig.sbr" \
+	"$(INTDIR)\ttl.sbr" \
+	"$(INTDIR)\validator.sbr" \
+	"$(INTDIR)\version.sbr" \
+	"$(INTDIR)\view.sbr" \
+	"$(INTDIR)\xfrin.sbr" \
+	"$(INTDIR)\zone.sbr" \
+	"$(INTDIR)\zonekey.sbr" \
+	"$(INTDIR)\zt.sbr" \
+	"$(INTDIR)\dst_api.sbr" \
+	"$(INTDIR)\dst_lib.sbr" \
+	"$(INTDIR)\dst_parse.sbr" \
+	"$(INTDIR)\dst_result.sbr" \
+	"$(INTDIR)\gssapi_link.sbr" \
+	"$(INTDIR)\gssapictx.sbr" \
+	"$(INTDIR)\hmac_link.sbr" \
+	"$(INTDIR)\key.sbr" \
+	"$(INTDIR)\openssl_link.sbr" \
+	"$(INTDIR)\openssldh_link.sbr" \
+	"$(INTDIR)\openssldsa_link.sbr" \
+	"$(INTDIR)\opensslrsa_link.sbr"
+
+"$(OUTDIR)\libdns.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6k/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\libdns.def"
+LINK32_OBJS= \
+	"$(INTDIR)\acl.obj" \
+	"$(INTDIR)\adb.obj" \
+	"$(INTDIR)\byaddr.obj" \
+	"$(INTDIR)\cache.obj" \
+	"$(INTDIR)\callbacks.obj" \
+	"$(INTDIR)\compress.obj" \
+	"$(INTDIR)\db.obj" \
+	"$(INTDIR)\dbiterator.obj" \
+	"$(INTDIR)\dbtable.obj" \
+	"$(INTDIR)\diff.obj" \
+	"$(INTDIR)\dispatch.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\dnssec.obj" \
+	"$(INTDIR)\ds.obj" \
+	"$(INTDIR)\forward.obj" \
+	"$(INTDIR)\journal.obj" \
+	"$(INTDIR)\keytable.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\lookup.obj" \
+	"$(INTDIR)\master.obj" \
+	"$(INTDIR)\masterdump.obj" \
+	"$(INTDIR)\message.obj" \
+	"$(INTDIR)\name.obj" \
+	"$(INTDIR)\ncache.obj" \
+	"$(INTDIR)\nsec.obj" \
+	"$(INTDIR)\order.obj" \
+	"$(INTDIR)\peer.obj" \
+	"$(INTDIR)\portlist.obj" \
+	"$(INTDIR)\rbt.obj" \
+	"$(INTDIR)\rbtdb.obj" \
+	"$(INTDIR)\rbtdb64.obj" \
+	"$(INTDIR)\rcode.obj" \
+	"$(INTDIR)\rdata.obj" \
+	"$(INTDIR)\rdatalist.obj" \
+	"$(INTDIR)\rdataset.obj" \
+	"$(INTDIR)\rdatasetiter.obj" \
+	"$(INTDIR)\rdataslab.obj" \
+	"$(INTDIR)\request.obj" \
+	"$(INTDIR)\resolver.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\rootns.obj" \
+	"$(INTDIR)\sdb.obj" \
+	"$(INTDIR)\soa.obj" \
+	"$(INTDIR)\ssu.obj" \
+	"$(INTDIR)\stats.obj" \
+	"$(INTDIR)\tcpmsg.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\timer.obj" \
+	"$(INTDIR)\tkey.obj" \
+	"$(INTDIR)\tsig.obj" \
+	"$(INTDIR)\ttl.obj" \
+	"$(INTDIR)\validator.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\view.obj" \
+	"$(INTDIR)\xfrin.obj" \
+	"$(INTDIR)\zone.obj" \
+	"$(INTDIR)\zonekey.obj" \
+	"$(INTDIR)\zt.obj" \
+	"$(INTDIR)\dst_api.obj" \
+	"$(INTDIR)\dst_lib.obj" \
+	"$(INTDIR)\dst_parse.obj" \
+	"$(INTDIR)\dst_result.obj" \
+	"$(INTDIR)\gssapi_link.obj" \
+	"$(INTDIR)\gssapictx.obj" \
+	"$(INTDIR)\hmac_link.obj" \
+	"$(INTDIR)\key.obj" \
+	"$(INTDIR)\openssl_link.obj" \
+	"$(INTDIR)\openssldh_link.obj" \
+	"$(INTDIR)\openssldsa_link.obj" \
+	"$(INTDIR)\opensslrsa_link.obj" \
+	"..\..\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libdns.dep")
+!INCLUDE "libdns.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libdns.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libdns - Win32 Release" || "$(CFG)" == "libdns - Win32 Debug"
+SOURCE=..\acl.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\acl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\acl.obj"	"$(INTDIR)\acl.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\adb.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\adb.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\adb.obj"	"$(INTDIR)\adb.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\byaddr.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\byaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\byaddr.obj"	"$(INTDIR)\byaddr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\cache.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\cache.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\cache.obj"	"$(INTDIR)\cache.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\callbacks.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\callbacks.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\callbacks.obj"	"$(INTDIR)\callbacks.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\compress.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\compress.obj"	"$(INTDIR)\compress.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\db.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\db.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\db.obj"	"$(INTDIR)\db.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dbiterator.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dbiterator.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dbiterator.obj"	"$(INTDIR)\dbiterator.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dbtable.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dbtable.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dbtable.obj"	"$(INTDIR)\dbtable.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\diff.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\diff.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\diff.obj"	"$(INTDIR)\diff.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dispatch.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6k/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+"$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../../openssl-0.9.6k/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+"$(INTDIR)\dispatch.obj"	"$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\dnssec.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dnssec.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dnssec.obj"	"$(INTDIR)\dnssec.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ds.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\ds.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\ds.obj"	"$(INTDIR)\ds.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\forward.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\forward.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\forward.obj"	"$(INTDIR)\forward.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\journal.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\journal.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\journal.obj"	"$(INTDIR)\journal.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\keytable.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\keytable.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\keytable.obj"	"$(INTDIR)\keytable.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lib.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\log.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lookup.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\lookup.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\lookup.obj"	"$(INTDIR)\lookup.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\master.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\master.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\master.obj"	"$(INTDIR)\master.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\masterdump.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\masterdump.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\masterdump.obj"	"$(INTDIR)\masterdump.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\message.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\message.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\message.obj"	"$(INTDIR)\message.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\name.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\name.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\name.obj"	"$(INTDIR)\name.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ncache.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\ncache.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\ncache.obj"	"$(INTDIR)\ncache.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\nsec.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\nsec.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\nsec.obj"	"$(INTDIR)\nsec.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\order.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\order.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\order.obj"	"$(INTDIR)\order.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\peer.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\peer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\peer.obj"	"$(INTDIR)\peer.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+SOURCE=..\portlist.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\portlist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\portlist.obj"	"$(INTDIR)\portlist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rbt.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rbt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rbt.obj"	"$(INTDIR)\rbt.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rbtdb.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rbtdb.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rbtdb.obj"	"$(INTDIR)\rbtdb.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rbtdb64.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rbtdb64.obj" : $(SOURCE) "$(INTDIR)" "..\rbtdb.c"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rbtdb64.obj"	"$(INTDIR)\rbtdb64.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rcode.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rcode.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rcode.obj"	"$(INTDIR)\rcode.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rdata.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rdata.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rdata.obj"	"$(INTDIR)\rdata.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rdatalist.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rdatalist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rdatalist.obj"	"$(INTDIR)\rdatalist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rdataset.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rdataset.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rdataset.obj"	"$(INTDIR)\rdataset.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rdatasetiter.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rdatasetiter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rdatasetiter.obj"	"$(INTDIR)\rdatasetiter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rdataslab.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rdataslab.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rdataslab.obj"	"$(INTDIR)\rdataslab.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\request.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\request.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\request.obj"	"$(INTDIR)\request.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\resolver.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\resolver.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\resolver.obj"	"$(INTDIR)\resolver.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\result.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rootns.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\rootns.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\rootns.obj"	"$(INTDIR)\rootns.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\sdb.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\sdb.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\sdb.obj"	"$(INTDIR)\sdb.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\soa.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\soa.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\soa.obj"	"$(INTDIR)\soa.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ssu.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\ssu.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\ssu.obj"	"$(INTDIR)\ssu.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\stats.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\stats.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\stats.obj"	"$(INTDIR)\stats.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\tcpmsg.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\tcpmsg.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\tcpmsg.obj"	"$(INTDIR)\tcpmsg.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\time.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\time.obj"	"$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\timer.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\timer.obj"	"$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\tkey.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\tkey.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\tkey.obj"	"$(INTDIR)\tkey.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\tsig.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\tsig.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\tsig.obj"	"$(INTDIR)\tsig.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ttl.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\ttl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\ttl.obj"	"$(INTDIR)\ttl.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\validator.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\validator.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\validator.obj"	"$(INTDIR)\validator.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\view.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\view.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\view.obj"	"$(INTDIR)\view.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\xfrin.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\xfrin.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\xfrin.obj"	"$(INTDIR)\xfrin.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\zone.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\zone.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\zone.obj"	"$(INTDIR)\zone.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\zonekey.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\zonekey.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\zonekey.obj"	"$(INTDIR)\zonekey.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\zt.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\zt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\zt.obj"	"$(INTDIR)\zt.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dst_api.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dst_api.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dst_api.obj"	"$(INTDIR)\dst_api.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dst_lib.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dst_lib.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dst_lib.obj"	"$(INTDIR)\dst_lib.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dst_parse.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dst_parse.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dst_parse.obj"	"$(INTDIR)\dst_parse.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dst_result.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\dst_result.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\dst_result.obj"	"$(INTDIR)\dst_result.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\gssapi_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\gssapi_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\gssapi_link.obj"	"$(INTDIR)\gssapi_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\gssapictx.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\gssapictx.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\gssapictx.obj"	"$(INTDIR)\gssapictx.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\hmac_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\hmac_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\hmac_link.obj"	"$(INTDIR)\hmac_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\key.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\key.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\key.obj"	"$(INTDIR)\key.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\openssl_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\openssl_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\openssl_link.obj"	"$(INTDIR)\openssl_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\openssldh_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\openssldh_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\openssldh_link.obj"	"$(INTDIR)\openssldh_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\openssldsa_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\openssldsa_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\openssldsa_link.obj"	"$(INTDIR)\openssldsa_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\opensslrsa_link.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\opensslrsa_link.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\opensslrsa_link.obj"	"$(INTDIR)\opensslrsa_link.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\dns\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\dns\win32"
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\dns\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\dns\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 8a824a73..4e07895d 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.12 2005/11/03 23:08:41 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.15 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -797,7 +797,18 @@ xfrin_create(isc_mem_t *mctx,
 	return (ISC_R_SUCCESS);
 
  failure:
-	xfrin_fail(xfr, result, "failed creating transfer context");
+	if (xfr->timer != NULL)
+		isc_timer_detach(&xfr->timer);
+	if (dns_name_dynamic(&xfr->name))
+		dns_name_free(&xfr->name, xfr->mctx);
+	if (xfr->tsigkey != NULL)
+		dns_tsigkey_detach(&xfr->tsigkey);
+	if (xfr->db != NULL)
+		dns_db_detach(&xfr->db);
+	isc_task_detach(&xfr->task);
+	dns_zone_idetach(&xfr->zone);
+	isc_mem_put(mctx, xfr, sizeof(*xfr));
+
 	return (result);
 }
 
@@ -808,7 +819,9 @@ xfrin_start(dns_xfrin_ctx_t *xfr) {
 				isc_sockaddr_pf(&xfr->sourceaddr),
 				isc_sockettype_tcp,
 				&xfr->socket));
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr));
+#endif
 	CHECK(isc_socket_connect(xfr->socket, &xfr->masteraddr, xfr->task,
 				 xfrin_connect_done, xfr));
 	xfr->connects++;
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a993877e..454ce363 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.23.2.59 2005/07/29 00:38:33 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.23.2.64 2006/05/18 02:28:55 marka Exp $ */
 
 #include <config.h>
 
@@ -772,12 +772,10 @@ dns_zone_setdbtype(dns_zone_t *zone,
 
  nomem:
 	if (new != NULL) {
-		for (i = 0; i < dbargc; i++) {
-			if (zone->db_argv[i] != NULL)
+		for (i = 0; i < dbargc; i++)
+			if (new[i] != NULL)
 				isc_mem_free(zone->mctx, new[i]);
-			isc_mem_put(zone->mctx, new,
-				    dbargc * sizeof(*new));
-		}
+		isc_mem_put(zone->mctx, new, dbargc * sizeof(*new));
 	}
 	result = ISC_R_NOMEMORY;
 
@@ -807,7 +805,7 @@ dns_zone_getview(dns_zone_t *zone) {
 
 
 isc_result_t
-dns_zone_setorigin(dns_zone_t *zone, dns_name_t *origin) {
+dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) {
 	isc_result_t result;
 
 	REQUIRE(DNS_ZONE_VALID(zone));
@@ -998,7 +996,7 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
 			result = isc_file_getmodtime(zone->masterfile,
 						     &filetime);
 			if (result == ISC_R_SUCCESS &&
-			    isc_time_compare(&filetime, &zone->loadtime) < 0) {
+			    isc_time_compare(&filetime, &zone->loadtime) <= 0) {
 				dns_zone_log(zone, ISC_LOG_DEBUG(1),
 					     "skipping load: master file older "
 					     "than last load");
@@ -1010,6 +1008,16 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
 
 	INSIST(zone->db_argc >= 1);
 
+	/*
+	 * Built in zones don't need to be reloaded.
+	 */
+	if (zone->type == dns_zone_master &&
+	    strcmp(zone->db_argv[0], "_builtin") == 0 &&
+	    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
+		result = ISC_R_SUCCESS;
+		goto cleanup;
+	}
+
 	if ((zone->type == dns_zone_slave || zone->type == dns_zone_stub) &&
 	    (strcmp(zone->db_argv[0], "rbt") == 0 ||
 	     strcmp(zone->db_argv[0], "rbt64") == 0)) {
@@ -1210,10 +1218,12 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
 				       zone_gotreadhandle, load,
 				       &zone->readio);
 		if (result != ISC_R_SUCCESS) {
-			tresult = dns_db_endload(load->db,
-						 &load->callbacks.add_private);
-			if (result == ISC_R_SUCCESS)
-				result = tresult;
+			/*
+			 * We can't report multiple errors so ignore
+			 * the result of dns_db_endload().
+			 */
+			(void)dns_db_endload(load->db,
+					     &load->callbacks.add_private);
 			goto cleanup;
 		} else
 			result = DNS_R_CONTINUE;
@@ -1284,14 +1294,12 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	dns_zone_log(zone, ISC_LOG_DEBUG(2),
 		     "number of nodes in database: %u",
 		     dns_db_nodecount(db));
-	zone->loadtime = loadtime;
-
-	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
 
 	if (result == DNS_R_SEENINCLUDE)
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
 	else
 		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
+
 	/*
 	 * Apply update log, if any, on initial load.
 	 */
@@ -1323,6 +1331,10 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			needdump = ISC_TRUE;
 	}
 
+	zone->loadtime = loadtime;
+
+	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
+
 	/*
 	 * Obtain ns and soa counts for top of zone.
 	 */
@@ -1821,7 +1833,7 @@ dns_zone_getoptions(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setxfrsource4(dns_zone_t *zone, isc_sockaddr_t *xfrsource) {
+dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1838,7 +1850,7 @@ dns_zone_getxfrsource4(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setxfrsource6(dns_zone_t *zone, isc_sockaddr_t *xfrsource) {
+dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1855,7 +1867,9 @@ dns_zone_getxfrsource6(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setaltxfrsource4(dns_zone_t *zone, isc_sockaddr_t *altxfrsource) {
+dns_zone_setaltxfrsource4(dns_zone_t *zone,
+			  const isc_sockaddr_t *altxfrsource)
+{
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1872,7 +1886,9 @@ dns_zone_getaltxfrsource4(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setaltxfrsource6(dns_zone_t *zone, isc_sockaddr_t *altxfrsource) {
+dns_zone_setaltxfrsource6(dns_zone_t *zone,
+			  const isc_sockaddr_t *altxfrsource)
+{
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1889,7 +1905,7 @@ dns_zone_getaltxfrsource6(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setnotifysrc4(dns_zone_t *zone, isc_sockaddr_t *notifysrc) {
+dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1906,7 +1922,7 @@ dns_zone_getnotifysrc4(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setnotifysrc6(dns_zone_t *zone, isc_sockaddr_t *notifysrc) {
+dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	LOCK_ZONE(zone);
@@ -1923,7 +1939,7 @@ dns_zone_getnotifysrc6(dns_zone_t *zone) {
 }
 
 isc_result_t
-dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
+dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
 		       isc_uint32_t count)
 {
 	isc_sockaddr_t *new;
@@ -1953,7 +1969,7 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
 }
 
 isc_result_t
-dns_zone_setmasters(dns_zone_t *zone, isc_sockaddr_t *masters,
+dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters,
 		    isc_uint32_t count)
 {
 	isc_result_t result;
@@ -1963,8 +1979,10 @@ dns_zone_setmasters(dns_zone_t *zone, isc_sockaddr_t *masters,
 }
 
 isc_result_t
-dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
-			    dns_name_t **keynames, isc_uint32_t count)
+dns_zone_setmasterswithkeys(dns_zone_t *zone,
+			    const isc_sockaddr_t *masters,
+			    dns_name_t **keynames,
+			    isc_uint32_t count)
 {
 	isc_sockaddr_t *new;
 	isc_result_t result = ISC_R_SUCCESS;
@@ -2274,6 +2292,7 @@ dns_zone_refresh(dns_zone_t *zone) {
 	isc_interval_t i;
 	isc_uint32_t oldflags;
 	unsigned int j;
+	isc_result_t result;
 
 	REQUIRE(DNS_ZONE_VALID(zone));
 
@@ -2307,7 +2326,11 @@ dns_zone_refresh(dns_zone_t *zone) {
 	 */
 	isc_interval_set(&i, isc_random_jitter(zone->retry, zone->retry / 4),
 			 0);
-	isc_time_nowplusinterval(&zone->refreshtime, &i);
+	result = isc_time_nowplusinterval(&zone->refreshtime, &i);
+	if (result |= ISC_R_SUCCESS)
+		dns_zone_log(zone, ISC_LOG_WARNING,
+			     "isc_time_nowplusinterval() failed: %s",
+			     dns_result_totext(result));
 
 	/*
 	 * When lacking user-specified timer values from the SOA,
diff --git a/lib/isc/api b/lib/isc/api
index ddeff334..683ad926 100644
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 11
-LIBREVISION = 1
-LIBAGE = 0
+LIBINTERFACE = 12
+LIBREVISION = 0
+LIBAGE = 1
diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index 22f37006..10942066 100644
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.2.2.4.2.1 2004/03/06 08:14:29 marka Exp $ */
+/* $Id: hash.c,v 1.2.2.4.2.3 2006/01/04 00:37:22 marka Exp $ */
 
 /*
  * Some portion of this code was derived from universal hash function
@@ -68,7 +68,6 @@ if advised of the possibility of such damage.
 #include <isc/once.h>
 #include <isc/random.h>
 #include <isc/refcount.h>
-#include <isc/rwlock.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
@@ -99,7 +98,7 @@ struct isc_hash {
 	hash_random_t	*rndvector; /* random vector for universal hashing */
 };
 
-static isc_rwlock_t createlock;
+static isc_mutex_t createlock;
 static isc_once_t once = ISC_ONCE_INIT;
 static isc_hash_t *hash = NULL;
 
@@ -209,7 +208,7 @@ isc_hash_ctxcreate(isc_mem_t *mctx, isc_entropy_t *entropy,
 
 static void
 initialize_lock(void) {
-	RUNTIME_CHECK(isc_rwlock_init(&createlock, 0, 0) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mutex_init(&createlock) == ISC_R_SUCCESS);
 }
 
 isc_result_t
@@ -221,12 +220,12 @@ isc_hash_create(isc_mem_t *mctx, isc_entropy_t *entropy, size_t limit) {
 
 	RUNTIME_CHECK(isc_once_do(&once, initialize_lock) == ISC_R_SUCCESS);
 
-	RWLOCK(&createlock, isc_rwlocktype_write);
+	LOCK(&createlock);
 
 	if (hash == NULL)
 		result = isc_hash_ctxcreate(mctx, entropy, limit, &hash);
 
-	RWUNLOCK(&createlock, isc_rwlocktype_write);
+	UNLOCK(&createlock);
 
 	return (result);
 }
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 78b19254..fd67d7bd 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,15 +15,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.c,v 1.28.12.3 2004/03/08 09:04:48 marka Exp $ */
+/* $Id: heap.c,v 1.28.12.4 2006/04/17 18:27:20 explorer Exp $ */
 
-/*
+/*! \file
  * Heap implementation of priority queues adapted from the following:
  *
- *	_Introduction to Algorithms_, Cormen, Leiserson, and Rivest,
+ *	\li "Introduction to Algorithms," Cormen, Leiserson, and Rivest,
  *	MIT Press / McGraw Hill, 1990, ISBN 0-262-03141-8, chapter 7.
  *
- *	_Algorithms_, Second Edition, Sedgewick, Addison-Wesley, 1988,
+ *	\li "Algorithms," Second Edition, Sedgewick, Addison-Wesley, 1988,
  *	ISBN 0-201-06673-4, chapter 11.
  */
 
@@ -35,20 +35,23 @@
 #include <isc/string.h>		/* Required for memcpy. */
 #include <isc/util.h>
 
-/*
+/*@{*/
+/*%
  * Note: to make heap_parent and heap_left easy to compute, the first
  * element of the heap array is not used; i.e. heap subscripts are 1-based,
- * not 0-based.
+ * not 0-based.  The parent is index/2, and the left-child is index*2.
+ * The right child is index*2+1.
  */
 #define heap_parent(i)			((i) >> 1)
 #define heap_left(i)			((i) << 1)
+/*@}*/
 
 #define SIZE_INCREMENT			1024
 
 #define HEAP_MAGIC			ISC_MAGIC('H', 'E', 'A', 'P')
 #define VALID_HEAP(h)			ISC_MAGIC_VALID(h, HEAP_MAGIC)
 
-/*
+/*%
  * When the heap is in a consistent state, the following invariant
  * holds true: for every element i > 1, heap_parent(i) has a priority
  * higher than or equal to that of i.
@@ -57,6 +60,7 @@
 			  ! heap->compare(heap->array[(i)], \
 					  heap->array[heap_parent(i)]))
 
+/*% ISC heap structure. */
 struct isc_heap {
 	unsigned int			magic;
 	isc_mem_t *			mctx;
@@ -141,8 +145,8 @@ static void
 float_up(isc_heap_t *heap, unsigned int i, void *elt) {
 	unsigned int p;
 
-	for (p = heap_parent(i);
-	     i > 1 && heap->compare(elt, heap->array[p]);
+	for (p = heap_parent(i) ;
+	     i > 1 && heap->compare(elt, heap->array[p]) ;
 	     i = p, p = heap_parent(i)) {
 		heap->array[i] = heap->array[p];
 		if (heap->index != NULL)
@@ -196,48 +200,48 @@ isc_heap_insert(isc_heap_t *heap, void *elt) {
 }
 
 void
-isc_heap_delete(isc_heap_t *heap, unsigned int i) {
+isc_heap_delete(isc_heap_t *heap, unsigned int index) {
 	void *elt;
 	isc_boolean_t less;
 
 	REQUIRE(VALID_HEAP(heap));
-	REQUIRE(i >= 1 && i <= heap->last);
+	REQUIRE(index >= 1 && index <= heap->last);
 
-	if (i == heap->last) {
+	if (index == heap->last) {
 		heap->last--;
 	} else {
 		elt = heap->array[heap->last--];
-		less = heap->compare(elt, heap->array[i]);
-		heap->array[i] = elt;
+		less = heap->compare(elt, heap->array[index]);
+		heap->array[index] = elt;
 		if (less)
-			float_up(heap, i, heap->array[i]);
+			float_up(heap, index, heap->array[index]);
 		else
-			sink_down(heap, i, heap->array[i]);
+			sink_down(heap, index, heap->array[index]);
 	}
 }
 
 void
-isc_heap_increased(isc_heap_t *heap, unsigned int i) {
+isc_heap_increased(isc_heap_t *heap, unsigned int index) {
 	REQUIRE(VALID_HEAP(heap));
-	REQUIRE(i >= 1 && i <= heap->last);
+	REQUIRE(index >= 1 && index <= heap->last);
 
-	float_up(heap, i, heap->array[i]);
+	float_up(heap, index, heap->array[index]);
 }
 
 void
-isc_heap_decreased(isc_heap_t *heap, unsigned int i) {
+isc_heap_decreased(isc_heap_t *heap, unsigned int index) {
 	REQUIRE(VALID_HEAP(heap));
-	REQUIRE(i >= 1 && i <= heap->last);
+	REQUIRE(index >= 1 && index <= heap->last);
 
-	sink_down(heap, i, heap->array[i]);
+	sink_down(heap, index, heap->array[index]);
 }
 
 void *
-isc_heap_element(isc_heap_t *heap, unsigned int i) {
+isc_heap_element(isc_heap_t *heap, unsigned int index) {
 	REQUIRE(VALID_HEAP(heap));
-	REQUIRE(i >= 1 && i <= heap->last);
+	REQUIRE(index >= 1 && index <= heap->last);
 
-	return (heap->array[i]);
+	return (heap->array[index]);
 }
 
 void
@@ -247,6 +251,6 @@ isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap) {
 	REQUIRE(VALID_HEAP(heap));
 	REQUIRE(action != NULL);
 
-	for (i = 1; i <= heap->last; i++)
+	for (i = 1 ; i <= heap->last ; i++)
 		(action)(heap->array[i], uap);
 }
diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 04dc8c5e..5166a98c 100644
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.c,v 1.5.12.3 2004/03/08 09:04:48 marka Exp $ */
+/* $Id: hmacmd5.c,v 1.5.12.5 2006/02/26 23:49:48 marka Exp $ */
 
 /*
  * This code implements the HMAC-MD5 keyed hash algorithm
@@ -65,7 +65,6 @@ void
 isc_hmacmd5_invalidate(isc_hmacmd5_t *ctx) {
 	isc_md5_invalidate(&ctx->md5ctx);
 	memset(ctx->key, 0, sizeof(ctx->key));
-	memset(ctx, 0, sizeof(ctx));
 }
 
 /*
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 5ebf4047..7c7f3c29 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,36 +15,155 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.h,v 1.16.206.1 2004/03/06 08:14:41 marka Exp $ */
+/* $Id: heap.h,v 1.16.206.2 2006/04/17 18:27:20 explorer Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1
 
+/*! \file */
+
 #include <isc/lang.h>
 #include <isc/types.h>
 
 ISC_LANG_BEGINDECLS
 
-/*
+/*%
  * The comparision function returns ISC_TRUE if the first argument has
  * higher priority than the second argument, and ISC_FALSE otherwise.
  */
 typedef isc_boolean_t (*isc_heapcompare_t)(void *, void *);
 
+/*%
+ * The index function allows the client of the heap to receive a callback
+ * when an item's index number changes.  This allows it to maintain
+ * sync with its external state, but still delete itself, since deletions
+ * from the heap require the index be provided.
+ */
 typedef void (*isc_heapindex_t)(void *, unsigned int);
+
+/*%
+ * The heapaction function is used when iterating over the heap.
+ *
+ * NOTE:  The heap structure CANNOT BE MODIFIED during the call to
+ * isc_heap_foreach().
+ */
 typedef void (*isc_heapaction_t)(void *, void *);
 
 typedef struct isc_heap isc_heap_t;
 
-isc_result_t	isc_heap_create(isc_mem_t *, isc_heapcompare_t,
-				isc_heapindex_t, unsigned int, isc_heap_t **);
-void		isc_heap_destroy(isc_heap_t **);
-isc_result_t	isc_heap_insert(isc_heap_t *, void *);
-void		isc_heap_delete(isc_heap_t *, unsigned int);
-void		isc_heap_increased(isc_heap_t *, unsigned int);
-void		isc_heap_decreased(isc_heap_t *, unsigned int);
-void *		isc_heap_element(isc_heap_t *, unsigned int);
-void		isc_heap_foreach(isc_heap_t *, isc_heapaction_t, void *);
+isc_result_t
+isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
+		isc_heapindex_t index, unsigned int size_increment,
+		isc_heap_t **heapp);
+/*!<
+ * \brief Create a new heap.  The heap is implemented using a space-efficient
+ * storage method.  When the heap elements are deleted space is not freed
+ * but will be reused when new elements are inserted.
+ *
+ * Requires:
+ *\li	"mctx" is valid.
+ *\li	"compare" is a function which takes two void * arguments and
+ *	returns ISC_TRUE if the first argument has a higher priority than
+ *	the second, and ISC_FALSE otherwise.
+ *\li	"index" is a function which takes a void *, and an unsigned int
+ *	argument.  This function will be called whenever an element's
+ *	index value changes, so it may continue to delete itself from the
+ *	heap.  This option may be NULL if this functionality is unneeded.
+ *\li	"size_increment" is a hint about how large the heap should grow
+ *	when resizing is needed.  If this is 0, a default size will be
+ *	used, which is currently 1024, allowing space for an additional 1024
+ *	heap elements to be inserted before adding more space.
+ *\li	"heapp" is not NULL, and "*heap" is NULL.
+ *
+ * Returns:
+ *\li	ISC_R_SUCCESS		- success
+ *\li	ISC_R_NOMEMORY		- insufficient memory
+ */
+
+void
+isc_heap_destroy(isc_heap_t **heapp);
+/*!<
+ * \brief Destroys a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+isc_result_t
+isc_heap_insert(isc_heap_t *heap, void *elt);
+/*!<
+ * \brief Inserts a new element into a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+void
+isc_heap_delete(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Deletes an element from a heap, by element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_increased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has increased.
+ * This function MUST be called whenever an element has increased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_decreased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has decreased.
+ * This function MUST be called whenever an element has decreased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void *
+isc_heap_element(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Returns the element for a specific element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ *
+ * Returns:
+ *\li	A pointer to the element for the element index.
+ */
+
+void
+isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap);
+/*!<
+ * \brief Iterate over the heap, calling an action for each element.  The
+ * order of iteration is not sorted.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"action" is not NULL, and is a function which takes two arguments.
+ *	The first is a void *, representing the element, and the second is
+ *	"uap" as provided to isc_heap_foreach.
+ *\li	"uap" is a caller-provided argument, and may be NULL.
+ *
+ * Note:
+ *\li	The heap structure CANNOT be modified during this iteration.  The only
+ *	safe function to call while iterating the heap is isc_heap_element().
+ */
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 1ffbca64..88e45940 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.h,v 1.35.12.8 2005/07/29 00:13:10 marka Exp $ */
+/* $Id: sockaddr.h,v 1.35.12.10 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
@@ -141,7 +141,7 @@ isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port);
  */
 
 in_port_t
-isc_sockaddr_getport(isc_sockaddr_t *sockaddr);
+isc_sockaddr_getport(const isc_sockaddr_t *sockaddr);
 /*
  * Get the port stored in 'sockaddr'.
  */
@@ -168,25 +168,25 @@ isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size);
  */
 
 isc_boolean_t
-isc_sockaddr_ismulticast(isc_sockaddr_t *sa);
+isc_sockaddr_ismulticast(const isc_sockaddr_t *sa);
 /*
  * Returns ISC_TRUE if the address is a multicast address.
  */
 
 isc_boolean_t
-isc_sockaddr_isexperimental(isc_sockaddr_t *sa);
+isc_sockaddr_isexperimental(const isc_sockaddr_t *sa);
 /*
  * Returns ISC_TRUE if the address is a experimental (CLASS E) address.
  */
 
 isc_boolean_t
-isc_sockaddr_islinklocal(isc_sockaddr_t *sa);
+isc_sockaddr_islinklocal(const isc_sockaddr_t *sa);
 /*
  * Returns ISC_TRUE if the address is a link local addresss.
  */
 
 isc_boolean_t
-isc_sockaddr_issitelocal(isc_sockaddr_t *sa);
+isc_sockaddr_issitelocal(const isc_sockaddr_t *sa);
 /*
  * Returns ISC_TRUE if the address is a sitelocal address.
  */
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index d8dbd210..b22fe815 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.16.206.1 2004/03/06 08:14:49 marka Exp $ */
+/* $Id: symtab.h,v 1.16.206.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef ISC_SYMTAB_H
 #define ISC_SYMTAB_H 1
@@ -88,6 +88,7 @@
 
 typedef union isc_symvalue {
 	void *				as_pointer;
+	const void *			as_cpointer;
 	int				as_integer;
 	unsigned int			as_uinteger;
 } isc_symvalue_t;
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index bb832dd0..3511d6bd 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.66.2.6.2.8 2004/08/28 06:25:21 marka Exp $ */
+/* $Id: lex.c,v 1.66.2.6.2.10 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -372,9 +372,6 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 	source = HEAD(lex->sources);
 	REQUIRE(tokenp != NULL);
 
-	lex->saved_paren_count = lex->paren_count;
-	source->saved_line = source->line;
-
 	if (source == NULL) {
 		if ((options & ISC_LEXOPT_NOMORE) != 0) {
 			tokenp->type = isc_tokentype_nomore;
@@ -386,6 +383,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 	if (source->result != ISC_R_SUCCESS)
 		return (source->result);
 
+	lex->saved_paren_count = lex->paren_count;
+	source->saved_line = source->line;
+
 	if (isc_buffer_remaininglength(source->pushback) == 0 &&
 	    source->at_eof)
 	{
@@ -633,9 +633,13 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 			remaining--;
 			break;
 		case lexstate_string:
-			if ((!escaped &&
-			     (c == ' ' || c == '\t' || lex->specials[c])) ||
-			    c == '\r' || c == '\n' || c == EOF) {
+			/*
+			 * EOF needs to be checked before lex->specials[c]
+			 * as lex->specials[EOF] is not a good idea.
+			 */
+			if (c == '\r' || c == '\n' || c == EOF ||
+			    (!escaped &&
+			     (c == ' ' || c == '\t' || lex->specials[c]))) {
 				pushback(source, c);
 				if (source->result != ISC_R_SUCCESS) {
 					result = source->result;
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 247b2533..511573bc 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.70.2.8.2.12 2004/06/11 00:35:38 marka Exp $ */
+/* $Id: log.c,v 1.70.2.8.2.14 2006/03/02 00:37:20 marka Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -1728,8 +1728,9 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 				syslog_level = syslog_map[-level];
 
 			(void)syslog(FACILITY(channel) | syslog_level,
-			       "%s%s%s%s%s%s%s%s%s",
+			       "%s%s%s%s%s%s%s%s%s%s",
 			       printtime     ? time_string	: "",
+			       printtime     ? " "		: "",
 			       printtag      ? lcfg->tag	: "",
 			       printtag      ? ": "		: "",
 			       printcategory ? category->name	: "",
diff --git a/lib/isc/print.c b/lib/isc/print.c
index 6542fe4f..ee50b29e 100644
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,12 +15,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.22.2.3.2.3 2004/03/06 08:14:33 marka Exp $ */
+/* $Id: print.c,v 1.22.2.3.2.4 2006/04/17 18:27:20 explorer Exp $ */
+
+/*! \file */
 
 #include <config.h>
 
 #include <ctype.h>
-#include <stdio.h>		/* for sprintf */
+#include <stdio.h>		/* for sprintf() */
+#include <string.h>		/* for strlen() */
 
 #define	ISC__PRINT_SOURCE	/* Used to get the isc_print_* prototypes. */
 
@@ -41,7 +44,7 @@ isc_print_sprintf(char *str, const char *format, ...) {
 	return (strlen(str));
 }
 
-/*
+/*!
  * Return length of string that would have been written if not truncated.
  */
 
@@ -57,7 +60,7 @@ isc_print_snprintf(char *str, size_t size, const char *format, ...) {
 
 }
 
-/*
+/*!
  * Return length of string that would have been written if not truncated.
  */
 
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 4c47e4e0..a40f0c9c 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.48.2.1.2.10 2004/05/15 03:46:12 jinmei Exp $ */
+/* $Id: sockaddr.c,v 1.48.2.1.2.12 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -400,7 +400,7 @@ isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) {
 }
 
 in_port_t
-isc_sockaddr_getport(isc_sockaddr_t *sockaddr) {
+isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) {
 	in_port_t port = 0;
 
 	switch (sockaddr->type.sa.sa_family) {
@@ -422,7 +422,7 @@ isc_sockaddr_getport(isc_sockaddr_t *sockaddr) {
 }
 
 isc_boolean_t
-isc_sockaddr_ismulticast(isc_sockaddr_t *sockaddr) {
+isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) {
 	isc_netaddr_t netaddr;
 
 	isc_netaddr_fromsockaddr(&netaddr, sockaddr);
@@ -430,7 +430,7 @@ isc_sockaddr_ismulticast(isc_sockaddr_t *sockaddr) {
 }
 
 isc_boolean_t
-isc_sockaddr_isexperimental(isc_sockaddr_t *sockaddr) {
+isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) {
 	isc_netaddr_t netaddr;
 
 	if (sockaddr->type.sa.sa_family == AF_INET) {
@@ -441,7 +441,7 @@ isc_sockaddr_isexperimental(isc_sockaddr_t *sockaddr) {
 }
 
 isc_boolean_t
-isc_sockaddr_issitelocal(isc_sockaddr_t *sockaddr) {
+isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) {
 	isc_netaddr_t netaddr;
 
 	if (sockaddr->type.sa.sa_family == AF_INET6) {
@@ -452,7 +452,7 @@ isc_sockaddr_issitelocal(isc_sockaddr_t *sockaddr) {
 }
 
 isc_boolean_t
-isc_sockaddr_islinklocal(isc_sockaddr_t *sockaddr) {
+isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) {
 	isc_netaddr_t netaddr;
 
 	if (sockaddr->type.sa.sa_family == AF_INET6) {
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index 0b400bf7..a3931a9f 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.10.12.3 2004/03/08 09:04:50 marka Exp $ */
+/* $Id: taskpool.c,v 1.10.12.5 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -52,6 +52,10 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
 	pool->mctx = mctx;
 	pool->ntasks = ntasks;
 	pool->tasks = isc_mem_get(mctx, ntasks * sizeof(isc_task_t *));
+	if (pool->tasks == NULL) {
+		isc_mem_put(mctx, pool, sizeof(*pool));
+		return (ISC_R_NOMEMORY);
+	}
 	for (i = 0; i < ntasks; i++)
 		pool->tasks[i] = NULL;
 	for (i = 0; i < ntasks; i++) {
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 54260793..6a6acf6b 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.64.12.11 2005/10/27 00:27:29 marka Exp $ */
+/* $Id: timer.c,v 1.64.12.13 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -212,9 +212,10 @@ schedule(isc_timer_t *timer, isc_time_t *now, isc_boolean_t signal_ok) {
 		isc_time_t then;
 
 		isc_interval_set(&fifteen, 15, 0);
-		isc_time_add(&manager->due, &fifteen, &then);
+		result = isc_time_add(&manager->due, &fifteen, &then);
 
-		if (isc_time_compare(&then, now) < 0) {
+		if (result == ISC_R_SUCCESS &&
+		    isc_time_compare(&then, now) < 0) {
 			SIGNAL(&manager->wakeup);
 			signal_ok = ISC_FALSE;
 			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
@@ -347,8 +348,10 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
 
 	if (type == isc_timertype_once && !isc_interval_iszero(interval)) {
 		result = isc_time_add(&now, interval, &timer->idle);
-		if (result != ISC_R_SUCCESS)
+		if (result != ISC_R_SUCCESS) {
+			isc_mem_put(manager->mctx, timer, sizeof(*timer));
 			return (result);
+		}
 	} else
 		isc_time_settoepoch(&timer->idle);
 
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 50506634..d52849aa 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.60.2.3.8.11 2005/07/12 05:47:43 marka Exp $ */
+/* $Id: entropy.c,v 1.60.2.3.8.14 2006/03/02 23:29:17 marka Exp $ */
 
 /*
  * This is the system depenedent part of the ISC entropy API.
@@ -127,7 +127,7 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
 		switch ( source->sources.usocket.status ) {
 		case isc_usocketsource_ndesired:
 			buf[0] = ndesired;
-			if ((n = send(fd, buf, 1, 0)) < 0) {
+			if ((n = sendto(fd, buf, 1, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -142,7 +142,7 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
 		case isc_usocketsource_connected:
 			buf[0] = 1;
 			buf[1] = ndesired;
-			if ((n = send(fd, buf, 2, 0)) < 0) {
+			if ((n = sendto(fd, buf, 2, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -159,12 +159,12 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
 			/*FALLTHROUGH*/
 		
 		case isc_usocketsource_wrote:
-			if (recv(fd, buf, 1, 0) != 1) {
+			if (recvfrom(fd, buf, 1, 0, NULL, NULL) != 1) {
 				if (errno == EAGAIN) {
 					/*
 					 * The problem of EAGAIN (try again
 					 * later) is a major issue on HP-UX.
-					 * Solaris actually tries the recv
+					 * Solaris actually tries the recvfrom
 					 * call again, while HP-UX just dies. 
 					 * This code is an attempt to let the
 					 * entropy pool fill back up (at least
@@ -503,7 +503,7 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) {
 	if (S_ISSOCK(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
-#if defined(S_ISFIFO)
+#if defined(S_ISFIFO) && defined(sun)
 	if (S_ISFIFO(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 0b01b96f..68a13651 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.17 2005/10/14 02:13:07 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.19 2006/02/03 23:51:37 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -529,7 +529,8 @@ internal_current4(isc_interfaceiter_t *iter) {
 #endif
 
 	REQUIRE(VALID_IFITER(iter));
-	REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len);
+	REQUIRE(iter->ifc.ifc_len == 0 ||
+		iter->pos < (unsigned int) iter->ifc.ifc_len);
 
 #ifdef __linux
 	result = linux_if_inet6_current(iter);
@@ -538,6 +539,9 @@ internal_current4(isc_interfaceiter_t *iter) {
 	iter->first = ISC_TRUE;
 #endif
 
+	if (iter->ifc.ifc_len == 0)
+		return (ISC_R_NOMORE);
+
 	ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
 
 	memset(&ifreq, 0, sizeof(ifreq));
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 595990f9..f95e3c8f 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.22 2005/11/03 23:08:42 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.26 2006/05/19 02:53:36 marka Exp $ */
 
 #include <config.h>
 
@@ -109,7 +109,7 @@ typedef isc_event_t intev_t;
  * to collect the destination address and interface so the client can
  * set them on outgoing packets.
  */
-#ifdef ISC_PLATFORM_HAVEIPV6
+#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 #ifndef USE_CMSG
 #define USE_CMSG	1
 #endif
@@ -747,8 +747,26 @@ build_msghdr_recv(isc_socket_t *sock, isc_socketevent_t *dev,
 
 	if (sock->type == isc_sockettype_udp) {
 		memset(&dev->address, 0, sizeof(dev->address));
+#ifdef BROKEN_RECVMSG
+		if (sock->pf == AF_INET) {
+			msg->msg_name = (void *)&dev->address.type.sin;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+		} else if (sock->pf == AF_INET6) {
+			msg->msg_name = (void *)&dev->address.type.sin6;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+#ifdef ISC_PLATFORM_HAVESYSUNH
+		} else if (sock->pf == AF_UNIX) {
+			msg->msg_name = (void *)&dev->address.type.sunix;
+			msg->msg_namelen = sizeof(dev->address.type.sunix);
+#endif
+		} else {
+			msg->msg_name = (void *)&dev->address.type.sa;
+			msg->msg_namelen = sizeof(dev->address.type);
+		}
+#else
 		msg->msg_name = (void *)&dev->address.type.sa;
 		msg->msg_namelen = sizeof(dev->address.type);
+#endif
 #ifdef ISC_NET_RECVOVERFLOW
 		/* If needed, steal one iovec for overflow detection. */
 		maxiov--;
@@ -921,6 +939,10 @@ doio_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
 	cc = recvmsg(sock->fd, &msghdr, 0);
 	recv_errno = errno;
 
+#if defined(ISC_SOCKET_DEBUG)
+	dump_msg(&msghdr);
+#endif
+
 	if (cc < 0) {
 		if (SOFT_ERROR(recv_errno))
 			return (DOIO_SOFT);
@@ -2681,8 +2703,8 @@ socket_send(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task,
 		dev->attributes |= ISC_SOCKEVENTATTR_PKTINFO;
 		dev->pktinfo = *pktinfo;
 
-		if (!isc_sockaddr_issitelocal(address) &&
-		    !isc_sockaddr_islinklocal(address)) {
+		if (!isc_sockaddr_issitelocal(&dev->address) &&
+		    !isc_sockaddr_islinklocal(&dev->address)) {
 			socket_log(sock, NULL, TRACE, isc_msgcat,
 				   ISC_MSGSET_SOCKET, ISC_MSG_PKTINFOPROVIDED,
 				   "pktinfo structure provided, ifindex %u "
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index b24fbade..0ddefcb6 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.17.206.1 2004/03/06 08:15:06 marka Exp $ */
+/* $Id: condition.c,v 1.17.206.3 2006/02/13 23:50:52 marka Exp $ */
 
 #include <config.h>
 
@@ -91,6 +91,7 @@ isc_result_t
 isc_condition_destroy(isc_condition_t *cond) {
 
 	REQUIRE(cond != NULL);
+	REQUIRE(cond->waiters == 0);
 
 	(void)CloseHandle(cond->events[LSIGNAL]);
 	(void)CloseHandle(cond->events[LBROADCAST]);
@@ -98,6 +99,15 @@ isc_condition_destroy(isc_condition_t *cond) {
 	return (ISC_R_SUCCESS);
 }
 
+/*
+ * This is always called when the mutex (lock) is held, but because
+ * we are waiting we need to release it and reacquire it as soon as the wait
+ * is over. This allows other threads to make use of the object guarded
+ * by the mutex but it should never try to delete it as long as the
+ * number of waiters > 0. Always reacquire the mutex regardless of the
+ * result of the wait. Note that EnterCriticalSection will wait to acquire
+ * the mutex.
+ */
 static isc_result_t
 wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) {
 	DWORD result;
@@ -105,16 +115,15 @@ wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) {
 	cond->waiters++;
 	LeaveCriticalSection(mutex);
 	result = WaitForMultipleObjects(2, cond->events, FALSE, milliseconds);
+	EnterCriticalSection(mutex);
+	cond->waiters--;
 	if (result == WAIT_FAILED) {
 		/* XXX */
 		return (ISC_R_UNEXPECTED);
 	}
-	EnterCriticalSection(mutex);
-	cond->waiters--;
 	if (cond->waiters == 0 &&
 	    !ResetEvent(cond->events[LBROADCAST])) {
 		/* XXX */
-		LeaveCriticalSection(mutex);
 		return (ISC_R_UNEXPECTED);
 	}
 
diff --git a/lib/isc/win32/libisc.dsw b/lib/isc/win32/libisc.dsw
index 49c089c8..c66c56e5 100644
--- a/lib/isc/win32/libisc.dsw
+++ b/lib/isc/win32/libisc.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libisc"=".\libisc.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libisc"=".\libisc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 25b72a94..cba3a9fe 100644
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -1,1692 +1,1692 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libisc.dsp

-!IF "$(CFG)" == ""

-CFG=libisc - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to libisc - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "libisc - Win32 Release" && "$(CFG)" != "libisc - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libisc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libisc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\libisc.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\app.obj"

-	-@erase "$(INTDIR)\assertions.obj"

-	-@erase "$(INTDIR)\base64.obj"

-	-@erase "$(INTDIR)\bitstring.obj"

-	-@erase "$(INTDIR)\buffer.obj"

-	-@erase "$(INTDIR)\bufferlist.obj"

-	-@erase "$(INTDIR)\commandline.obj"

-	-@erase "$(INTDIR)\condition.obj"

-	-@erase "$(INTDIR)\dir.obj"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\entropy.obj"

-	-@erase "$(INTDIR)\errno2result.obj"

-	-@erase "$(INTDIR)\error.obj"

-	-@erase "$(INTDIR)\event.obj"

-	-@erase "$(INTDIR)\file.obj"

-	-@erase "$(INTDIR)\fsaccess.obj"

-	-@erase "$(INTDIR)\hash.obj"

-	-@erase "$(INTDIR)\heap.obj"

-	-@erase "$(INTDIR)\hex.obj"

-	-@erase "$(INTDIR)\hmacmd5.obj"

-	-@erase "$(INTDIR)\inet_aton.obj"

-	-@erase "$(INTDIR)\inet_ntop.obj"

-	-@erase "$(INTDIR)\inet_pton.obj"

-	-@erase "$(INTDIR)\interfaceiter.obj"

-	-@erase "$(INTDIR)\ipv6.obj"

-	-@erase "$(INTDIR)\keyboard.obj"

-	-@erase "$(INTDIR)\lex.obj"

-	-@erase "$(INTDIR)\lfsr.obj"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\md5.obj"

-	-@erase "$(INTDIR)\mem.obj"

-	-@erase "$(INTDIR)\msgcat.obj"

-	-@erase "$(INTDIR)\mutexblock.obj"

-	-@erase "$(INTDIR)\net.obj"

-	-@erase "$(INTDIR)\netaddr.obj"

-	-@erase "$(INTDIR)\netscope.obj"

-	-@erase "$(INTDIR)\ntpaths.obj"

-	-@erase "$(INTDIR)\once.obj"

-	-@erase "$(INTDIR)\ondestroy.obj"

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\parseint.obj"

-	-@erase "$(INTDIR)\quota.obj"

-	-@erase "$(INTDIR)\random.obj"

-	-@erase "$(INTDIR)\ratelimiter.obj"

-	-@erase "$(INTDIR)\region.obj"

-	-@erase "$(INTDIR)\resource.obj"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\rwlock.obj"

-	-@erase "$(INTDIR)\serial.obj"

-	-@erase "$(INTDIR)\sha1.obj"

-	-@erase "$(INTDIR)\sockaddr.obj"

-	-@erase "$(INTDIR)\socket.obj"

-	-@erase "$(INTDIR)\stdio.obj"

-	-@erase "$(INTDIR)\stdtime.obj"

-	-@erase "$(INTDIR)\strerror.obj"

-	-@erase "$(INTDIR)\string.obj"

-	-@erase "$(INTDIR)\symtab.obj"

-	-@erase "$(INTDIR)\syslog.obj"

-	-@erase "$(INTDIR)\task.obj"

-	-@erase "$(INTDIR)\taskpool.obj"

-	-@erase "$(INTDIR)\thread.obj"

-	-@erase "$(INTDIR)\time.obj"

-	-@erase "$(INTDIR)\timer.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\win32os.obj"

-	-@erase "$(OUTDIR)\libisc.exp"

-	-@erase "$(OUTDIR)\libisc.lib"

-	-@erase "..\..\..\Build\Release\libisc.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" /machine:I386 /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" 

-DEF_FILE= \

-	".\libisc.def"

-LINK32_OBJS= \

-	"$(INTDIR)\app.obj" \

-	"$(INTDIR)\condition.obj" \

-	"$(INTDIR)\dir.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\entropy.obj" \

-	"$(INTDIR)\errno2result.obj" \

-	"$(INTDIR)\file.obj" \

-	"$(INTDIR)\fsaccess.obj" \

-	"$(INTDIR)\interfaceiter.obj" \

-	"$(INTDIR)\ipv6.obj" \

-	"$(INTDIR)\keyboard.obj" \

-	"$(INTDIR)\net.obj" \

-	"$(INTDIR)\ntpaths.obj" \

-	"$(INTDIR)\once.obj" \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\resource.obj" \

-	"$(INTDIR)\socket.obj" \

-	"$(INTDIR)\stdio.obj" \

-	"$(INTDIR)\stdtime.obj" \

-	"$(INTDIR)\strerror.obj" \

-	"$(INTDIR)\syslog.obj" \

-	"$(INTDIR)\thread.obj" \

-	"$(INTDIR)\time.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\win32os.obj" \

-	"$(INTDIR)\assertions.obj" \

-	"$(INTDIR)\base64.obj" \

-	"$(INTDIR)\bitstring.obj" \

-	"$(INTDIR)\buffer.obj" \

-	"$(INTDIR)\bufferlist.obj" \

-	"$(INTDIR)\commandline.obj" \

-	"$(INTDIR)\error.obj" \

-	"$(INTDIR)\event.obj" \

-	"$(INTDIR)\hash.obj" \

-	"$(INTDIR)\heap.obj" \

-	"$(INTDIR)\hex.obj" \

-	"$(INTDIR)\hmacmd5.obj" \

-	"$(INTDIR)\inet_aton.obj" \

-	"$(INTDIR)\inet_ntop.obj" \

-	"$(INTDIR)\inet_pton.obj" \

-	"$(INTDIR)\lex.obj" \

-	"$(INTDIR)\lfsr.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\md5.obj" \

-	"$(INTDIR)\mem.obj" \

-	"$(INTDIR)\msgcat.obj" \

-	"$(INTDIR)\mutexblock.obj" \

-	"$(INTDIR)\netaddr.obj" \

-	"$(INTDIR)\netscope.obj" \

-	"$(INTDIR)\ondestroy.obj" \

-	"$(INTDIR)\quota.obj" \

-	"$(INTDIR)\random.obj" \

-	"$(INTDIR)\ratelimiter.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\rwlock.obj" \

-	"$(INTDIR)\serial.obj" \

-	"$(INTDIR)\sha1.obj" \

-	"$(INTDIR)\sockaddr.obj" \

-	"$(INTDIR)\string.obj" \

-	"$(INTDIR)\symtab.obj" \

-	"$(INTDIR)\task.obj" \

-	"$(INTDIR)\taskpool.obj" \

-	"$(INTDIR)\timer.obj" \

-	"$(INTDIR)\parseint.obj" \

-	"$(INTDIR)\region.obj"

-

-"..\..\..\Build\Release\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\libisc.dll" "$(OUTDIR)\libisc.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\app.obj"

-	-@erase "$(INTDIR)\app.sbr"

-	-@erase "$(INTDIR)\assertions.obj"

-	-@erase "$(INTDIR)\assertions.sbr"

-	-@erase "$(INTDIR)\base64.obj"

-	-@erase "$(INTDIR)\base64.sbr"

-	-@erase "$(INTDIR)\bitstring.obj"

-	-@erase "$(INTDIR)\bitstring.sbr"

-	-@erase "$(INTDIR)\buffer.obj"

-	-@erase "$(INTDIR)\buffer.sbr"

-	-@erase "$(INTDIR)\bufferlist.obj"

-	-@erase "$(INTDIR)\bufferlist.sbr"

-	-@erase "$(INTDIR)\commandline.obj"

-	-@erase "$(INTDIR)\commandline.sbr"

-	-@erase "$(INTDIR)\condition.obj"

-	-@erase "$(INTDIR)\condition.sbr"

-	-@erase "$(INTDIR)\dir.obj"

-	-@erase "$(INTDIR)\dir.sbr"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\entropy.obj"

-	-@erase "$(INTDIR)\entropy.sbr"

-	-@erase "$(INTDIR)\errno2result.obj"

-	-@erase "$(INTDIR)\errno2result.sbr"

-	-@erase "$(INTDIR)\error.obj"

-	-@erase "$(INTDIR)\error.sbr"

-	-@erase "$(INTDIR)\event.obj"

-	-@erase "$(INTDIR)\event.sbr"

-	-@erase "$(INTDIR)\file.obj"

-	-@erase "$(INTDIR)\file.sbr"

-	-@erase "$(INTDIR)\fsaccess.obj"

-	-@erase "$(INTDIR)\fsaccess.sbr"

-	-@erase "$(INTDIR)\hash.obj"

-	-@erase "$(INTDIR)\hash.sbr"

-	-@erase "$(INTDIR)\heap.obj"

-	-@erase "$(INTDIR)\heap.sbr"

-	-@erase "$(INTDIR)\hex.obj"

-	-@erase "$(INTDIR)\hex.sbr"

-	-@erase "$(INTDIR)\hmacmd5.obj"

-	-@erase "$(INTDIR)\hmacmd5.sbr"

-	-@erase "$(INTDIR)\inet_aton.obj"

-	-@erase "$(INTDIR)\inet_aton.sbr"

-	-@erase "$(INTDIR)\inet_ntop.obj"

-	-@erase "$(INTDIR)\inet_ntop.sbr"

-	-@erase "$(INTDIR)\inet_pton.obj"

-	-@erase "$(INTDIR)\inet_pton.sbr"

-	-@erase "$(INTDIR)\interfaceiter.obj"

-	-@erase "$(INTDIR)\interfaceiter.sbr"

-	-@erase "$(INTDIR)\ipv6.obj"

-	-@erase "$(INTDIR)\ipv6.sbr"

-	-@erase "$(INTDIR)\keyboard.obj"

-	-@erase "$(INTDIR)\keyboard.sbr"

-	-@erase "$(INTDIR)\lex.obj"

-	-@erase "$(INTDIR)\lex.sbr"

-	-@erase "$(INTDIR)\lfsr.obj"

-	-@erase "$(INTDIR)\lfsr.sbr"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\lib.sbr"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\log.sbr"

-	-@erase "$(INTDIR)\md5.obj"

-	-@erase "$(INTDIR)\md5.sbr"

-	-@erase "$(INTDIR)\mem.obj"

-	-@erase "$(INTDIR)\mem.sbr"

-	-@erase "$(INTDIR)\msgcat.obj"

-	-@erase "$(INTDIR)\msgcat.sbr"

-	-@erase "$(INTDIR)\mutexblock.obj"

-	-@erase "$(INTDIR)\mutexblock.sbr"

-	-@erase "$(INTDIR)\net.obj"

-	-@erase "$(INTDIR)\net.sbr"

-	-@erase "$(INTDIR)\netaddr.obj"

-	-@erase "$(INTDIR)\netaddr.sbr"

-	-@erase "$(INTDIR)\netscope.obj"

-	-@erase "$(INTDIR)\netscope.sbr"

-	-@erase "$(INTDIR)\ntpaths.obj"

-	-@erase "$(INTDIR)\ntpaths.sbr"

-	-@erase "$(INTDIR)\once.obj"

-	-@erase "$(INTDIR)\once.sbr"

-	-@erase "$(INTDIR)\ondestroy.obj"

-	-@erase "$(INTDIR)\ondestroy.sbr"

-	-@erase "$(INTDIR)\os.obj"

-	-@erase "$(INTDIR)\os.sbr"

-	-@erase "$(INTDIR)\parseint.obj"

-	-@erase "$(INTDIR)\parseint.sbr"

-	-@erase "$(INTDIR)\quota.obj"

-	-@erase "$(INTDIR)\quota.sbr"

-	-@erase "$(INTDIR)\random.obj"

-	-@erase "$(INTDIR)\random.sbr"

-	-@erase "$(INTDIR)\ratelimiter.obj"

-	-@erase "$(INTDIR)\ratelimiter.sbr"

-	-@erase "$(INTDIR)\region.obj"

-	-@erase "$(INTDIR)\region.sbr"

-	-@erase "$(INTDIR)\resource.obj"

-	-@erase "$(INTDIR)\resource.sbr"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\result.sbr"

-	-@erase "$(INTDIR)\rwlock.obj"

-	-@erase "$(INTDIR)\rwlock.sbr"

-	-@erase "$(INTDIR)\serial.obj"

-	-@erase "$(INTDIR)\serial.sbr"

-	-@erase "$(INTDIR)\sha1.obj"

-	-@erase "$(INTDIR)\sha1.sbr"

-	-@erase "$(INTDIR)\sockaddr.obj"

-	-@erase "$(INTDIR)\sockaddr.sbr"

-	-@erase "$(INTDIR)\socket.obj"

-	-@erase "$(INTDIR)\socket.sbr"

-	-@erase "$(INTDIR)\stdio.obj"

-	-@erase "$(INTDIR)\stdio.sbr"

-	-@erase "$(INTDIR)\stdtime.obj"

-	-@erase "$(INTDIR)\stdtime.sbr"

-	-@erase "$(INTDIR)\strerror.obj"

-	-@erase "$(INTDIR)\strerror.sbr"

-	-@erase "$(INTDIR)\string.obj"

-	-@erase "$(INTDIR)\string.sbr"

-	-@erase "$(INTDIR)\symtab.obj"

-	-@erase "$(INTDIR)\symtab.sbr"

-	-@erase "$(INTDIR)\syslog.obj"

-	-@erase "$(INTDIR)\syslog.sbr"

-	-@erase "$(INTDIR)\task.obj"

-	-@erase "$(INTDIR)\task.sbr"

-	-@erase "$(INTDIR)\taskpool.obj"

-	-@erase "$(INTDIR)\taskpool.sbr"

-	-@erase "$(INTDIR)\thread.obj"

-	-@erase "$(INTDIR)\thread.sbr"

-	-@erase "$(INTDIR)\time.obj"

-	-@erase "$(INTDIR)\time.sbr"

-	-@erase "$(INTDIR)\timer.obj"

-	-@erase "$(INTDIR)\timer.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(INTDIR)\win32os.obj"

-	-@erase "$(INTDIR)\win32os.sbr"

-	-@erase "$(OUTDIR)\libisc.bsc"

-	-@erase "$(OUTDIR)\libisc.exp"

-	-@erase "$(OUTDIR)\libisc.lib"

-	-@erase "$(OUTDIR)\libisc.map"

-	-@erase "$(OUTDIR)\libisc.pdb"

-	-@erase "..\..\..\Build\Debug\libisc.dll"

-	-@erase "..\..\..\Build\Debug\libisc.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\app.sbr" \

-	"$(INTDIR)\condition.sbr" \

-	"$(INTDIR)\dir.sbr" \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\entropy.sbr" \

-	"$(INTDIR)\errno2result.sbr" \

-	"$(INTDIR)\file.sbr" \

-	"$(INTDIR)\fsaccess.sbr" \

-	"$(INTDIR)\interfaceiter.sbr" \

-	"$(INTDIR)\ipv6.sbr" \

-	"$(INTDIR)\keyboard.sbr" \

-	"$(INTDIR)\net.sbr" \

-	"$(INTDIR)\ntpaths.sbr" \

-	"$(INTDIR)\once.sbr" \

-	"$(INTDIR)\os.sbr" \

-	"$(INTDIR)\resource.sbr" \

-	"$(INTDIR)\socket.sbr" \

-	"$(INTDIR)\stdio.sbr" \

-	"$(INTDIR)\stdtime.sbr" \

-	"$(INTDIR)\strerror.sbr" \

-	"$(INTDIR)\syslog.sbr" \

-	"$(INTDIR)\thread.sbr" \

-	"$(INTDIR)\time.sbr" \

-	"$(INTDIR)\version.sbr" \

-	"$(INTDIR)\win32os.sbr" \

-	"$(INTDIR)\assertions.sbr" \

-	"$(INTDIR)\base64.sbr" \

-	"$(INTDIR)\bitstring.sbr" \

-	"$(INTDIR)\buffer.sbr" \

-	"$(INTDIR)\bufferlist.sbr" \

-	"$(INTDIR)\commandline.sbr" \

-	"$(INTDIR)\error.sbr" \

-	"$(INTDIR)\event.sbr" \

-	"$(INTDIR)\hash.sbr" \

-	"$(INTDIR)\heap.sbr" \

-	"$(INTDIR)\hex.sbr" \

-	"$(INTDIR)\hmacmd5.sbr" \

-	"$(INTDIR)\inet_aton.sbr" \

-	"$(INTDIR)\inet_ntop.sbr" \

-	"$(INTDIR)\inet_pton.sbr" \

-	"$(INTDIR)\lex.sbr" \

-	"$(INTDIR)\lfsr.sbr" \

-	"$(INTDIR)\lib.sbr" \

-	"$(INTDIR)\log.sbr" \

-	"$(INTDIR)\md5.sbr" \

-	"$(INTDIR)\mem.sbr" \

-	"$(INTDIR)\msgcat.sbr" \

-	"$(INTDIR)\mutexblock.sbr" \

-	"$(INTDIR)\netaddr.sbr" \

-	"$(INTDIR)\netscope.sbr" \

-	"$(INTDIR)\ondestroy.sbr" \

-	"$(INTDIR)\quota.sbr" \

-	"$(INTDIR)\random.sbr" \

-	"$(INTDIR)\ratelimiter.sbr" \

-	"$(INTDIR)\result.sbr" \

-	"$(INTDIR)\rwlock.sbr" \

-	"$(INTDIR)\serial.sbr" \

-	"$(INTDIR)\sha1.sbr" \

-	"$(INTDIR)\sockaddr.sbr" \

-	"$(INTDIR)\string.sbr" \

-	"$(INTDIR)\symtab.sbr" \

-	"$(INTDIR)\task.sbr" \

-	"$(INTDIR)\taskpool.sbr" \

-	"$(INTDIR)\timer.sbr" \

-	"$(INTDIR)\parseint.sbr" \

-	"$(INTDIR)\region.sbr"

-

-"$(OUTDIR)\libisc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug /machine:I386 /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\libisc.def"

-LINK32_OBJS= \

-	"$(INTDIR)\app.obj" \

-	"$(INTDIR)\condition.obj" \

-	"$(INTDIR)\dir.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\entropy.obj" \

-	"$(INTDIR)\errno2result.obj" \

-	"$(INTDIR)\file.obj" \

-	"$(INTDIR)\fsaccess.obj" \

-	"$(INTDIR)\interfaceiter.obj" \

-	"$(INTDIR)\ipv6.obj" \

-	"$(INTDIR)\keyboard.obj" \

-	"$(INTDIR)\net.obj" \

-	"$(INTDIR)\ntpaths.obj" \

-	"$(INTDIR)\once.obj" \

-	"$(INTDIR)\os.obj" \

-	"$(INTDIR)\resource.obj" \

-	"$(INTDIR)\socket.obj" \

-	"$(INTDIR)\stdio.obj" \

-	"$(INTDIR)\stdtime.obj" \

-	"$(INTDIR)\strerror.obj" \

-	"$(INTDIR)\syslog.obj" \

-	"$(INTDIR)\thread.obj" \

-	"$(INTDIR)\time.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\win32os.obj" \

-	"$(INTDIR)\assertions.obj" \

-	"$(INTDIR)\base64.obj" \

-	"$(INTDIR)\bitstring.obj" \

-	"$(INTDIR)\buffer.obj" \

-	"$(INTDIR)\bufferlist.obj" \

-	"$(INTDIR)\commandline.obj" \

-	"$(INTDIR)\error.obj" \

-	"$(INTDIR)\event.obj" \

-	"$(INTDIR)\hash.obj" \

-	"$(INTDIR)\heap.obj" \

-	"$(INTDIR)\hex.obj" \

-	"$(INTDIR)\hmacmd5.obj" \

-	"$(INTDIR)\inet_aton.obj" \

-	"$(INTDIR)\inet_ntop.obj" \

-	"$(INTDIR)\inet_pton.obj" \

-	"$(INTDIR)\lex.obj" \

-	"$(INTDIR)\lfsr.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\md5.obj" \

-	"$(INTDIR)\mem.obj" \

-	"$(INTDIR)\msgcat.obj" \

-	"$(INTDIR)\mutexblock.obj" \

-	"$(INTDIR)\netaddr.obj" \

-	"$(INTDIR)\netscope.obj" \

-	"$(INTDIR)\ondestroy.obj" \

-	"$(INTDIR)\quota.obj" \

-	"$(INTDIR)\random.obj" \

-	"$(INTDIR)\ratelimiter.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\rwlock.obj" \

-	"$(INTDIR)\serial.obj" \

-	"$(INTDIR)\sha1.obj" \

-	"$(INTDIR)\sockaddr.obj" \

-	"$(INTDIR)\string.obj" \

-	"$(INTDIR)\symtab.obj" \

-	"$(INTDIR)\task.obj" \

-	"$(INTDIR)\taskpool.obj" \

-	"$(INTDIR)\timer.obj" \

-	"$(INTDIR)\parseint.obj" \

-	"$(INTDIR)\region.obj"

-

-"..\..\..\Build\Debug\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("libisc.dep")

-!INCLUDE "libisc.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "libisc.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "libisc - Win32 Release" || "$(CFG)" == "libisc - Win32 Debug"

-SOURCE=.\app.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\app.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\app.obj"	"$(INTDIR)\app.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\condition.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\condition.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\condition.obj"	"$(INTDIR)\condition.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\dir.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\dir.obj"	"$(INTDIR)\dir.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\entropy.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\entropy.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\entropy.obj"	"$(INTDIR)\entropy.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\errno2result.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\errno2result.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\errno2result.obj"	"$(INTDIR)\errno2result.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\file.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\file.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\file.obj"	"$(INTDIR)\file.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\fsaccess.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\fsaccess.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\fsaccess.obj"	"$(INTDIR)\fsaccess.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\interfaceiter.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\interfaceiter.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\interfaceiter.obj"	"$(INTDIR)\interfaceiter.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\ipv6.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\ipv6.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\ipv6.obj"	"$(INTDIR)\ipv6.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\keyboard.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\keyboard.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\keyboard.obj"	"$(INTDIR)\keyboard.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\net.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\net.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\net.obj"	"$(INTDIR)\net.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\ntpaths.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\ntpaths.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\ntpaths.obj"	"$(INTDIR)\ntpaths.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\once.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\once.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\once.obj"	"$(INTDIR)\once.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\os.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\resource.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\resource.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\resource.obj"	"$(INTDIR)\resource.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\socket.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\socket.obj"	"$(INTDIR)\socket.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\stdio.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\stdio.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\stdio.obj"	"$(INTDIR)\stdio.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\stdtime.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\stdtime.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\stdtime.obj"	"$(INTDIR)\stdtime.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\strerror.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\strerror.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\strerror.obj"	"$(INTDIR)\strerror.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\syslog.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\syslog.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\syslog.obj"	"$(INTDIR)\syslog.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\thread.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\thread.obj"	"$(INTDIR)\thread.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\time.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\time.obj"	"$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\win32os.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\win32os.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\win32os.obj"	"$(INTDIR)\win32os.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\assertions.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\assertions.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\assertions.obj"	"$(INTDIR)\assertions.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\base64.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\base64.obj"	"$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\bitstring.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\bitstring.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\bitstring.obj"	"$(INTDIR)\bitstring.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\buffer.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\buffer.obj"	"$(INTDIR)\buffer.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\bufferlist.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\bufferlist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\bufferlist.obj"	"$(INTDIR)\bufferlist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\commandline.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\commandline.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\commandline.obj"	"$(INTDIR)\commandline.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\error.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\error.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\error.obj"	"$(INTDIR)\error.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\event.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\event.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\event.obj"	"$(INTDIR)\event.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\hash.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\hash.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\hash.obj"	"$(INTDIR)\hash.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\heap.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\heap.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\heap.obj"	"$(INTDIR)\heap.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\hex.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\hex.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\hex.obj"	"$(INTDIR)\hex.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\hmacmd5.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\hmacmd5.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\hmacmd5.obj"	"$(INTDIR)\hmacmd5.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\inet_aton.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\inet_aton.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\inet_aton.obj"	"$(INTDIR)\inet_aton.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\inet_ntop.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\inet_ntop.obj"	"$(INTDIR)\inet_ntop.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\inet_pton.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\inet_pton.obj"	"$(INTDIR)\inet_pton.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lex.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\lex.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\lex.obj"	"$(INTDIR)\lex.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lfsr.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\lfsr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\lfsr.obj"	"$(INTDIR)\lfsr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lib.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\log.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\md5.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\md5.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\md5.obj"	"$(INTDIR)\md5.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\mem.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\mem.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\mem.obj"	"$(INTDIR)\mem.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\nls\msgcat.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\msgcat.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\msgcat.obj"	"$(INTDIR)\msgcat.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\mutexblock.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\mutexblock.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\mutexblock.obj"	"$(INTDIR)\mutexblock.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\netaddr.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\netaddr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\netaddr.obj"	"$(INTDIR)\netaddr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\netscope.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\netscope.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\netscope.obj"	"$(INTDIR)\netscope.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ondestroy.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\ondestroy.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\ondestroy.obj"	"$(INTDIR)\ondestroy.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\parseint.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\parseint.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\parseint.obj"	"$(INTDIR)\parseint.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\quota.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\quota.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\quota.obj"	"$(INTDIR)\quota.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\random.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\random.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\random.obj"	"$(INTDIR)\random.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ratelimiter.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\ratelimiter.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\ratelimiter.obj"	"$(INTDIR)\ratelimiter.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\region.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\region.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\region.obj"	"$(INTDIR)\region.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\result.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\rwlock.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\rwlock.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\rwlock.obj"	"$(INTDIR)\rwlock.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\serial.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\serial.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\serial.obj"	"$(INTDIR)\serial.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\sha1.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\sha1.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\sha1.obj"	"$(INTDIR)\sha1.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\sockaddr.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\sockaddr.obj"	"$(INTDIR)\sockaddr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\string.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\string.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\string.obj"	"$(INTDIR)\string.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\symtab.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\symtab.obj"	"$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\task.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\task.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\task.obj"	"$(INTDIR)\task.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\taskpool.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\taskpool.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\taskpool.obj"	"$(INTDIR)\taskpool.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\timer.c

-

-!IF  "$(CFG)" == "libisc - Win32 Release"

-

-

-"$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"

-

-

-"$(INTDIR)\timer.obj"	"$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on libisc.dsp
+!IF "$(CFG)" == ""
+CFG=libisc - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to libisc - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "libisc - Win32 Release" && "$(CFG)" != "libisc - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libisc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\libisc.dll"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\app.obj"
+	-@erase "$(INTDIR)\assertions.obj"
+	-@erase "$(INTDIR)\base64.obj"
+	-@erase "$(INTDIR)\bitstring.obj"
+	-@erase "$(INTDIR)\buffer.obj"
+	-@erase "$(INTDIR)\bufferlist.obj"
+	-@erase "$(INTDIR)\commandline.obj"
+	-@erase "$(INTDIR)\condition.obj"
+	-@erase "$(INTDIR)\dir.obj"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\entropy.obj"
+	-@erase "$(INTDIR)\errno2result.obj"
+	-@erase "$(INTDIR)\error.obj"
+	-@erase "$(INTDIR)\event.obj"
+	-@erase "$(INTDIR)\file.obj"
+	-@erase "$(INTDIR)\fsaccess.obj"
+	-@erase "$(INTDIR)\hash.obj"
+	-@erase "$(INTDIR)\heap.obj"
+	-@erase "$(INTDIR)\hex.obj"
+	-@erase "$(INTDIR)\hmacmd5.obj"
+	-@erase "$(INTDIR)\inet_aton.obj"
+	-@erase "$(INTDIR)\inet_ntop.obj"
+	-@erase "$(INTDIR)\inet_pton.obj"
+	-@erase "$(INTDIR)\interfaceiter.obj"
+	-@erase "$(INTDIR)\ipv6.obj"
+	-@erase "$(INTDIR)\keyboard.obj"
+	-@erase "$(INTDIR)\lex.obj"
+	-@erase "$(INTDIR)\lfsr.obj"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\md5.obj"
+	-@erase "$(INTDIR)\mem.obj"
+	-@erase "$(INTDIR)\msgcat.obj"
+	-@erase "$(INTDIR)\mutexblock.obj"
+	-@erase "$(INTDIR)\net.obj"
+	-@erase "$(INTDIR)\netaddr.obj"
+	-@erase "$(INTDIR)\netscope.obj"
+	-@erase "$(INTDIR)\ntpaths.obj"
+	-@erase "$(INTDIR)\once.obj"
+	-@erase "$(INTDIR)\ondestroy.obj"
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\parseint.obj"
+	-@erase "$(INTDIR)\quota.obj"
+	-@erase "$(INTDIR)\random.obj"
+	-@erase "$(INTDIR)\ratelimiter.obj"
+	-@erase "$(INTDIR)\region.obj"
+	-@erase "$(INTDIR)\resource.obj"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\rwlock.obj"
+	-@erase "$(INTDIR)\serial.obj"
+	-@erase "$(INTDIR)\sha1.obj"
+	-@erase "$(INTDIR)\sockaddr.obj"
+	-@erase "$(INTDIR)\socket.obj"
+	-@erase "$(INTDIR)\stdio.obj"
+	-@erase "$(INTDIR)\stdtime.obj"
+	-@erase "$(INTDIR)\strerror.obj"
+	-@erase "$(INTDIR)\string.obj"
+	-@erase "$(INTDIR)\symtab.obj"
+	-@erase "$(INTDIR)\syslog.obj"
+	-@erase "$(INTDIR)\task.obj"
+	-@erase "$(INTDIR)\taskpool.obj"
+	-@erase "$(INTDIR)\thread.obj"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\timer.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\win32os.obj"
+	-@erase "$(OUTDIR)\libisc.exp"
+	-@erase "$(OUTDIR)\libisc.lib"
+	-@erase "..\..\..\Build\Release\libisc.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" /machine:I386 /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" 
+DEF_FILE= \
+	".\libisc.def"
+LINK32_OBJS= \
+	"$(INTDIR)\app.obj" \
+	"$(INTDIR)\condition.obj" \
+	"$(INTDIR)\dir.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\entropy.obj" \
+	"$(INTDIR)\errno2result.obj" \
+	"$(INTDIR)\file.obj" \
+	"$(INTDIR)\fsaccess.obj" \
+	"$(INTDIR)\interfaceiter.obj" \
+	"$(INTDIR)\ipv6.obj" \
+	"$(INTDIR)\keyboard.obj" \
+	"$(INTDIR)\net.obj" \
+	"$(INTDIR)\ntpaths.obj" \
+	"$(INTDIR)\once.obj" \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\resource.obj" \
+	"$(INTDIR)\socket.obj" \
+	"$(INTDIR)\stdio.obj" \
+	"$(INTDIR)\stdtime.obj" \
+	"$(INTDIR)\strerror.obj" \
+	"$(INTDIR)\syslog.obj" \
+	"$(INTDIR)\thread.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\win32os.obj" \
+	"$(INTDIR)\assertions.obj" \
+	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\bitstring.obj" \
+	"$(INTDIR)\buffer.obj" \
+	"$(INTDIR)\bufferlist.obj" \
+	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\error.obj" \
+	"$(INTDIR)\event.obj" \
+	"$(INTDIR)\hash.obj" \
+	"$(INTDIR)\heap.obj" \
+	"$(INTDIR)\hex.obj" \
+	"$(INTDIR)\hmacmd5.obj" \
+	"$(INTDIR)\inet_aton.obj" \
+	"$(INTDIR)\inet_ntop.obj" \
+	"$(INTDIR)\inet_pton.obj" \
+	"$(INTDIR)\lex.obj" \
+	"$(INTDIR)\lfsr.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\md5.obj" \
+	"$(INTDIR)\mem.obj" \
+	"$(INTDIR)\msgcat.obj" \
+	"$(INTDIR)\mutexblock.obj" \
+	"$(INTDIR)\netaddr.obj" \
+	"$(INTDIR)\netscope.obj" \
+	"$(INTDIR)\ondestroy.obj" \
+	"$(INTDIR)\quota.obj" \
+	"$(INTDIR)\random.obj" \
+	"$(INTDIR)\ratelimiter.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\rwlock.obj" \
+	"$(INTDIR)\serial.obj" \
+	"$(INTDIR)\sha1.obj" \
+	"$(INTDIR)\sockaddr.obj" \
+	"$(INTDIR)\string.obj" \
+	"$(INTDIR)\symtab.obj" \
+	"$(INTDIR)\task.obj" \
+	"$(INTDIR)\taskpool.obj" \
+	"$(INTDIR)\timer.obj" \
+	"$(INTDIR)\parseint.obj" \
+	"$(INTDIR)\region.obj"
+
+"..\..\..\Build\Release\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\libisc.dll" "$(OUTDIR)\libisc.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\app.obj"
+	-@erase "$(INTDIR)\app.sbr"
+	-@erase "$(INTDIR)\assertions.obj"
+	-@erase "$(INTDIR)\assertions.sbr"
+	-@erase "$(INTDIR)\base64.obj"
+	-@erase "$(INTDIR)\base64.sbr"
+	-@erase "$(INTDIR)\bitstring.obj"
+	-@erase "$(INTDIR)\bitstring.sbr"
+	-@erase "$(INTDIR)\buffer.obj"
+	-@erase "$(INTDIR)\buffer.sbr"
+	-@erase "$(INTDIR)\bufferlist.obj"
+	-@erase "$(INTDIR)\bufferlist.sbr"
+	-@erase "$(INTDIR)\commandline.obj"
+	-@erase "$(INTDIR)\commandline.sbr"
+	-@erase "$(INTDIR)\condition.obj"
+	-@erase "$(INTDIR)\condition.sbr"
+	-@erase "$(INTDIR)\dir.obj"
+	-@erase "$(INTDIR)\dir.sbr"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\entropy.obj"
+	-@erase "$(INTDIR)\entropy.sbr"
+	-@erase "$(INTDIR)\errno2result.obj"
+	-@erase "$(INTDIR)\errno2result.sbr"
+	-@erase "$(INTDIR)\error.obj"
+	-@erase "$(INTDIR)\error.sbr"
+	-@erase "$(INTDIR)\event.obj"
+	-@erase "$(INTDIR)\event.sbr"
+	-@erase "$(INTDIR)\file.obj"
+	-@erase "$(INTDIR)\file.sbr"
+	-@erase "$(INTDIR)\fsaccess.obj"
+	-@erase "$(INTDIR)\fsaccess.sbr"
+	-@erase "$(INTDIR)\hash.obj"
+	-@erase "$(INTDIR)\hash.sbr"
+	-@erase "$(INTDIR)\heap.obj"
+	-@erase "$(INTDIR)\heap.sbr"
+	-@erase "$(INTDIR)\hex.obj"
+	-@erase "$(INTDIR)\hex.sbr"
+	-@erase "$(INTDIR)\hmacmd5.obj"
+	-@erase "$(INTDIR)\hmacmd5.sbr"
+	-@erase "$(INTDIR)\inet_aton.obj"
+	-@erase "$(INTDIR)\inet_aton.sbr"
+	-@erase "$(INTDIR)\inet_ntop.obj"
+	-@erase "$(INTDIR)\inet_ntop.sbr"
+	-@erase "$(INTDIR)\inet_pton.obj"
+	-@erase "$(INTDIR)\inet_pton.sbr"
+	-@erase "$(INTDIR)\interfaceiter.obj"
+	-@erase "$(INTDIR)\interfaceiter.sbr"
+	-@erase "$(INTDIR)\ipv6.obj"
+	-@erase "$(INTDIR)\ipv6.sbr"
+	-@erase "$(INTDIR)\keyboard.obj"
+	-@erase "$(INTDIR)\keyboard.sbr"
+	-@erase "$(INTDIR)\lex.obj"
+	-@erase "$(INTDIR)\lex.sbr"
+	-@erase "$(INTDIR)\lfsr.obj"
+	-@erase "$(INTDIR)\lfsr.sbr"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\lib.sbr"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\log.sbr"
+	-@erase "$(INTDIR)\md5.obj"
+	-@erase "$(INTDIR)\md5.sbr"
+	-@erase "$(INTDIR)\mem.obj"
+	-@erase "$(INTDIR)\mem.sbr"
+	-@erase "$(INTDIR)\msgcat.obj"
+	-@erase "$(INTDIR)\msgcat.sbr"
+	-@erase "$(INTDIR)\mutexblock.obj"
+	-@erase "$(INTDIR)\mutexblock.sbr"
+	-@erase "$(INTDIR)\net.obj"
+	-@erase "$(INTDIR)\net.sbr"
+	-@erase "$(INTDIR)\netaddr.obj"
+	-@erase "$(INTDIR)\netaddr.sbr"
+	-@erase "$(INTDIR)\netscope.obj"
+	-@erase "$(INTDIR)\netscope.sbr"
+	-@erase "$(INTDIR)\ntpaths.obj"
+	-@erase "$(INTDIR)\ntpaths.sbr"
+	-@erase "$(INTDIR)\once.obj"
+	-@erase "$(INTDIR)\once.sbr"
+	-@erase "$(INTDIR)\ondestroy.obj"
+	-@erase "$(INTDIR)\ondestroy.sbr"
+	-@erase "$(INTDIR)\os.obj"
+	-@erase "$(INTDIR)\os.sbr"
+	-@erase "$(INTDIR)\parseint.obj"
+	-@erase "$(INTDIR)\parseint.sbr"
+	-@erase "$(INTDIR)\quota.obj"
+	-@erase "$(INTDIR)\quota.sbr"
+	-@erase "$(INTDIR)\random.obj"
+	-@erase "$(INTDIR)\random.sbr"
+	-@erase "$(INTDIR)\ratelimiter.obj"
+	-@erase "$(INTDIR)\ratelimiter.sbr"
+	-@erase "$(INTDIR)\region.obj"
+	-@erase "$(INTDIR)\region.sbr"
+	-@erase "$(INTDIR)\resource.obj"
+	-@erase "$(INTDIR)\resource.sbr"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\result.sbr"
+	-@erase "$(INTDIR)\rwlock.obj"
+	-@erase "$(INTDIR)\rwlock.sbr"
+	-@erase "$(INTDIR)\serial.obj"
+	-@erase "$(INTDIR)\serial.sbr"
+	-@erase "$(INTDIR)\sha1.obj"
+	-@erase "$(INTDIR)\sha1.sbr"
+	-@erase "$(INTDIR)\sockaddr.obj"
+	-@erase "$(INTDIR)\sockaddr.sbr"
+	-@erase "$(INTDIR)\socket.obj"
+	-@erase "$(INTDIR)\socket.sbr"
+	-@erase "$(INTDIR)\stdio.obj"
+	-@erase "$(INTDIR)\stdio.sbr"
+	-@erase "$(INTDIR)\stdtime.obj"
+	-@erase "$(INTDIR)\stdtime.sbr"
+	-@erase "$(INTDIR)\strerror.obj"
+	-@erase "$(INTDIR)\strerror.sbr"
+	-@erase "$(INTDIR)\string.obj"
+	-@erase "$(INTDIR)\string.sbr"
+	-@erase "$(INTDIR)\symtab.obj"
+	-@erase "$(INTDIR)\symtab.sbr"
+	-@erase "$(INTDIR)\syslog.obj"
+	-@erase "$(INTDIR)\syslog.sbr"
+	-@erase "$(INTDIR)\task.obj"
+	-@erase "$(INTDIR)\task.sbr"
+	-@erase "$(INTDIR)\taskpool.obj"
+	-@erase "$(INTDIR)\taskpool.sbr"
+	-@erase "$(INTDIR)\thread.obj"
+	-@erase "$(INTDIR)\thread.sbr"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\time.sbr"
+	-@erase "$(INTDIR)\timer.obj"
+	-@erase "$(INTDIR)\timer.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(INTDIR)\win32os.obj"
+	-@erase "$(INTDIR)\win32os.sbr"
+	-@erase "$(OUTDIR)\libisc.bsc"
+	-@erase "$(OUTDIR)\libisc.exp"
+	-@erase "$(OUTDIR)\libisc.lib"
+	-@erase "$(OUTDIR)\libisc.map"
+	-@erase "$(OUTDIR)\libisc.pdb"
+	-@erase "..\..\..\Build\Debug\libisc.dll"
+	-@erase "..\..\..\Build\Debug\libisc.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\app.sbr" \
+	"$(INTDIR)\condition.sbr" \
+	"$(INTDIR)\dir.sbr" \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\entropy.sbr" \
+	"$(INTDIR)\errno2result.sbr" \
+	"$(INTDIR)\file.sbr" \
+	"$(INTDIR)\fsaccess.sbr" \
+	"$(INTDIR)\interfaceiter.sbr" \
+	"$(INTDIR)\ipv6.sbr" \
+	"$(INTDIR)\keyboard.sbr" \
+	"$(INTDIR)\net.sbr" \
+	"$(INTDIR)\ntpaths.sbr" \
+	"$(INTDIR)\once.sbr" \
+	"$(INTDIR)\os.sbr" \
+	"$(INTDIR)\resource.sbr" \
+	"$(INTDIR)\socket.sbr" \
+	"$(INTDIR)\stdio.sbr" \
+	"$(INTDIR)\stdtime.sbr" \
+	"$(INTDIR)\strerror.sbr" \
+	"$(INTDIR)\syslog.sbr" \
+	"$(INTDIR)\thread.sbr" \
+	"$(INTDIR)\time.sbr" \
+	"$(INTDIR)\version.sbr" \
+	"$(INTDIR)\win32os.sbr" \
+	"$(INTDIR)\assertions.sbr" \
+	"$(INTDIR)\base64.sbr" \
+	"$(INTDIR)\bitstring.sbr" \
+	"$(INTDIR)\buffer.sbr" \
+	"$(INTDIR)\bufferlist.sbr" \
+	"$(INTDIR)\commandline.sbr" \
+	"$(INTDIR)\error.sbr" \
+	"$(INTDIR)\event.sbr" \
+	"$(INTDIR)\hash.sbr" \
+	"$(INTDIR)\heap.sbr" \
+	"$(INTDIR)\hex.sbr" \
+	"$(INTDIR)\hmacmd5.sbr" \
+	"$(INTDIR)\inet_aton.sbr" \
+	"$(INTDIR)\inet_ntop.sbr" \
+	"$(INTDIR)\inet_pton.sbr" \
+	"$(INTDIR)\lex.sbr" \
+	"$(INTDIR)\lfsr.sbr" \
+	"$(INTDIR)\lib.sbr" \
+	"$(INTDIR)\log.sbr" \
+	"$(INTDIR)\md5.sbr" \
+	"$(INTDIR)\mem.sbr" \
+	"$(INTDIR)\msgcat.sbr" \
+	"$(INTDIR)\mutexblock.sbr" \
+	"$(INTDIR)\netaddr.sbr" \
+	"$(INTDIR)\netscope.sbr" \
+	"$(INTDIR)\ondestroy.sbr" \
+	"$(INTDIR)\quota.sbr" \
+	"$(INTDIR)\random.sbr" \
+	"$(INTDIR)\ratelimiter.sbr" \
+	"$(INTDIR)\result.sbr" \
+	"$(INTDIR)\rwlock.sbr" \
+	"$(INTDIR)\serial.sbr" \
+	"$(INTDIR)\sha1.sbr" \
+	"$(INTDIR)\sockaddr.sbr" \
+	"$(INTDIR)\string.sbr" \
+	"$(INTDIR)\symtab.sbr" \
+	"$(INTDIR)\task.sbr" \
+	"$(INTDIR)\taskpool.sbr" \
+	"$(INTDIR)\timer.sbr" \
+	"$(INTDIR)\parseint.sbr" \
+	"$(INTDIR)\region.sbr"
+
+"$(OUTDIR)\libisc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug /machine:I386 /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\libisc.def"
+LINK32_OBJS= \
+	"$(INTDIR)\app.obj" \
+	"$(INTDIR)\condition.obj" \
+	"$(INTDIR)\dir.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\entropy.obj" \
+	"$(INTDIR)\errno2result.obj" \
+	"$(INTDIR)\file.obj" \
+	"$(INTDIR)\fsaccess.obj" \
+	"$(INTDIR)\interfaceiter.obj" \
+	"$(INTDIR)\ipv6.obj" \
+	"$(INTDIR)\keyboard.obj" \
+	"$(INTDIR)\net.obj" \
+	"$(INTDIR)\ntpaths.obj" \
+	"$(INTDIR)\once.obj" \
+	"$(INTDIR)\os.obj" \
+	"$(INTDIR)\resource.obj" \
+	"$(INTDIR)\socket.obj" \
+	"$(INTDIR)\stdio.obj" \
+	"$(INTDIR)\stdtime.obj" \
+	"$(INTDIR)\strerror.obj" \
+	"$(INTDIR)\syslog.obj" \
+	"$(INTDIR)\thread.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\win32os.obj" \
+	"$(INTDIR)\assertions.obj" \
+	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\bitstring.obj" \
+	"$(INTDIR)\buffer.obj" \
+	"$(INTDIR)\bufferlist.obj" \
+	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\error.obj" \
+	"$(INTDIR)\event.obj" \
+	"$(INTDIR)\hash.obj" \
+	"$(INTDIR)\heap.obj" \
+	"$(INTDIR)\hex.obj" \
+	"$(INTDIR)\hmacmd5.obj" \
+	"$(INTDIR)\inet_aton.obj" \
+	"$(INTDIR)\inet_ntop.obj" \
+	"$(INTDIR)\inet_pton.obj" \
+	"$(INTDIR)\lex.obj" \
+	"$(INTDIR)\lfsr.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\md5.obj" \
+	"$(INTDIR)\mem.obj" \
+	"$(INTDIR)\msgcat.obj" \
+	"$(INTDIR)\mutexblock.obj" \
+	"$(INTDIR)\netaddr.obj" \
+	"$(INTDIR)\netscope.obj" \
+	"$(INTDIR)\ondestroy.obj" \
+	"$(INTDIR)\quota.obj" \
+	"$(INTDIR)\random.obj" \
+	"$(INTDIR)\ratelimiter.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\rwlock.obj" \
+	"$(INTDIR)\serial.obj" \
+	"$(INTDIR)\sha1.obj" \
+	"$(INTDIR)\sockaddr.obj" \
+	"$(INTDIR)\string.obj" \
+	"$(INTDIR)\symtab.obj" \
+	"$(INTDIR)\task.obj" \
+	"$(INTDIR)\taskpool.obj" \
+	"$(INTDIR)\timer.obj" \
+	"$(INTDIR)\parseint.obj" \
+	"$(INTDIR)\region.obj"
+
+"..\..\..\Build\Debug\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libisc.dep")
+!INCLUDE "libisc.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libisc.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libisc - Win32 Release" || "$(CFG)" == "libisc - Win32 Debug"
+SOURCE=.\app.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\app.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\app.obj"	"$(INTDIR)\app.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\condition.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\condition.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\condition.obj"	"$(INTDIR)\condition.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\dir.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\dir.obj"	"$(INTDIR)\dir.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\entropy.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\entropy.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\entropy.obj"	"$(INTDIR)\entropy.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\errno2result.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\errno2result.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\errno2result.obj"	"$(INTDIR)\errno2result.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\file.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\file.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\file.obj"	"$(INTDIR)\file.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\fsaccess.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\fsaccess.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\fsaccess.obj"	"$(INTDIR)\fsaccess.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\interfaceiter.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\interfaceiter.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\interfaceiter.obj"	"$(INTDIR)\interfaceiter.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\ipv6.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\ipv6.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\ipv6.obj"	"$(INTDIR)\ipv6.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\keyboard.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\keyboard.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\keyboard.obj"	"$(INTDIR)\keyboard.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\net.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\net.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\net.obj"	"$(INTDIR)\net.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\ntpaths.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\ntpaths.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\ntpaths.obj"	"$(INTDIR)\ntpaths.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\once.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\once.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\once.obj"	"$(INTDIR)\once.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\os.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\os.obj"	"$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\resource.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\resource.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\resource.obj"	"$(INTDIR)\resource.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\socket.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\socket.obj"	"$(INTDIR)\socket.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\stdio.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\stdio.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\stdio.obj"	"$(INTDIR)\stdio.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\stdtime.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\stdtime.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\stdtime.obj"	"$(INTDIR)\stdtime.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\strerror.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\strerror.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\strerror.obj"	"$(INTDIR)\strerror.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\syslog.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\syslog.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\syslog.obj"	"$(INTDIR)\syslog.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\thread.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\thread.obj"	"$(INTDIR)\thread.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\time.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\time.obj"	"$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\win32os.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\win32os.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\win32os.obj"	"$(INTDIR)\win32os.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\assertions.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\assertions.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\assertions.obj"	"$(INTDIR)\assertions.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\base64.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\base64.obj"	"$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\bitstring.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\bitstring.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\bitstring.obj"	"$(INTDIR)\bitstring.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\buffer.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\buffer.obj"	"$(INTDIR)\buffer.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\bufferlist.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\bufferlist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\bufferlist.obj"	"$(INTDIR)\bufferlist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\commandline.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\commandline.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\commandline.obj"	"$(INTDIR)\commandline.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\error.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\error.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\error.obj"	"$(INTDIR)\error.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\event.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\event.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\event.obj"	"$(INTDIR)\event.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\hash.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\hash.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\hash.obj"	"$(INTDIR)\hash.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\heap.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\heap.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\heap.obj"	"$(INTDIR)\heap.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\hex.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\hex.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\hex.obj"	"$(INTDIR)\hex.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\hmacmd5.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\hmacmd5.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\hmacmd5.obj"	"$(INTDIR)\hmacmd5.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\inet_aton.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\inet_aton.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\inet_aton.obj"	"$(INTDIR)\inet_aton.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\inet_ntop.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\inet_ntop.obj"	"$(INTDIR)\inet_ntop.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\inet_pton.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\inet_pton.obj"	"$(INTDIR)\inet_pton.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lex.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\lex.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\lex.obj"	"$(INTDIR)\lex.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lfsr.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\lfsr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\lfsr.obj"	"$(INTDIR)\lfsr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lib.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\log.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\md5.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\md5.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\md5.obj"	"$(INTDIR)\md5.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\mem.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\mem.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\mem.obj"	"$(INTDIR)\mem.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\nls\msgcat.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\msgcat.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\msgcat.obj"	"$(INTDIR)\msgcat.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\mutexblock.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\mutexblock.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\mutexblock.obj"	"$(INTDIR)\mutexblock.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\netaddr.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\netaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\netaddr.obj"	"$(INTDIR)\netaddr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\netscope.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\netscope.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\netscope.obj"	"$(INTDIR)\netscope.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ondestroy.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\ondestroy.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\ondestroy.obj"	"$(INTDIR)\ondestroy.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\parseint.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\parseint.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\parseint.obj"	"$(INTDIR)\parseint.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\quota.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\quota.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\quota.obj"	"$(INTDIR)\quota.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\random.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\random.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\random.obj"	"$(INTDIR)\random.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ratelimiter.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\ratelimiter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\ratelimiter.obj"	"$(INTDIR)\ratelimiter.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\region.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\region.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\region.obj"	"$(INTDIR)\region.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\result.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\rwlock.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\rwlock.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\rwlock.obj"	"$(INTDIR)\rwlock.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\serial.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\serial.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\serial.obj"	"$(INTDIR)\serial.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\sha1.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\sha1.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\sha1.obj"	"$(INTDIR)\sha1.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\sockaddr.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\sockaddr.obj"	"$(INTDIR)\sockaddr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\string.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\string.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\string.obj"	"$(INTDIR)\string.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\symtab.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\symtab.obj"	"$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\task.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\task.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\task.obj"	"$(INTDIR)\task.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\taskpool.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\taskpool.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\taskpool.obj"	"$(INTDIR)\taskpool.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\timer.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\timer.obj"	"$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 7f800ed1..17368f87 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.5.2.13.2.16 2005/09/01 03:16:12 marka Exp $ */
+/* $Id: socket.c,v 1.5.2.13.2.18 2006/01/07 00:23:33 marka Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -656,6 +656,7 @@ socket_eventlist_delete(event_change_t *evchange, sock_event_list *evlist) {
 	int i;
 	WSAEVENT hEvent;
 	int iEvent = -1;
+	isc_boolean_t dofree = ISC_FALSE;
 
 	REQUIRE(evchange != NULL);
 	/*  Make sure this is the right thread from which to delete the event */
@@ -688,8 +689,22 @@ socket_eventlist_delete(event_change_t *evchange, sock_event_list *evlist) {
 
 	/* Cleanup */
 	WSACloseEvent(hEvent);
-	if (evchange->fd >= 0)
+
+	LOCK(&evchange->sock->lock);
+	if (evchange->sock->pending_close) {
+		evchange->sock->pending_close = 0;
 		closesocket(evchange->fd);
+	}
+	if (evchange->sock->pending_recv == 0 &&
+	    evchange->sock->pending_send == 0 &&
+	    evchange->sock->pending_free) {
+		evchange->sock->pending_free = 0;
+		dofree = ISC_TRUE;
+	}
+	UNLOCK(&evchange->sock->lock);
+	if (dofree)
+		free_socket(&evchange->sock);
+
 	evlist->max_event--;
 	evlist->total_events--;
 
@@ -852,14 +867,12 @@ socket_event_delete(isc_socket_t *sock) {
 	REQUIRE(sock != NULL);
 	REQUIRE(sock->hEvent != NULL);
 
-	if (sock->hEvent != NULL) {
-		sock->wait_type = 0;
-		sock->pending_close = 1;
-		notify_eventlist(sock, sock->manager, EVENT_DELETE);
-		sock->hEvent = NULL;
-		sock->hAlert = NULL;
-		sock->evthread_id = 0;
-	}
+	sock->wait_type = 0;
+	sock->pending_close = 1;
+	notify_eventlist(sock, sock->manager, EVENT_DELETE);
+	sock->hEvent = NULL;
+	sock->hAlert = NULL;
+	sock->evthread_id = 0;
 }
 
 /*
@@ -873,17 +886,17 @@ void
 socket_close(isc_socket_t *sock) {
 
 	REQUIRE(sock != NULL);
-	sock->pending_close = 1;
+
+	sock->pending_close = 0;
 	if (sock->hEvent != NULL)
 		socket_event_delete(sock);
-	else {
+	else
 		closesocket(sock->fd);
-	}
+
 	if (sock->iocp) {
 		sock->iocp = 0;
 		InterlockedDecrement(&iocp_total);
 	}
-
 }
 
 /*
@@ -1661,7 +1674,7 @@ startio_send(isc_socket_t *sock, isc_socketevent_t *dev, int *nbytes,
 	}
 	dev->result = ISC_R_SUCCESS;
 	status = DOIO_SOFT;
-done:
+ done:
 	return (status);
 }
 
@@ -1691,7 +1704,8 @@ destroy_socket(isc_socket_t **sockp) {
 
 	LOCK(&sock->lock);
 	socket_close(sock);
-	if (sock->pending_recv != 0 || sock->pending_send != 0) {
+	if (sock->pending_recv != 0 || sock->pending_send != 0 ||
+	    sock->pending_close != 0) {
 		dofree = ISC_FALSE;
 		sock->pending_free = 1;
 	}
@@ -1888,6 +1902,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 
 	result = make_nonblock(sock->fd);
 	if (result != ISC_R_SUCCESS) {
+		closesocket(sock->fd);
 		free_socket(&sock);
 		return (result);
 	}
@@ -2542,8 +2557,11 @@ SocketIoThread(LPVOID ThreadContext) {
 				}
 				if (sock->pending_recv == 0 &&
 				    sock->pending_send == 0 &&
-				    sock->pending_free)
+				    sock->pending_close == 0 &&
+				    sock->pending_free) {
+					sock->pending_free = 0;
 					dofree = ISC_TRUE;
+				}
 				UNLOCK(&sock->lock);
 				if (dofree)
 					free_socket(&sock);
diff --git a/lib/isccc/api b/lib/isccc/api
index 4f115e73..8c77091b 100644
--- a/lib/isccc/api
+++ b/lib/isccc/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 2
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 2
diff --git a/lib/isccc/win32/libisccc.dsp b/lib/isccc/win32/libisccc.dsp
index 2870ffad..06238d16 100644
--- a/lib/isccc/win32/libisccc.dsp
+++ b/lib/isccc/win32/libisccc.dsp
@@ -1,197 +1,197 @@
-# Microsoft Developer Studio Project File - Name="libisccc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libisccc - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccc.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /YX /FD /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccc.dll"

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR /YX /FD /GZ /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccc.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libisccc - Win32 Release"

-# Name "libisccc - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\alist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\base64.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\cc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ccmsg.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\DLLMain.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\result.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\sexpr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\symtab.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\isccc\alist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\base64.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\cc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\ccmsg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\events.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\lib.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\result.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\sexpr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\symtab.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\symtype.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccc\util.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Source File

-

-SOURCE=.\libisccc.def

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="libisccc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libisccc - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccc.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccc.dll"
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccc.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libisccc - Win32 Release"
+# Name "libisccc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\alist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\base64.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\cc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ccmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\result.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sexpr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\symtab.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\isccc\alist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\base64.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\cc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\ccmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\events.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\result.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\sexpr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\symtab.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\symtype.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccc\util.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=.\libisccc.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/isccc/win32/libisccc.dsw b/lib/isccc/win32/libisccc.dsw
index 28eaa74f..3bcecf04 100644
--- a/lib/isccc/win32/libisccc.dsw
+++ b/lib/isccc/win32/libisccc.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libisccc"=.\libisccc.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libisccc"=.\libisccc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/isccc/win32/libisccc.mak b/lib/isccc/win32/libisccc.mak
index b625729f..75ee6a26 100644
--- a/lib/isccc/win32/libisccc.mak
+++ b/lib/isccc/win32/libisccc.mak
@@ -1,443 +1,443 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libisccc.dsp

-!IF "$(CFG)" == ""

-CFG=libisccc - Win32 Release

-!MESSAGE No configuration specified. Defaulting to libisccc - Win32 Release.

-!ENDIF 

-

-!IF "$(CFG)" != "libisccc - Win32 Release" && "$(CFG)" != "libisccc - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\libisccc.dll"

-

-!ELSE 

-

-ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccc.dll"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\alist.obj"

-	-@erase "$(INTDIR)\base64.obj"

-	-@erase "$(INTDIR)\cc.obj"

-	-@erase "$(INTDIR)\ccmsg.obj"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\sexpr.obj"

-	-@erase "$(INTDIR)\symtab.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(OUTDIR)\libisccc.exp"

-	-@erase "$(OUTDIR)\libisccc.lib"

-	-@erase "..\..\..\Build\Release\libisccc.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccc.pdb" /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Release/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" 

-DEF_FILE= \

-	".\libisccc.def"

-LINK32_OBJS= \

-	"$(INTDIR)\alist.obj" \

-	"$(INTDIR)\base64.obj" \

-	"$(INTDIR)\cc.obj" \

-	"$(INTDIR)\ccmsg.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\sexpr.obj" \

-	"$(INTDIR)\symtab.obj" \

-	"$(INTDIR)\version.obj" \

-	"..\..\isc\win32\Release\libisc.lib"

-

-"..\..\..\Build\Release\libisccc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"

-

-!ELSE 

-

-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\alist.obj"

-	-@erase "$(INTDIR)\alist.sbr"

-	-@erase "$(INTDIR)\base64.obj"

-	-@erase "$(INTDIR)\base64.sbr"

-	-@erase "$(INTDIR)\cc.obj"

-	-@erase "$(INTDIR)\cc.sbr"

-	-@erase "$(INTDIR)\ccmsg.obj"

-	-@erase "$(INTDIR)\ccmsg.sbr"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\lib.obj"

-	-@erase "$(INTDIR)\lib.sbr"

-	-@erase "$(INTDIR)\result.obj"

-	-@erase "$(INTDIR)\result.sbr"

-	-@erase "$(INTDIR)\sexpr.obj"

-	-@erase "$(INTDIR)\sexpr.sbr"

-	-@erase "$(INTDIR)\symtab.obj"

-	-@erase "$(INTDIR)\symtab.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(OUTDIR)\libisccc.bsc"

-	-@erase "$(OUTDIR)\libisccc.exp"

-	-@erase "$(OUTDIR)\libisccc.lib"

-	-@erase "$(OUTDIR)\libisccc.pdb"

-	-@erase "..\..\..\Build\Debug\libisccc.dll"

-	-@erase "..\..\..\Build\Debug\libisccc.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\alist.sbr" \

-	"$(INTDIR)\base64.sbr" \

-	"$(INTDIR)\cc.sbr" \

-	"$(INTDIR)\ccmsg.sbr" \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\lib.sbr" \

-	"$(INTDIR)\result.sbr" \

-	"$(INTDIR)\sexpr.sbr" \

-	"$(INTDIR)\symtab.sbr" \

-	"$(INTDIR)\version.sbr"

-

-"$(OUTDIR)\libisccc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccc.pdb" /debug /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Debug/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\libisccc.def"

-LINK32_OBJS= \

-	"$(INTDIR)\alist.obj" \

-	"$(INTDIR)\base64.obj" \

-	"$(INTDIR)\cc.obj" \

-	"$(INTDIR)\ccmsg.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\lib.obj" \

-	"$(INTDIR)\result.obj" \

-	"$(INTDIR)\sexpr.obj" \

-	"$(INTDIR)\symtab.obj" \

-	"$(INTDIR)\version.obj" \

-	"..\..\isc\win32\Debug\libisc.lib"

-

-"..\..\..\Build\Debug\libisccc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("libisccc.dep")

-!INCLUDE "libisccc.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "libisccc.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "libisccc - Win32 Release" || "$(CFG)" == "libisccc - Win32 Debug"

-SOURCE=..\alist.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\alist.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\alist.obj"	"$(INTDIR)\alist.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\base64.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\base64.obj"	"$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\cc.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\cc.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\cc.obj"	"$(INTDIR)\cc.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\ccmsg.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\ccmsg.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\ccmsg.obj"	"$(INTDIR)\ccmsg.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\lib.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\result.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\sexpr.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\sexpr.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\sexpr.obj"	"$(INTDIR)\sexpr.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\symtab.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\symtab.obj"	"$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libisccc - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\isccc\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 

-   cd "..\..\isccc\win32"

-

-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"

-

-"libisc - Win32 Debug" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\isccc\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\isccc\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on libisccc.dsp
+!IF "$(CFG)" == ""
+CFG=libisccc - Win32 Release
+!MESSAGE No configuration specified. Defaulting to libisccc - Win32 Release.
+!ENDIF 
+
+!IF "$(CFG)" != "libisccc - Win32 Release" && "$(CFG)" != "libisccc - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\libisccc.dll"
+
+!ELSE 
+
+ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccc.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\alist.obj"
+	-@erase "$(INTDIR)\base64.obj"
+	-@erase "$(INTDIR)\cc.obj"
+	-@erase "$(INTDIR)\ccmsg.obj"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\sexpr.obj"
+	-@erase "$(INTDIR)\symtab.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(OUTDIR)\libisccc.exp"
+	-@erase "$(OUTDIR)\libisccc.lib"
+	-@erase "..\..\..\Build\Release\libisccc.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccc.pdb" /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Release/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" 
+DEF_FILE= \
+	".\libisccc.def"
+LINK32_OBJS= \
+	"$(INTDIR)\alist.obj" \
+	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\cc.obj" \
+	"$(INTDIR)\ccmsg.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\sexpr.obj" \
+	"$(INTDIR)\symtab.obj" \
+	"$(INTDIR)\version.obj" \
+	"..\..\isc\win32\Release\libisc.lib"
+
+"..\..\..\Build\Release\libisccc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"
+
+!ELSE 
+
+ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\alist.obj"
+	-@erase "$(INTDIR)\alist.sbr"
+	-@erase "$(INTDIR)\base64.obj"
+	-@erase "$(INTDIR)\base64.sbr"
+	-@erase "$(INTDIR)\cc.obj"
+	-@erase "$(INTDIR)\cc.sbr"
+	-@erase "$(INTDIR)\ccmsg.obj"
+	-@erase "$(INTDIR)\ccmsg.sbr"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\lib.obj"
+	-@erase "$(INTDIR)\lib.sbr"
+	-@erase "$(INTDIR)\result.obj"
+	-@erase "$(INTDIR)\result.sbr"
+	-@erase "$(INTDIR)\sexpr.obj"
+	-@erase "$(INTDIR)\sexpr.sbr"
+	-@erase "$(INTDIR)\symtab.obj"
+	-@erase "$(INTDIR)\symtab.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(OUTDIR)\libisccc.bsc"
+	-@erase "$(OUTDIR)\libisccc.exp"
+	-@erase "$(OUTDIR)\libisccc.lib"
+	-@erase "$(OUTDIR)\libisccc.pdb"
+	-@erase "..\..\..\Build\Debug\libisccc.dll"
+	-@erase "..\..\..\Build\Debug\libisccc.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\alist.sbr" \
+	"$(INTDIR)\base64.sbr" \
+	"$(INTDIR)\cc.sbr" \
+	"$(INTDIR)\ccmsg.sbr" \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\lib.sbr" \
+	"$(INTDIR)\result.sbr" \
+	"$(INTDIR)\sexpr.sbr" \
+	"$(INTDIR)\symtab.sbr" \
+	"$(INTDIR)\version.sbr"
+
+"$(OUTDIR)\libisccc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccc.pdb" /debug /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Debug/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\libisccc.def"
+LINK32_OBJS= \
+	"$(INTDIR)\alist.obj" \
+	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\cc.obj" \
+	"$(INTDIR)\ccmsg.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\lib.obj" \
+	"$(INTDIR)\result.obj" \
+	"$(INTDIR)\sexpr.obj" \
+	"$(INTDIR)\symtab.obj" \
+	"$(INTDIR)\version.obj" \
+	"..\..\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\libisccc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libisccc.dep")
+!INCLUDE "libisccc.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libisccc.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libisccc - Win32 Release" || "$(CFG)" == "libisccc - Win32 Debug"
+SOURCE=..\alist.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\alist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\alist.obj"	"$(INTDIR)\alist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\base64.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\base64.obj"	"$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\cc.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\cc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\cc.obj"	"$(INTDIR)\cc.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\ccmsg.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\ccmsg.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\ccmsg.obj"	"$(INTDIR)\ccmsg.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\lib.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\lib.obj"	"$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\result.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\result.obj"	"$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\sexpr.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\sexpr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\sexpr.obj"	"$(INTDIR)\sexpr.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\symtab.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\symtab.obj"	"$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libisccc - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\isccc\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\..\isccc\win32"
+
+!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+
+"libisc - Win32 Debug" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\isccc\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\isccc\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index b4081cd7..c4867199 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cfg.h,v 1.30.12.4 2004/03/08 09:05:07 marka Exp $ */
+/* $Id: cfg.h,v 1.30.12.6 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef ISCCFG_CFG_H
 #define ISCCFG_CFG_H 1
@@ -74,7 +74,7 @@ typedef struct cfg_listelt cfg_listelt_t;
  * "directory".
  */
 typedef isc_result_t
-(*cfg_parsecallback_t)(const char *clausename, cfg_obj_t *obj, void *arg);
+(*cfg_parsecallback_t)(const char *clausename, const cfg_obj_t *obj, void *arg);
 
 /***
  *** Functions
@@ -143,20 +143,20 @@ cfg_parser_destroy(cfg_parser_t **pctxp);
  */
 
 isc_boolean_t
-cfg_obj_isvoid(cfg_obj_t *obj);
+cfg_obj_isvoid(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of void type (e.g., an optional 
  * value not specified).
  */
 
 isc_boolean_t
-cfg_obj_ismap(cfg_obj_t *obj);
+cfg_obj_ismap(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of a map type.
  */
 
 isc_result_t
-cfg_map_get(cfg_obj_t *mapobj, const char* name, cfg_obj_t **obj);
+cfg_map_get(const cfg_obj_t *mapobj, const char* name, const cfg_obj_t **obj);
 /*
  * Extract an element from a configuration object, which
  * must be of a map type.
@@ -171,8 +171,8 @@ cfg_map_get(cfg_obj_t *mapobj, const char* name, cfg_obj_t **obj);
  *      ISC_R_NOTFOUND                 - name not found in map
  */
 
-cfg_obj_t *
-cfg_map_getname(cfg_obj_t *mapobj);
+const cfg_obj_t *
+cfg_map_getname(const cfg_obj_t *mapobj);
 /*
  * Get the name of a named map object, like a server "key" clause.
  *
@@ -185,13 +185,13 @@ cfg_map_getname(cfg_obj_t *mapobj);
  */
 
 isc_boolean_t
-cfg_obj_istuple(cfg_obj_t *obj);
+cfg_obj_istuple(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of a map type.
  */
 
-cfg_obj_t *
-cfg_tuple_get(cfg_obj_t *tupleobj, const char *name);
+const cfg_obj_t *
+cfg_tuple_get(const cfg_obj_t *tupleobj, const char *name);
 /*
  * Extract an element from a configuration object, which
  * must be of a tuple type.
@@ -203,13 +203,13 @@ cfg_tuple_get(cfg_obj_t *tupleobj, const char *name);
  */
 
 isc_boolean_t
-cfg_obj_isuint32(cfg_obj_t *obj);
+cfg_obj_isuint32(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of integer type.
  */
 
 isc_uint32_t
-cfg_obj_asuint32(cfg_obj_t *obj);
+cfg_obj_asuint32(const cfg_obj_t *obj);
 /*
  * Returns the value of a configuration object of 32-bit integer type.
  *
@@ -221,13 +221,13 @@ cfg_obj_asuint32(cfg_obj_t *obj);
  */
 
 isc_boolean_t
-cfg_obj_isuint64(cfg_obj_t *obj);
+cfg_obj_isuint64(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of integer type.
  */
 
 isc_uint64_t
-cfg_obj_asuint64(cfg_obj_t *obj);
+cfg_obj_asuint64(const cfg_obj_t *obj);
 /*
  * Returns the value of a configuration object of 64-bit integer type.
  *
@@ -239,13 +239,13 @@ cfg_obj_asuint64(cfg_obj_t *obj);
  */
 
 isc_boolean_t
-cfg_obj_isstring(cfg_obj_t *obj);
+cfg_obj_isstring(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of string type.
  */
 
-char *
-cfg_obj_asstring(cfg_obj_t *obj);
+const char *
+cfg_obj_asstring(const cfg_obj_t *obj);
 /*
  * Returns the value of a configuration object of a string type
  * as a null-terminated string.
@@ -258,13 +258,13 @@ cfg_obj_asstring(cfg_obj_t *obj);
  */
 
 isc_boolean_t
-cfg_obj_isboolean(cfg_obj_t *obj);
+cfg_obj_isboolean(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of a boolean type.
  */
 
 isc_boolean_t
-cfg_obj_asboolean(cfg_obj_t *obj);
+cfg_obj_asboolean(const cfg_obj_t *obj);
 /*
  * Returns the value of a configuration object of a boolean type.
  *
@@ -276,13 +276,13 @@ cfg_obj_asboolean(cfg_obj_t *obj);
  */
 
 isc_boolean_t
-cfg_obj_issockaddr(cfg_obj_t *obj);
+cfg_obj_issockaddr(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is a socket address.
  */
 
-isc_sockaddr_t *
-cfg_obj_assockaddr(cfg_obj_t *obj);
+const isc_sockaddr_t *
+cfg_obj_assockaddr(const cfg_obj_t *obj);
 /*
  * Returns the value of a configuration object representing a socket address.
  *
@@ -295,13 +295,13 @@ cfg_obj_assockaddr(cfg_obj_t *obj);
  */
 
 isc_boolean_t
-cfg_obj_isnetprefix(cfg_obj_t *obj);
+cfg_obj_isnetprefix(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is a network prefix.
  */
 
 void
-cfg_obj_asnetprefix(cfg_obj_t *obj, isc_netaddr_t *netaddr,
+cfg_obj_asnetprefix(const cfg_obj_t *obj, isc_netaddr_t *netaddr,
 		    unsigned int *prefixlen);
 /*
  * Gets the value of a configuration object representing a network
@@ -314,13 +314,13 @@ cfg_obj_asnetprefix(cfg_obj_t *obj, isc_netaddr_t *netaddr,
  */
 
 isc_boolean_t
-cfg_obj_islist(cfg_obj_t *obj);
+cfg_obj_islist(const cfg_obj_t *obj);
 /*
  * Return true iff 'obj' is of list type.
  */
 
-cfg_listelt_t *
-cfg_list_first(cfg_obj_t *obj);
+const cfg_listelt_t *
+cfg_list_first(const cfg_obj_t *obj);
 /*
  * Returns the first list element in a configuration object of a list type.
  *
@@ -332,8 +332,8 @@ cfg_list_first(cfg_obj_t *obj);
  * 	or NULL if the list is empty or nonexistent.
  */
 
-cfg_listelt_t *
-cfg_list_next(cfg_listelt_t *elt);
+const cfg_listelt_t *
+cfg_list_next(const cfg_listelt_t *elt);
 /*
  * Returns the next element of a list of configuration objects.
  *
@@ -346,8 +346,8 @@ cfg_list_next(cfg_listelt_t *elt);
  * 	or NULL if there are no more elements.
  */
 
-cfg_obj_t *
-cfg_listelt_value(cfg_listelt_t *elt);
+const cfg_obj_t *
+cfg_listelt_value(const cfg_listelt_t *elt);
 /*
  * Returns the configuration object associated with cfg_listelt_t.
  *
@@ -360,7 +360,7 @@ cfg_listelt_value(cfg_listelt_t *elt);
  */
 
 void
-cfg_print(cfg_obj_t *obj,
+cfg_print(const cfg_obj_t *obj,
 	  void (*f)(void *closure, const char *text, int textlen),
 	  void *closure);
 /*
@@ -378,7 +378,7 @@ cfg_print_grammar(const cfg_type_t *type,
  */
 
 isc_boolean_t
-cfg_obj_istype(cfg_obj_t *obj, const cfg_type_t *type);
+cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type);
 /*
  * Return true iff 'obj' is of type 'type'. 
  */
@@ -389,7 +389,8 @@ void cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **obj);
  */
 
 void
-cfg_obj_log(cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, ...)
+cfg_obj_log(const cfg_obj_t *obj, isc_log_t *lctx, int level,
+            const char *fmt, ...)
 	ISC_FORMAT_PRINTF(4, 5);
 /*
  * Log a message concerning configuration object 'obj' to the logging
@@ -398,13 +399,13 @@ cfg_obj_log(cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, ...)
  */
 
 const char *
-cfg_obj_file(cfg_obj_t *obj);
+cfg_obj_file(const cfg_obj_t *obj);
 /*
  * Return the file that defined this object.
  */
 
 unsigned int
-cfg_obj_line(cfg_obj_t *obj);
+cfg_obj_line(const cfg_obj_t *obj);
 /*
  * Return the line in file where this object was defined.
  */
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 92b142b7..4aaeb4ff 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: grammar.h,v 1.3.50.4 2004/11/30 01:15:44 marka Exp $ */
+/* $Id: grammar.h,v 1.3.50.6 2006/03/02 00:37:20 marka Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1
@@ -63,7 +63,7 @@ typedef struct cfg_rep cfg_rep_t;
 
 typedef isc_result_t (*cfg_parsefunc_t)(cfg_parser_t *, const cfg_type_t *type,
 					cfg_obj_t **);
-typedef void	     (*cfg_printfunc_t)(cfg_printer_t *, cfg_obj_t *);
+typedef void	     (*cfg_printfunc_t)(cfg_printer_t *, const cfg_obj_t *);
 typedef void	     (*cfg_docfunc_t)(cfg_printer_t *, const cfg_type_t *);
 typedef void	     (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
 
@@ -156,7 +156,7 @@ struct cfg_obj {
 		isc_sockaddr_t	sockaddr;
 		cfg_netprefix_t netprefix;
 	}               value;
-	char *		file;
+	const char *	file;
 	unsigned int    line;
 };
 
@@ -274,16 +274,16 @@ isc_result_t
 cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_uint32(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_uint32(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
-cfg_print_uint64(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 isc_result_t
 cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_ustring(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_ustring(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 isc_result_t
 cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
@@ -292,7 +292,7 @@ isc_result_t
 cfg_parse_rawaddr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na);
 
 void
-cfg_print_rawaddr(cfg_printer_t *pctx, isc_netaddr_t *na);
+cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na);
 
 isc_boolean_t
 cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags);
@@ -304,7 +304,7 @@ isc_result_t
 cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_sockaddr(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -323,7 +323,7 @@ isc_result_t
 cfg_parse_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_tuple(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_tuple(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -339,7 +339,7 @@ isc_result_t
 cfg_parse_bracketed_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_bracketed_list(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_bracketed_list(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -348,7 +348,7 @@ isc_result_t
 cfg_parse_spacelist(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_spacelist(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 isc_result_t
 cfg_parse_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
@@ -374,7 +374,7 @@ isc_result_t
 cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_map(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_map(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -383,7 +383,7 @@ isc_result_t
 cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_mapbody(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -392,7 +392,7 @@ isc_result_t
 cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_void(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_void(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -401,7 +401,7 @@ isc_result_t
 cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 void
-cfg_print_obj(cfg_printer_t *pctx, cfg_obj_t *obj);
+cfg_print_obj(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 void
 cfg_doc_obj(cfg_printer_t *pctx, const cfg_type_t *type);
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index bfc5dda4..d54bbe23 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.21.44.32 2005/10/26 05:06:40 marka Exp $ */
+/* $Id: namedconf.c,v 1.21.44.34 2006/03/02 00:37:20 marka Exp $ */
 
 #include <config.h>
 
@@ -58,7 +58,7 @@ static isc_result_t
 parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 static void
-print_keyvalue(cfg_printer_t *pctx, cfg_obj_t *obj);
+print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 static void
 doc_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type);
@@ -428,7 +428,7 @@ static cfg_type_t cfg_type_transferformat = {
  */
 
 static void
-print_none(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_none(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	UNUSED(obj);
 	cfg_print_chars(pctx, "none", 4);
 }
@@ -469,7 +469,7 @@ static cfg_type_t cfg_type_qstringornone = {
  */
 
 static void
-print_hostname(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_hostname(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	UNUSED(obj);
 	cfg_print_chars(pctx, "hostname", 4);
 }
@@ -1127,7 +1127,7 @@ parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **
 }
 
 static void
-print_keyvalue(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	const keyword_type_t *kw = obj->type->of;
 	cfg_print_cstr(pctx, kw->name);
 	cfg_print_chars(pctx, " ", 1);
@@ -1332,7 +1332,7 @@ parse_querysource6(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 }
 
 static void
-print_querysource(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	isc_netaddr_t na;
 	isc_netaddr_fromsockaddr(&na, &obj->value.sockaddr);
 	cfg_print_chars(pctx, "address ", 8);
@@ -1408,7 +1408,7 @@ static cfg_tuplefielddef_t negated_fields[] = {
 };
 
 static void
-print_negated(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_negated(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	cfg_print_chars(pctx, "!", 1);
 	cfg_print_tuple(pctx, obj);
 }
@@ -1625,7 +1625,7 @@ parse_logfile(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 }
 
 static void
-print_logfile(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	cfg_print_obj(pctx, obj->value.tuple[0]); /* file */
 	if (obj->value.tuple[1]->type->print != cfg_print_void) {
 		cfg_print_chars(pctx, " versions ", 10);
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index f72c3c2b..42ce9f0c 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.70.2.20.2.18 2004/05/15 03:46:13 jinmei Exp $ */
+/* $Id: parser.c,v 1.70.2.20.2.21 2006/02/28 06:32:54 marka Exp $ */
 
 #include <config.h>
 
@@ -68,7 +68,7 @@ static isc_result_t
 parse_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 
 static void
-print_list(cfg_printer_t *pctx, cfg_obj_t *obj);
+print_list(cfg_printer_t *pctx, const cfg_obj_t *obj);
 
 static void
 free_list(cfg_parser_t *pctx, cfg_obj_t *obj);
@@ -134,7 +134,7 @@ static cfg_type_t cfg_type_implicitlist = {
 /* Functions. */
 
 void
-cfg_print_obj(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_obj(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	obj->type->print(pctx, obj);
 }
 
@@ -177,7 +177,7 @@ cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 }
 
 void
-cfg_print(cfg_obj_t *obj,
+cfg_print(const cfg_obj_t *obj,
 	  void (*f)(void *closure, const char *text, int textlen),
 	  void *closure)
 {
@@ -243,14 +243,14 @@ cfg_parse_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 }
 
 void
-cfg_print_tuple(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	unsigned int i;
 	const cfg_tuplefielddef_t *fields = obj->type->of;
 	const cfg_tuplefielddef_t *f;
 	isc_boolean_t need_space = ISC_FALSE;
 
 	for (f = fields, i = 0; f->name != NULL; f++, i++) {
-		cfg_obj_t *fieldobj = obj->value.tuple[i];
+		const cfg_obj_t *fieldobj = obj->value.tuple[i];
 		if (need_space)
 			cfg_print_chars(pctx, " ", 1);
 		cfg_print_obj(pctx, fieldobj);
@@ -291,13 +291,13 @@ free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj) {
 }
 
 isc_boolean_t
-cfg_obj_istuple(cfg_obj_t *obj) {
+cfg_obj_istuple(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_tuple));
 }
 
-cfg_obj_t *
-cfg_tuple_get(cfg_obj_t *tupleobj, const char* name) {
+const cfg_obj_t *
+cfg_tuple_get(const cfg_obj_t *tupleobj, const char* name) {
 	unsigned int i;
 	const cfg_tuplefielddef_t *fields;
 	const cfg_tuplefielddef_t *f;
@@ -548,7 +548,7 @@ cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 }
 
 void
-cfg_print_void(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_void(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	UNUSED(pctx);
 	UNUSED(obj);
 }
@@ -560,7 +560,7 @@ cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 isc_boolean_t
-cfg_obj_isvoid(cfg_obj_t *obj) {
+cfg_obj_isvoid(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_void));
 }
@@ -606,18 +606,18 @@ cfg_print_rawuint(cfg_printer_t *pctx, unsigned int u) {
 }
 
 void
-cfg_print_uint32(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_uint32(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	cfg_print_rawuint(pctx, obj->value.uint32);
 }
 
 isc_boolean_t
-cfg_obj_isuint32(cfg_obj_t *obj) {
+cfg_obj_isuint32(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_uint32));
 }
 
 isc_uint32_t
-cfg_obj_asuint32(cfg_obj_t *obj) {
+cfg_obj_asuint32(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint32);
 	return (obj->value.uint32);
 }
@@ -632,19 +632,19 @@ cfg_type_t cfg_type_uint32 = {
  * uint64
  */
 isc_boolean_t
-cfg_obj_isuint64(cfg_obj_t *obj) {
+cfg_obj_isuint64(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_uint64));
 }
 
 isc_uint64_t
-cfg_obj_asuint64(cfg_obj_t *obj) {
+cfg_obj_asuint64(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint64);
 	return (obj->value.uint64);
 }
 
 void
-cfg_print_uint64(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	char buf[32];
 	snprintf(buf, sizeof(buf), "%" ISC_PRINT_QUADFORMAT "u",
 		 obj->value.uint64);
@@ -723,7 +723,9 @@ parse_ustring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 }
 
 isc_result_t
-cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
+cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type,
+		  cfg_obj_t **ret)
+{
         isc_result_t result;
 	UNUSED(type);
 
@@ -781,12 +783,12 @@ cfg_doc_enum(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 void
-cfg_print_ustring(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_ustring(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	cfg_print_chars(pctx, obj->value.string.base, obj->value.string.length);
 }
 
 static void
-print_qstring(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_qstring(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	cfg_print_chars(pctx, "\"", 1);
 	cfg_print_ustring(pctx, obj);
 	cfg_print_chars(pctx, "\"", 1);
@@ -799,13 +801,13 @@ free_string(cfg_parser_t *pctx, cfg_obj_t *obj) {
 }
 
 isc_boolean_t
-cfg_obj_isstring(cfg_obj_t *obj) {
+cfg_obj_isstring(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_string));
 }
 
-char *
-cfg_obj_asstring(cfg_obj_t *obj) {
+const char *
+cfg_obj_asstring(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_string);
 	return (obj->value.string.base);
 }
@@ -833,13 +835,13 @@ cfg_type_t cfg_type_astring = {
  */
 
 isc_boolean_t
-cfg_obj_isboolean(cfg_obj_t *obj) {
+cfg_obj_isboolean(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_boolean));
 }
 
 isc_boolean_t
-cfg_obj_asboolean(cfg_obj_t *obj) {
+cfg_obj_asboolean(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_boolean);
 	return (obj->value.boolean);
 }
@@ -885,7 +887,7 @@ parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 }
 
 static void
-print_boolean(cfg_printer_t *pctx, cfg_obj_t *obj) {
+print_boolean(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	if (obj->value.boolean)
 		cfg_print_chars(pctx, "yes", 3);
 	else
@@ -999,9 +1001,9 @@ parse_list(cfg_parser_t *pctx, const cfg_type_t *listtype, cfg_obj_t **ret)
 }
 
 static void
-print_list(cfg_printer_t *pctx, cfg_obj_t *obj) {
-	cfg_list_t *list = &obj->value.list;
-	cfg_listelt_t *elt;
+print_list(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+	const cfg_list_t *list = &obj->value.list;
+	const cfg_listelt_t *elt;
 
 	for (elt = ISC_LIST_HEAD(*list);
 	     elt != NULL;
@@ -1025,7 +1027,7 @@ cfg_parse_bracketed_list(cfg_parser_t *pctx, const cfg_type_t *type,
 }
 
 void
-cfg_print_bracketed_list(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_bracketed_list(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	print_open(pctx);
 	print_list(pctx, obj);
 	print_close(pctx);
@@ -1072,9 +1074,9 @@ cfg_parse_spacelist(cfg_parser_t *pctx, const cfg_type_t *listtype,
 }
 
 void
-cfg_print_spacelist(cfg_printer_t *pctx, cfg_obj_t *obj) {
-	cfg_list_t *list = &obj->value.list;
-	cfg_listelt_t *elt;
+cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+	const cfg_list_t *list = &obj->value.list;
+	const cfg_listelt_t *elt;
 
 	for (elt = ISC_LIST_HEAD(*list);
 	     elt != NULL;
@@ -1087,27 +1089,27 @@ cfg_print_spacelist(cfg_printer_t *pctx, cfg_obj_t *obj) {
 
 
 isc_boolean_t
-cfg_obj_islist(cfg_obj_t *obj) {
+cfg_obj_islist(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_list));
 }
 
-cfg_listelt_t *
-cfg_list_first(cfg_obj_t *obj) {
+const cfg_listelt_t *
+cfg_list_first(const cfg_obj_t *obj) {
 	REQUIRE(obj == NULL || obj->type->rep == &cfg_rep_list);
 	if (obj == NULL)
 		return (NULL);
 	return (ISC_LIST_HEAD(obj->value.list));
 }
 
-cfg_listelt_t *
-cfg_list_next(cfg_listelt_t *elt) {
+const cfg_listelt_t *
+cfg_list_next(const cfg_listelt_t *elt) {
 	REQUIRE(elt != NULL);
 	return (ISC_LIST_NEXT(elt, link));
 }
 
-cfg_obj_t *
-cfg_listelt_value(cfg_listelt_t *elt) {
+const cfg_obj_t *
+cfg_listelt_value(const cfg_listelt_t *elt) {
 	REQUIRE(elt != NULL);
 	return (elt->obj);
 }
@@ -1366,7 +1368,7 @@ cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **
 }
 
 void
-cfg_print_mapbody(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	isc_result_t result = ISC_R_SUCCESS;
 
 	const cfg_clausedef_t * const *clauseset;
@@ -1446,7 +1448,7 @@ static struct flagtext {
 };
 
 void
-cfg_print_map(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_map(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	if (obj->value.map.id != NULL) {
 		cfg_print_obj(pctx, obj->value.map.id);
 		cfg_print_chars(pctx, " ", 1);
@@ -1505,16 +1507,16 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 isc_boolean_t
-cfg_obj_ismap(cfg_obj_t *obj) {
+cfg_obj_ismap(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_map));
 }
 
 isc_result_t
-cfg_map_get(cfg_obj_t *mapobj, const char* name, cfg_obj_t **obj) {
+cfg_map_get(const cfg_obj_t *mapobj, const char* name, const cfg_obj_t **obj) {
 	isc_result_t result;
 	isc_symvalue_t val;
-	cfg_map_t *map;
+	const cfg_map_t *map;
 	
 	REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map);
 	REQUIRE(name != NULL);
@@ -1529,8 +1531,8 @@ cfg_map_get(cfg_obj_t *mapobj, const char* name, cfg_obj_t **obj) {
 	return (ISC_R_SUCCESS);
 }
 
-cfg_obj_t *
-cfg_map_getname(cfg_obj_t *mapobj) {
+const cfg_obj_t *
+cfg_map_getname(const cfg_obj_t *mapobj) {
 	REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map);
 	return (mapobj->value.map.id);
 }
@@ -1556,12 +1558,19 @@ parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	isc_lex_getlasttokentext(pctx->lexer, &pctx->token, &r);
 
 	obj->value.string.base = isc_mem_get(pctx->mctx, r.length + 1);
+	if (obj->value.string.base == NULL) {
+		result = ISC_R_NOMEMORY;
+		goto cleanup;
+	}
 	obj->value.string.length = r.length;
 	memcpy(obj->value.string.base, r.base, r.length);
 	obj->value.string.base[r.length] = '\0';
 	*ret = obj;
+	return (result);
 
  cleanup:
+	if (obj != NULL)
+		isc_mem_put(pctx->mctx, obj, sizeof(*obj));
 	return (result);
 }
 
@@ -1753,7 +1762,7 @@ cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port) {
 }
 
 void
-cfg_print_rawaddr(cfg_printer_t *pctx, isc_netaddr_t *na) {
+cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na) {
 	isc_result_t result;
 	char text[128];
 	isc_buffer_t buf;
@@ -1843,21 +1852,22 @@ cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type,
 }
 
 static void
-print_netprefix(cfg_printer_t *pctx, cfg_obj_t *obj) {
-	cfg_netprefix_t *p = &obj->value.netprefix;
+print_netprefix(cfg_printer_t *pctx, const cfg_obj_t *obj) {
+	const cfg_netprefix_t *p = &obj->value.netprefix;
+
 	cfg_print_rawaddr(pctx, &p->address);
 	cfg_print_chars(pctx, "/", 1);
 	cfg_print_rawuint(pctx, p->prefixlen);
 }
 
 isc_boolean_t
-cfg_obj_isnetprefix(cfg_obj_t *obj) {
+cfg_obj_isnetprefix(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_netprefix));
 }
 
 void
-cfg_obj_asnetprefix(cfg_obj_t *obj, isc_netaddr_t *netaddr,
+cfg_obj_asnetprefix(const cfg_obj_t *obj, isc_netaddr_t *netaddr,
 		    unsigned int *prefixlen) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_netprefix);
 	*netaddr = obj->value.netprefix.address;
@@ -1908,7 +1918,7 @@ cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 }
 
 void
-cfg_print_sockaddr(cfg_printer_t *pctx, cfg_obj_t *obj) {
+cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 	isc_netaddr_t netaddr;
 	in_port_t port;
 	char buf[ISC_NETADDR_FORMATSIZE];
@@ -1929,8 +1939,6 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) {
 	int n = 0;
 	cfg_print_chars(pctx, "( ", 2);
 	if (*flagp & CFG_ADDR_V4OK) {
-		if (n != 0)
-			cfg_print_chars(pctx, " | ", 3);
 		cfg_print_cstr(pctx, "<ipv4_address>");
 		n++;
 	}
@@ -1955,13 +1963,13 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) {
 }
 
 isc_boolean_t
-cfg_obj_issockaddr(cfg_obj_t *obj) {
+cfg_obj_issockaddr(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL);
 	return (ISC_TF(obj->type->rep == &cfg_rep_sockaddr));
 }
 
-isc_sockaddr_t *
-cfg_obj_assockaddr(cfg_obj_t *obj) {
+const isc_sockaddr_t *
+cfg_obj_assockaddr(const cfg_obj_t *obj) {
 	REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_sockaddr);
 	return (&obj->value.sockaddr);
 }
@@ -2158,7 +2166,8 @@ parser_complain(cfg_parser_t *pctx, isc_boolean_t is_warning,
 }
 
 void
-cfg_obj_log(cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, ...) {
+cfg_obj_log(const cfg_obj_t *obj, isc_log_t *lctx, int level,
+	    const char *fmt, ...) {
 	va_list ap;
 	char msgbuf[2048];
 
@@ -2176,12 +2185,12 @@ cfg_obj_log(cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, ...) {
 }
 
 const char *
-cfg_obj_file(cfg_obj_t *obj) {
+cfg_obj_file(const cfg_obj_t *obj) {
 	return (obj->file);
 }
 
 unsigned int
-cfg_obj_line(cfg_obj_t *obj) {
+cfg_obj_line(const cfg_obj_t *obj) {
 	return (obj->line);
 }
 
@@ -2223,7 +2232,6 @@ create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	CHECK(isc_symtab_create(pctx->mctx, 5, /* XXX */
 				map_symtabitem_destroy,
 				pctx, ISC_FALSE, &symtab));
-
 	obj->value.map.symtab = symtab;
 	obj->value.map.id = NULL;
 
@@ -2243,7 +2251,7 @@ free_map(cfg_parser_t *pctx, cfg_obj_t *obj) {
 }
 
 isc_boolean_t
-cfg_obj_istype(cfg_obj_t *obj, const cfg_type_t *type) {
+cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) {
 	return (ISC_TF(obj->type == type));
 }
 
diff --git a/lib/isccfg/win32/libisccfg.dsp b/lib/isccfg/win32/libisccfg.dsp
index 041c38ac..358d0d15 100644
--- a/lib/isccfg/win32/libisccfg.dsp
+++ b/lib/isccfg/win32/libisccfg.dsp
@@ -1,149 +1,149 @@
-# Microsoft Developer Studio Project File - Name="libisccfg" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libisccfg - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccfg.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /YX /FD /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll"

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR /YX /FD /GZ /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libisccfg - Win32 Release"

-# Name "libisccfg - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\DLLMain.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\log.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\namedconf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\parser.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\isccfg\cfg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccfg\check.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccfg\grammar.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccfg\log.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\isccfg\namedconf.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Source File

-

-SOURCE=.\libisccfg.def

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="libisccfg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libisccfg - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccfg.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll"
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libisccfg - Win32 Release"
+# Name "libisccfg - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\namedconf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\isccfg\cfg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccfg\check.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccfg\grammar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccfg\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\isccfg\namedconf.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=.\libisccfg.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/isccfg/win32/libisccfg.dsw b/lib/isccfg/win32/libisccfg.dsw
index 2851ea80..ccc8711e 100644
--- a/lib/isccfg/win32/libisccfg.dsw
+++ b/lib/isccfg/win32/libisccfg.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libisccfg"=".\libisccfg.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libisccfg"=".\libisccfg.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/isccfg/win32/libisccfg.mak b/lib/isccfg/win32/libisccfg.mak
index 16d0a909..56f5c3b2 100644
--- a/lib/isccfg/win32/libisccfg.mak
+++ b/lib/isccfg/win32/libisccfg.mak
@@ -1,323 +1,323 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libisccfg.dsp

-!IF "$(CFG)" == ""

-CFG=libisccfg - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to libisccfg - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "libisccfg - Win32 Release" && "$(CFG)" != "libisccfg - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Release\libisccfg.dll"

-

-!ELSE 

-

-ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccfg.dll"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 ReleaseCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\namedconf.obj"

-	-@erase "$(INTDIR)\parser.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(OUTDIR)\libisccfg.exp"

-	-@erase "$(OUTDIR)\libisccfg.lib"

-	-@erase "..\..\..\Build\Release\libisccfg.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" 

-DEF_FILE= \

-	".\libisccfg.def"

-LINK32_OBJS= \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\parser.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\namedconf.obj" \

-	"..\..\isc\win32\Release\libisc.lib"

-

-"..\..\..\Build\Release\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-!IF "$(RECURSE)" == "0" 

-

-ALL : "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"

-

-!ELSE 

-

-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"

-

-!ENDIF 

-

-!IF "$(RECURSE)" == "1" 

-CLEAN :"libisc - Win32 DebugCLEAN" 

-!ELSE 

-CLEAN :

-!ENDIF 

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\log.obj"

-	-@erase "$(INTDIR)\log.sbr"

-	-@erase "$(INTDIR)\namedconf.obj"

-	-@erase "$(INTDIR)\namedconf.sbr"

-	-@erase "$(INTDIR)\parser.obj"

-	-@erase "$(INTDIR)\parser.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(OUTDIR)\libisccfg.bsc"

-	-@erase "$(OUTDIR)\libisccfg.exp"

-	-@erase "$(OUTDIR)\libisccfg.lib"

-	-@erase "$(OUTDIR)\libisccfg.pdb"

-	-@erase "..\..\..\Build\Debug\libisccfg.dll"

-	-@erase "..\..\..\Build\Debug\libisccfg.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\log.sbr" \

-	"$(INTDIR)\parser.sbr" \

-	"$(INTDIR)\version.sbr" \

-	"$(INTDIR)\namedconf.sbr"

-

-"$(OUTDIR)\libisccfg.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\libisccfg.def"

-LINK32_OBJS= \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\log.obj" \

-	"$(INTDIR)\parser.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\namedconf.obj" \

-	"..\..\isc\win32\Debug\libisc.lib"

-

-"..\..\..\Build\Debug\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("libisccfg.dep")

-!INCLUDE "libisccfg.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "libisccfg.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "libisccfg - Win32 Release" || "$(CFG)" == "libisccfg - Win32 Debug"

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\log.c

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-

-"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-

-"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\namedconf.c

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-

-"$(INTDIR)\namedconf.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-

-"$(INTDIR)\namedconf.obj"	"$(INTDIR)\namedconf.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\parser.c

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-

-"$(INTDIR)\parser.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-

-"$(INTDIR)\parser.obj"	"$(INTDIR)\parser.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-!IF  "$(CFG)" == "libisccfg - Win32 Release"

-

-"libisc - Win32 Release" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 

-   cd "..\..\isccfg\win32"

-

-"libisc - Win32 ReleaseCLEAN" : 

-   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 "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 

-   cd "..\..\isccfg\win32"

-

-"libisc - Win32 DebugCLEAN" : 

-   cd "..\..\isc\win32"

-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 

-   cd "..\..\isccfg\win32"

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on libisccfg.dsp
+!IF "$(CFG)" == ""
+CFG=libisccfg - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to libisccfg - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "libisccfg - Win32 Release" && "$(CFG)" != "libisccfg - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\libisccfg.dll"
+
+!ELSE 
+
+ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccfg.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\namedconf.obj"
+	-@erase "$(INTDIR)\parser.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(OUTDIR)\libisccfg.exp"
+	-@erase "$(OUTDIR)\libisccfg.lib"
+	-@erase "..\..\..\Build\Release\libisccfg.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" 
+DEF_FILE= \
+	".\libisccfg.def"
+LINK32_OBJS= \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\parser.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\namedconf.obj" \
+	"..\..\isc\win32\Release\libisc.lib"
+
+"..\..\..\Build\Release\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
+
+!ELSE 
+
+ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\log.obj"
+	-@erase "$(INTDIR)\log.sbr"
+	-@erase "$(INTDIR)\namedconf.obj"
+	-@erase "$(INTDIR)\namedconf.sbr"
+	-@erase "$(INTDIR)\parser.obj"
+	-@erase "$(INTDIR)\parser.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(OUTDIR)\libisccfg.bsc"
+	-@erase "$(OUTDIR)\libisccfg.exp"
+	-@erase "$(OUTDIR)\libisccfg.lib"
+	-@erase "$(OUTDIR)\libisccfg.pdb"
+	-@erase "..\..\..\Build\Debug\libisccfg.dll"
+	-@erase "..\..\..\Build\Debug\libisccfg.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\log.sbr" \
+	"$(INTDIR)\parser.sbr" \
+	"$(INTDIR)\version.sbr" \
+	"$(INTDIR)\namedconf.sbr"
+
+"$(OUTDIR)\libisccfg.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\libisccfg.def"
+LINK32_OBJS= \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\log.obj" \
+	"$(INTDIR)\parser.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\namedconf.obj" \
+	"..\..\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libisccfg.dep")
+!INCLUDE "libisccfg.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libisccfg.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libisccfg - Win32 Release" || "$(CFG)" == "libisccfg - Win32 Debug"
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\log.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\log.obj"	"$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\namedconf.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\namedconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\namedconf.obj"	"$(INTDIR)\namedconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\parser.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\parser.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\parser.obj"	"$(INTDIR)\parser.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+"libisc - Win32 Release" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   cd "..\..\isccfg\win32"
+
+"libisc - Win32 ReleaseCLEAN" : 
+   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 "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   cd "..\..\isccfg\win32"
+
+"libisc - Win32 DebugCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\..\isccfg\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/lwres/api b/lib/lwres/api
index 0ab1e92d..b5b94878 100644
--- a/lib/lwres/api
+++ b/lib/lwres/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 10
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 1
diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c
index c0632744..6779ee1e 100644
--- a/lib/lwres/getaddrinfo.c
+++ b/lib/lwres/getaddrinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * This code is derived from software contributed to ISC by
@@ -18,7 +18,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddrinfo.c,v 1.41.206.3 2005/06/09 23:54:33 marka Exp $ */
+/* $Id: getaddrinfo.c,v 1.41.206.5 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -325,8 +325,10 @@ lwres_getaddrinfo(const char *hostname, const char *servname,
 						      NULL, 0,
 						      NI_NUMERICHOST) == 0) {
 					ai->ai_canonname = strdup(nbuf);
-					if (ai->ai_canonname == NULL)
+					if (ai->ai_canonname == NULL) {
+						lwres_freeaddrinfo(ai_list);
 						return (EAI_MEMORY);
+					}
 				} else {
 					/* XXX raise error? */
 					ai->ai_canonname = NULL;
diff --git a/lib/lwres/man/lwres.html b/lib/lwres/man/lwres.html
index 1d5e57bf..590348fb 100644
--- a/lib/lwres/man/lwres.html
+++ b/lib/lwres/man/lwres.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres.html,v 1.4.2.1.4.9 2005/10/13 02:33:54 marka Exp $ -->
+<!-- $Id: lwres.html,v 1.4.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres &#8212; introduction to the lightweight resolver library</p>
@@ -32,7 +32,7 @@
 <div class="funcsynopsis"><pre class="funcsynopsisinfo">#include &lt;lwres/lwres.h&gt;</pre></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525832"></a><h2>DESCRIPTION</h2>
+<a name="id2524056"></a><h2>DESCRIPTION</h2>
 <p>
 The BIND 9 lightweight resolver library is a simple, name service
 independent stub resolver library.  It provides hostname-to-address
@@ -47,7 +47,7 @@ UDP-based protocol.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525845"></a><h2>OVERVIEW</h2>
+<a name="id2524069"></a><h2>OVERVIEW</h2>
 <p>
 The lwresd library implements multiple name service APIs.
 The standard
@@ -101,7 +101,7 @@ and servers is outlined in the following sections.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525909"></a><h2>CLIENT-SIDE LOW-LEVEL API CALL FLOW</h2>
+<a name="id2524474"></a><h2>CLIENT-SIDE LOW-LEVEL API CALL FLOW</h2>
 <p>
 When a client program wishes to make an lwres request using the
 native low-level API, it typically performs the following 
@@ -147,7 +147,7 @@ packet specific information contained in the body.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526056"></a><h2>SERVER-SIDE LOW-LEVEL API CALL FLOW</h2>
+<a name="id2525304"></a><h2>SERVER-SIDE LOW-LEVEL API CALL FLOW</h2>
 <p>
 When implementing the server side of the lightweight resolver
 protocol using the lwres library, a sequence of actions like the
@@ -188,7 +188,7 @@ set.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526141"></a><h2>SEE ALSO</h2>
+<a name="id2525389"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_gethostent</span>(3)</span>,
 
diff --git a/lib/lwres/man/lwres_buffer.html b/lib/lwres/man/lwres_buffer.html
index 5a203f1a..b08694c5 100644
--- a/lib/lwres/man/lwres_buffer.html
+++ b/lib/lwres/man/lwres_buffer.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_buffer.html,v 1.4.2.1.4.8 2005/10/13 02:33:55 marka Exp $ -->
+<!-- $Id: lwres_buffer.html,v 1.4.2.1.4.9 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_buffer_init, lwres_buffer_invalidate, lwres_buffer_add, lwres_buffer_subtract, lwres_buffer_clear, lwres_buffer_first, lwres_buffer_forward, lwres_buffer_back, lwres_buffer_getuint8, lwres_buffer_putuint8, lwres_buffer_getuint16, lwres_buffer_putuint16, lwres_buffer_getuint32, lwres_buffer_putuint32, lwres_buffer_putmem, lwres_buffer_getmem &#8212; lightweight resolver buffer management</p>
@@ -249,7 +249,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526109"></a><h2>DESCRIPTION</h2>
+<a name="id2525357"></a><h2>DESCRIPTION</h2>
 <p>
 These functions provide bounds checked access to a region of memory
 where data is being read or written.
diff --git a/lib/lwres/man/lwres_config.html b/lib/lwres/man/lwres_config.html
index 7ea416b6..ebab0826 100644
--- a/lib/lwres/man/lwres_config.html
+++ b/lib/lwres/man/lwres_config.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_config.html,v 1.4.2.1.4.9 2005/10/13 02:33:55 marka Exp $ -->
+<!-- $Id: lwres_config.html,v 1.4.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_conf_init, lwres_conf_clear, lwres_conf_parse, lwres_conf_print, lwres_conf_get &#8212; lightweight resolver configuration</p>
@@ -88,7 +88,7 @@ lwres_conf_t *
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525910"></a><h2>DESCRIPTION</h2>
+<a name="id2524475"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_conf_init()</code>
 creates an empty
@@ -125,7 +125,7 @@ to the
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525981"></a><h2>RETURN VALUES</h2>
+<a name="id2525229"></a><h2>RETURN VALUES</h2>
 <p>
 <code class="function">lwres_conf_parse()</code>
 returns
@@ -150,14 +150,14 @@ If this happens, the function returns
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526021"></a><h2>SEE ALSO</h2>
+<a name="id2525269"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">stdio</span>(3)</span>,
 <span class="citerefentry"><span class="refentrytitle">resolver</span>(5)</span>.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526048"></a><h2>FILES</h2>
+<a name="id2525296"></a><h2>FILES</h2>
 <p>
 <code class="filename">/etc/resolv.conf</code>
 </p>
diff --git a/lib/lwres/man/lwres_context.html b/lib/lwres/man/lwres_context.html
index 8988c5dc..8a70edae 100644
--- a/lib/lwres/man/lwres_context.html
+++ b/lib/lwres/man/lwres_context.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_context.html,v 1.5.2.2.2.10 2005/10/13 02:33:55 marka Exp $ -->
+<!-- $Id: lwres_context.html,v 1.5.2.2.2.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_context_create, lwres_context_destroy, lwres_context_nextserial, lwres_context_initserial, lwres_context_freemem, lwres_context_allocmem, lwres_context_sendrecv &#8212; lightweight resolver context management</p>
@@ -160,7 +160,7 @@ void *
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525975"></a><h2>DESCRIPTION</h2>
+<a name="id2525223"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_context_create()</code>
 creates a
@@ -290,7 +290,7 @@ returned in
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526156"></a><h2>RETURN VALUES</h2>
+<a name="id2525404"></a><h2>RETURN VALUES</h2>
 <p>
 <code class="function">lwres_context_create()</code>
 returns
@@ -321,7 +321,7 @@ times out waiting for a response.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526208"></a><h2>SEE ALSO</h2>
+<a name="id2525456"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_conf_init</span>(3)</span>,
 
diff --git a/lib/lwres/man/lwres_gabn.html b/lib/lwres/man/lwres_gabn.html
index 77139450..08050b0d 100644
--- a/lib/lwres/man/lwres_gabn.html
+++ b/lib/lwres/man/lwres_gabn.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_gabn.html,v 1.6.2.1.4.9 2005/10/13 02:33:55 marka Exp $ -->
+<!-- $Id: lwres_gabn.html,v 1.6.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_gabnrequest_render, lwres_gabnresponse_render, lwres_gabnrequest_parse, lwres_gabnresponse_parse, lwres_gabnresponse_free, lwres_gabnrequest_free &#8212; lightweight resolver getaddrbyname message handling</p>
@@ -164,7 +164,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525963"></a><h2>DESCRIPTION</h2>
+<a name="id2525211"></a><h2>DESCRIPTION</h2>
 <p>
 These are low-level routines for creating and parsing
 lightweight resolver name-to-address lookup request and 
@@ -279,7 +279,7 @@ structures is also discarded.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526155"></a><h2>RETURN VALUES</h2>
+<a name="id2525403"></a><h2>RETURN VALUES</h2>
 <p>
 The getaddrbyname opcode functions
 <code class="function">lwres_gabnrequest_render()</code>, 
@@ -317,7 +317,7 @@ indicate that the packet is not a response to an earlier query.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526220"></a><h2>SEE ALSO</h2>
+<a name="id2525468"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_packet</span>(3
 )</span>
diff --git a/lib/lwres/man/lwres_gai_strerror.html b/lib/lwres/man/lwres_gai_strerror.html
index 55065641..254d08a2 100644
--- a/lib/lwres/man/lwres_gai_strerror.html
+++ b/lib/lwres/man/lwres_gai_strerror.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_gai_strerror.html,v 1.5.2.1.4.9 2005/10/13 02:33:55 marka Exp $ -->
+<!-- $Id: lwres_gai_strerror.html,v 1.5.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>gai_strerror &#8212; print suitable error string</p>
@@ -37,7 +37,7 @@ char *
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525843"></a><h2>DESCRIPTION</h2>
+<a name="id2524067"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_gai_strerror()</code>
 returns an error message corresponding to an error code returned by
@@ -109,7 +109,7 @@ used by
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526040"></a><h2>SEE ALSO</h2>
+<a name="id2525288"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">strerror</span>(3)</span>,
 
diff --git a/lib/lwres/man/lwres_getaddrinfo.html b/lib/lwres/man/lwres_getaddrinfo.html
index bc84e74f..c7a50a39 100644
--- a/lib/lwres/man/lwres_getaddrinfo.html
+++ b/lib/lwres/man/lwres_getaddrinfo.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_getaddrinfo.html,v 1.8.2.1.4.10 2005/10/13 02:33:56 marka Exp $ -->
+<!-- $Id: lwres_getaddrinfo.html,v 1.8.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_getaddrinfo, lwres_freeaddrinfo &#8212; socket address structure to host and service name</p>
@@ -87,7 +87,7 @@ struct  addrinfo {
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525883"></a><h2>DESCRIPTION</h2>
+<a name="id2524449"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_getaddrinfo()</code>
 is used to get a list of IP addresses and port numbers for host
@@ -284,7 +284,7 @@ created by a call to
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526309"></a><h2>RETURN VALUES</h2>
+<a name="id2525557"></a><h2>RETURN VALUES</h2>
 <p>
 <code class="function">lwres_getaddrinfo()</code>
 returns zero on success or one of the error codes listed in
@@ -304,7 +304,7 @@ returns
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526347"></a><h2>SEE ALSO</h2>
+<a name="id2525595"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres</span>(3)</span>,
 
diff --git a/lib/lwres/man/lwres_gethostent.html b/lib/lwres/man/lwres_gethostent.html
index 263f9932..a18873d7 100644
--- a/lib/lwres/man/lwres_gethostent.html
+++ b/lib/lwres/man/lwres_gethostent.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_gethostent.html,v 1.8.2.1.4.8 2005/10/13 02:33:56 marka Exp $ -->
+<!-- $Id: lwres_gethostent.html,v 1.8.2.1.4.9 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_gethostbyname, lwres_gethostbyname2, lwres_gethostbyaddr, lwres_gethostent, lwres_sethostent, lwres_endhostent, lwres_gethostbyname_r, lwres_gethostbyaddr_r, lwres_gethostent_r, lwres_sethostent_r, lwres_endhostent_r &#8212; lightweight resolver get network host entry</p>
@@ -187,7 +187,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526041"></a><h2>DESCRIPTION</h2>
+<a name="id2525289"></a><h2>DESCRIPTION</h2>
 <p>
 These functions provide hostname-to-address and
 address-to-hostname lookups by means of the lightweight resolver.
@@ -324,7 +324,7 @@ calls to <code class="function">lwres_gethostbyaddr_r()</code> return
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526380"></a><h2>RETURN VALUES</h2>
+<a name="id2525628"></a><h2>RETURN VALUES</h2>
 <p>
 The functions
 <code class="function">lwres_gethostbyname()</code>,
@@ -391,7 +391,7 @@ hostent</span>.  If <em class="parameter"><code>buf</code></em> was too small, b
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526540"></a><h2>SEE ALSO</h2>
+<a name="id2525788"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">gethostent</span>(3)</span>,
 
@@ -402,7 +402,7 @@ hostent</span>.  If <em class="parameter"><code>buf</code></em> was too small, b
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526644"></a><h2>BUGS</h2>
+<a name="id2525892"></a><h2>BUGS</h2>
 <p>
 <code class="function">lwres_gethostbyname()</code>,
 <code class="function">lwres_gethostbyname2()</code>,
diff --git a/lib/lwres/man/lwres_getipnode.html b/lib/lwres/man/lwres_getipnode.html
index c5038b4f..2bd7288d 100644
--- a/lib/lwres/man/lwres_getipnode.html
+++ b/lib/lwres/man/lwres_getipnode.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_getipnode.html,v 1.7.2.1.4.9 2005/10/13 02:33:56 marka Exp $ -->
+<!-- $Id: lwres_getipnode.html,v 1.7.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_getipnodebyname, lwres_getipnodebyaddr, lwres_freehostent &#8212; lightweight resolver nodename / address translation API</p>
@@ -92,7 +92,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525896"></a><h2>DESCRIPTION</h2>
+<a name="id2524461"></a><h2>DESCRIPTION</h2>
 <p>
 These functions perform thread safe, protocol independent
 nodename-to-address and address-to-nodename 
@@ -233,7 +233,7 @@ structure itself.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526131"></a><h2>RETURN VALUES</h2>
+<a name="id2525379"></a><h2>RETURN VALUES</h2>
 <p>
 If an error occurs,
 <code class="function">lwres_getipnodebyname()</code>
@@ -279,7 +279,7 @@ translates these error codes to suitable error messages.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526290"></a><h2>SEE ALSO</h2>
+<a name="id2525538"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">RFC2553</span></span>,
 
diff --git a/lib/lwres/man/lwres_getnameinfo.html b/lib/lwres/man/lwres_getnameinfo.html
index 6e7a7b16..850f988a 100644
--- a/lib/lwres/man/lwres_getnameinfo.html
+++ b/lib/lwres/man/lwres_getnameinfo.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_getnameinfo.html,v 1.5.2.1.4.9 2005/10/13 02:33:56 marka Exp $ -->
+<!-- $Id: lwres_getnameinfo.html,v 1.5.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_getnameinfo &#8212; lightweight resolver socket address structure to hostname and service name</p>
@@ -74,7 +74,7 @@ int
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525862"></a><h2>DESCRIPTION</h2>
+<a name="id2524086"></a><h2>DESCRIPTION</h2>
 <p> This function is equivalent to the <span class="citerefentry"><span class="refentrytitle">getnameinfo</span>(3)</span> function defined in RFC2133.
 <code class="function">lwres_getnameinfo()</code> returns the hostname for the
 <span class="type">struct sockaddr</span> <em class="parameter"><code>sa</code></em> which is
@@ -125,14 +125,14 @@ TCP.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525988"></a><h2>RETURN VALUES</h2>
+<a name="id2525236"></a><h2>RETURN VALUES</h2>
 <p>
 <code class="function">lwres_getnameinfo()</code>
 returns 0 on success or a non-zero error code if an error occurs.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526001"></a><h2>SEE ALSO</h2>
+<a name="id2525249"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">RFC2133</span></span>,
 <span class="citerefentry"><span class="refentrytitle">getservbyport</span>(3)</span>,
@@ -143,7 +143,7 @@ returns 0 on success or a non-zero error code if an error occurs.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526059"></a><h2>BUGS</h2>
+<a name="id2525307"></a><h2>BUGS</h2>
 <p>
 RFC2133 fails to define what the nonzero return values of
 <span class="citerefentry"><span class="refentrytitle">getnameinfo</span>(3)</span>
diff --git a/lib/lwres/man/lwres_getrrsetbyname.html b/lib/lwres/man/lwres_getrrsetbyname.html
index f36a1d21..1ec24089 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.html
+++ b/lib/lwres/man/lwres_getrrsetbyname.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_getrrsetbyname.html,v 1.5.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_getrrsetbyname.html,v 1.5.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_getrrsetbyname, lwres_freerrset &#8212; retrieve DNS records</p>
@@ -95,7 +95,7 @@ struct  rrsetinfo {
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525878"></a><h2>DESCRIPTION</h2>
+<a name="id2524443"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_getrrsetbyname()</code>
 gets a set of resource records associated with a
@@ -172,7 +172,7 @@ created by a call to
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526058"></a><h2>RETURN VALUES</h2>
+<a name="id2525306"></a><h2>RETURN VALUES</h2>
 <p>
 <code class="function">lwres_getrrsetbyname()</code>
 returns zero on success, and one of the following error
@@ -208,7 +208,7 @@ other failure
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526132"></a><h2>SEE ALSO</h2>
+<a name="id2525380"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres</span>(3)</span>.
 </p>
diff --git a/lib/lwres/man/lwres_gnba.html b/lib/lwres/man/lwres_gnba.html
index 89cf35e0..8a0f90ca 100644
--- a/lib/lwres/man/lwres_gnba.html
+++ b/lib/lwres/man/lwres_gnba.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_gnba.html,v 1.6.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_gnba.html,v 1.6.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_gnbarequest_render, lwres_gnbaresponse_render, lwres_gnbarequest_parse, lwres_gnbaresponse_parse, lwres_gnbaresponse_free, lwres_gnbarequest_free &#8212; lightweight resolver getnamebyaddress message handling</p>
@@ -172,7 +172,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525975"></a><h2>DESCRIPTION</h2>
+<a name="id2525223"></a><h2>DESCRIPTION</h2>
 <p>
 These are low-level routines for creating and parsing
 lightweight resolver address-to-name lookup request and 
@@ -277,7 +277,7 @@ structures is also discarded.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526100"></a><h2>RETURN VALUES</h2>
+<a name="id2525348"></a><h2>RETURN VALUES</h2>
 <p>
 The getnamebyaddr opcode functions
 <code class="function">lwres_gnbarequest_render()</code>,
@@ -315,7 +315,7 @@ indicate that the packet is not a response to an earlier query.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526165"></a><h2>SEE ALSO</h2>
+<a name="id2525413"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_packet</span>(3)</span>.
 </p>
diff --git a/lib/lwres/man/lwres_hstrerror.html b/lib/lwres/man/lwres_hstrerror.html
index 4204a336..57e3190b 100644
--- a/lib/lwres/man/lwres_hstrerror.html
+++ b/lib/lwres/man/lwres_hstrerror.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_hstrerror.html,v 1.5.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_hstrerror.html,v 1.5.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_herror, lwres_hstrerror &#8212; lightweight resolver error message generation</p>
@@ -40,7 +40,7 @@ const char *
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525859"></a><h2>DESCRIPTION</h2>
+<a name="id2524083"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_herror()</code> prints the string
 <em class="parameter"><code>s</code></em> on <span class="type">stderr</span> followed by the string
@@ -79,7 +79,7 @@ the error codes and messages are as follows:
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525971"></a><h2>RETURN VALUES</h2>
+<a name="id2525219"></a><h2>RETURN VALUES</h2>
 <p>
 The string <span class="errorname">Unknown resolver error</span> is returned by
 <code class="function">lwres_hstrerror()</code>
@@ -89,7 +89,7 @@ is not a valid error code.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525990"></a><h2>SEE ALSO</h2>
+<a name="id2525238"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">herror</span>(3)</span>,
 
diff --git a/lib/lwres/man/lwres_inetntop.html b/lib/lwres/man/lwres_inetntop.html
index 3c794a53..a9a532bb 100644
--- a/lib/lwres/man/lwres_inetntop.html
+++ b/lib/lwres/man/lwres_inetntop.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_inetntop.html,v 1.5.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_inetntop.html,v 1.5.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_net_ntop &#8212; lightweight resolver IP address presentation</p>
@@ -59,7 +59,7 @@ const char *
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525854"></a><h2>DESCRIPTION</h2>
+<a name="id2524078"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_net_ntop()</code> converts an IP address of
 protocol family <em class="parameter"><code>af</code></em> &#8212; IPv4 or IPv6 &#8212;
@@ -75,7 +75,7 @@ ASCII representation of the address.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525888"></a><h2>RETURN VALUES</h2>
+<a name="id2524453"></a><h2>RETURN VALUES</h2>
 <p>
 If successful, the function returns <em class="parameter"><code>dst</code></em>:
 a pointer to a string containing the presentation format of the
@@ -87,7 +87,7 @@ supported.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525918"></a><h2>SEE ALSO</h2>
+<a name="id2524484"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">RFC1884</span></span>,
 <span class="citerefentry"><span class="refentrytitle">inet_ntop</span>(3)</span>,
diff --git a/lib/lwres/man/lwres_noop.html b/lib/lwres/man/lwres_noop.html
index 261bac80..721f2f89 100644
--- a/lib/lwres/man/lwres_noop.html
+++ b/lib/lwres/man/lwres_noop.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_noop.html,v 1.7.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_noop.html,v 1.7.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_nooprequest_render, lwres_noopresponse_render, lwres_nooprequest_parse, lwres_noopresponse_parse, lwres_noopresponse_free, lwres_nooprequest_free &#8212; lightweight resolver no-op message handling</p>
@@ -165,7 +165,7 @@ void
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525963"></a><h2>DESCRIPTION</h2>
+<a name="id2525211"></a><h2>DESCRIPTION</h2>
 <p>
 These are low-level routines for creating and parsing
 lightweight resolver no-op request and response messages.
@@ -246,7 +246,7 @@ structures referenced via <em class="parameter"><code>structp</code></em>.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526096"></a><h2>RETURN VALUES</h2>
+<a name="id2525344"></a><h2>RETURN VALUES</h2>
 <p>
 The no-op opcode functions
 <code class="function">lwres_nooprequest_render()</code>,
@@ -285,7 +285,7 @@ indicate that the packet is not a response to an earlier query.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526160"></a><h2>SEE ALSO</h2>
+<a name="id2525408"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_packet</span>(3
 )</span>
diff --git a/lib/lwres/man/lwres_packet.html b/lib/lwres/man/lwres_packet.html
index b83fbcbf..4e5fb64a 100644
--- a/lib/lwres/man/lwres_packet.html
+++ b/lib/lwres/man/lwres_packet.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_packet.html,v 1.8.2.1.4.9 2005/10/13 02:33:57 marka Exp $ -->
+<!-- $Id: lwres_packet.html,v 1.8.2.1.4.11 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_lwpacket_renderheader, lwres_lwpacket_parseheader &#8212; lightweight resolver packet handling functions</p>
@@ -64,7 +64,7 @@ lwres_result_t
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525865"></a><h2>DESCRIPTION</h2>
+<a name="id2524089"></a><h2>DESCRIPTION</h2>
 <p>
 These functions rely on a
 <span class="type">struct lwres_lwpacket</span>
@@ -202,7 +202,7 @@ buffer <em class="parameter"><code>*b</code></em> to resolver packet
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526068"></a><h2>RETURN VALUES</h2>
+<a name="id2525316"></a><h2>RETURN VALUES</h2>
 <p> Successful calls to
 <code class="function">lwres_lwpacket_renderheader()</code> and
 <code class="function">lwres_lwpacket_parseheader()</code> return
diff --git a/lib/lwres/man/lwres_resutil.html b/lib/lwres/man/lwres_resutil.html
index 4cee0c78..ec85e211 100644
--- a/lib/lwres/man/lwres_resutil.html
+++ b/lib/lwres/man/lwres_resutil.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: lwres_resutil.html,v 1.8.2.1.4.9 2005/10/13 02:33:58 marka Exp $ -->
+<!-- $Id: lwres_resutil.html,v 1.8.2.1.4.10 2006/04/23 10:11:12 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -22,7 +22,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.69.1">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en">
-<a name="id2463721"></a><div class="titlepage"></div>
+<a name="id2462968"></a><div class="titlepage"></div>
 <div class="refnamediv">
 <h2>Name</h2>
 <p>lwres_string_parse, lwres_addr_parse, lwres_getaddrsbyname, lwres_getnamebyaddr &#8212; lightweight resolver utility functions</p>
@@ -124,7 +124,7 @@ lwres_result_t
 </div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525921"></a><h2>DESCRIPTION</h2>
+<a name="id2524486"></a><h2>DESCRIPTION</h2>
 <p>
 <code class="function">lwres_string_parse()</code> retrieves a DNS-encoded
 string starting the current pointer of lightweight resolver buffer
@@ -200,7 +200,7 @@ is made available through <em class="parameter"><code>*structp</code></em>.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526060"></a><h2>RETURN VALUES</h2>
+<a name="id2525308"></a><h2>RETURN VALUES</h2>
 <p>
 Successful calls to
 <code class="function">lwres_string_parse()</code>
@@ -244,7 +244,7 @@ small.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526130"></a><h2>SEE ALSO</h2>
+<a name="id2525378"></a><h2>SEE ALSO</h2>
 <p>
 <span class="citerefentry"><span class="refentrytitle">lwres_buffer</span>(3)</span>,
 
diff --git a/lib/lwres/win32/liblwres.dsp b/lib/lwres/win32/liblwres.dsp
index 695c5d4d..170e370d 100644
--- a/lib/lwres/win32/liblwres.dsp
+++ b/lib/lwres/win32/liblwres.dsp
@@ -1,241 +1,241 @@
-# Microsoft Developer Studio Project File - Name="liblwres" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=liblwres - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "liblwres.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /YX /FD /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/liblwres.dll"

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR /YX /FD /GZ /c

-# SUBTRACT CPP /X

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/liblwres.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "liblwres - Win32 Release"

-# Name "liblwres - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\context.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\DLLMain.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\gai_strerror.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\getaddrinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\gethost.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\getipnode.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\getnameinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\getrrset.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\herror.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwbuffer.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\lwconfig.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwinetaton.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwinetntop.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwinetpton.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwpacket.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwres_gabn.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwres_gnba.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwres_grbn.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwres_noop.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lwresutil.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\lwres\context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\lwres\int.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\ipv6.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\lang.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\list.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\lwbuffer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\lwpacket.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\lwres.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\lwres\net.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\lwres\netdb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\lwres\platform.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\lwres\result.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Source File

-

-SOURCE=.\liblwres.def

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="liblwres" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=liblwres - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "liblwres.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /YX /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/liblwres.dll"
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR /YX /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/liblwres.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "liblwres - Win32 Release"
+# Name "liblwres - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\gai_strerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\getaddrinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\gethost.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\getipnode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\getnameinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\getrrset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\herror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwbuffer.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lwconfig.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwinetaton.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwinetntop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwinetpton.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwpacket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwres_gabn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwres_gnba.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwres_grbn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwres_noop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lwresutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\lwres\context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\lwres\int.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\ipv6.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\lang.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\lwbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\lwpacket.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\lwres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\lwres\net.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\lwres\netdb.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\lwres\platform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\lwres\result.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=.\liblwres.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/lwres/win32/liblwres.dsw b/lib/lwres/win32/liblwres.dsw
index 06267b54..fa317209 100644
--- a/lib/lwres/win32/liblwres.dsw
+++ b/lib/lwres/win32/liblwres.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "liblwres"=".\liblwres.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "liblwres"=".\liblwres.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/lwres/win32/liblwres.mak b/lib/lwres/win32/liblwres.mak
index 2ba521fd..92f2fea6 100644
--- a/lib/lwres/win32/liblwres.mak
+++ b/lib/lwres/win32/liblwres.mak
@@ -1,655 +1,655 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on liblwres.dsp

-!IF "$(CFG)" == ""

-CFG=liblwres - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to liblwres - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "liblwres - Win32 Release" && "$(CFG)" != "liblwres - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\liblwres.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\context.obj"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\gai_strerror.obj"

-	-@erase "$(INTDIR)\getaddrinfo.obj"

-	-@erase "$(INTDIR)\gethost.obj"

-	-@erase "$(INTDIR)\getipnode.obj"

-	-@erase "$(INTDIR)\getnameinfo.obj"

-	-@erase "$(INTDIR)\getrrset.obj"

-	-@erase "$(INTDIR)\herror.obj"

-	-@erase "$(INTDIR)\lwbuffer.obj"

-	-@erase "$(INTDIR)\lwconfig.obj"

-	-@erase "$(INTDIR)\lwinetaton.obj"

-	-@erase "$(INTDIR)\lwinetntop.obj"

-	-@erase "$(INTDIR)\lwinetpton.obj"

-	-@erase "$(INTDIR)\lwpacket.obj"

-	-@erase "$(INTDIR)\lwres_gabn.obj"

-	-@erase "$(INTDIR)\lwres_gnba.obj"

-	-@erase "$(INTDIR)\lwres_grbn.obj"

-	-@erase "$(INTDIR)\lwres_noop.obj"

-	-@erase "$(INTDIR)\lwresutil.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(OUTDIR)\liblwres.exp"

-	-@erase "$(OUTDIR)\liblwres.lib"

-	-@erase "..\..\..\Build\Release\liblwres.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\liblwres.pdb" /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Release/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" 

-DEF_FILE= \

-	".\liblwres.def"

-LINK32_OBJS= \

-	"$(INTDIR)\context.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\gai_strerror.obj" \

-	"$(INTDIR)\getaddrinfo.obj" \

-	"$(INTDIR)\gethost.obj" \

-	"$(INTDIR)\getipnode.obj" \

-	"$(INTDIR)\getnameinfo.obj" \

-	"$(INTDIR)\getrrset.obj" \

-	"$(INTDIR)\herror.obj" \

-	"$(INTDIR)\lwbuffer.obj" \

-	"$(INTDIR)\lwinetaton.obj" \

-	"$(INTDIR)\lwinetntop.obj" \

-	"$(INTDIR)\lwinetpton.obj" \

-	"$(INTDIR)\lwpacket.obj" \

-	"$(INTDIR)\lwres_gabn.obj" \

-	"$(INTDIR)\lwres_gnba.obj" \

-	"$(INTDIR)\lwres_grbn.obj" \

-	"$(INTDIR)\lwres_noop.obj" \

-	"$(INTDIR)\lwresutil.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\lwconfig.obj"

-

-"..\..\..\Build\Release\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\liblwres.dll" "$(OUTDIR)\liblwres.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\context.obj"

-	-@erase "$(INTDIR)\context.sbr"

-	-@erase "$(INTDIR)\DLLMain.obj"

-	-@erase "$(INTDIR)\DLLMain.sbr"

-	-@erase "$(INTDIR)\gai_strerror.obj"

-	-@erase "$(INTDIR)\gai_strerror.sbr"

-	-@erase "$(INTDIR)\getaddrinfo.obj"

-	-@erase "$(INTDIR)\getaddrinfo.sbr"

-	-@erase "$(INTDIR)\gethost.obj"

-	-@erase "$(INTDIR)\gethost.sbr"

-	-@erase "$(INTDIR)\getipnode.obj"

-	-@erase "$(INTDIR)\getipnode.sbr"

-	-@erase "$(INTDIR)\getnameinfo.obj"

-	-@erase "$(INTDIR)\getnameinfo.sbr"

-	-@erase "$(INTDIR)\getrrset.obj"

-	-@erase "$(INTDIR)\getrrset.sbr"

-	-@erase "$(INTDIR)\herror.obj"

-	-@erase "$(INTDIR)\herror.sbr"

-	-@erase "$(INTDIR)\lwbuffer.obj"

-	-@erase "$(INTDIR)\lwbuffer.sbr"

-	-@erase "$(INTDIR)\lwconfig.obj"

-	-@erase "$(INTDIR)\lwconfig.sbr"

-	-@erase "$(INTDIR)\lwinetaton.obj"

-	-@erase "$(INTDIR)\lwinetaton.sbr"

-	-@erase "$(INTDIR)\lwinetntop.obj"

-	-@erase "$(INTDIR)\lwinetntop.sbr"

-	-@erase "$(INTDIR)\lwinetpton.obj"

-	-@erase "$(INTDIR)\lwinetpton.sbr"

-	-@erase "$(INTDIR)\lwpacket.obj"

-	-@erase "$(INTDIR)\lwpacket.sbr"

-	-@erase "$(INTDIR)\lwres_gabn.obj"

-	-@erase "$(INTDIR)\lwres_gabn.sbr"

-	-@erase "$(INTDIR)\lwres_gnba.obj"

-	-@erase "$(INTDIR)\lwres_gnba.sbr"

-	-@erase "$(INTDIR)\lwres_grbn.obj"

-	-@erase "$(INTDIR)\lwres_grbn.sbr"

-	-@erase "$(INTDIR)\lwres_noop.obj"

-	-@erase "$(INTDIR)\lwres_noop.sbr"

-	-@erase "$(INTDIR)\lwresutil.obj"

-	-@erase "$(INTDIR)\lwresutil.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(INTDIR)\version.obj"

-	-@erase "$(INTDIR)\version.sbr"

-	-@erase "$(OUTDIR)\liblwres.bsc"

-	-@erase "$(OUTDIR)\liblwres.exp"

-	-@erase "$(OUTDIR)\liblwres.lib"

-	-@erase "$(OUTDIR)\liblwres.pdb"

-	-@erase "..\..\..\Build\Debug\liblwres.dll"

-	-@erase "..\..\..\Build\Debug\liblwres.ilk"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\context.sbr" \

-	"$(INTDIR)\DLLMain.sbr" \

-	"$(INTDIR)\gai_strerror.sbr" \

-	"$(INTDIR)\getaddrinfo.sbr" \

-	"$(INTDIR)\gethost.sbr" \

-	"$(INTDIR)\getipnode.sbr" \

-	"$(INTDIR)\getnameinfo.sbr" \

-	"$(INTDIR)\getrrset.sbr" \

-	"$(INTDIR)\herror.sbr" \

-	"$(INTDIR)\lwbuffer.sbr" \

-	"$(INTDIR)\lwinetaton.sbr" \

-	"$(INTDIR)\lwinetntop.sbr" \

-	"$(INTDIR)\lwinetpton.sbr" \

-	"$(INTDIR)\lwpacket.sbr" \

-	"$(INTDIR)\lwres_gabn.sbr" \

-	"$(INTDIR)\lwres_gnba.sbr" \

-	"$(INTDIR)\lwres_grbn.sbr" \

-	"$(INTDIR)\lwres_noop.sbr" \

-	"$(INTDIR)\lwresutil.sbr" \

-	"$(INTDIR)\version.sbr" \

-	"$(INTDIR)\lwconfig.sbr"

-

-"$(OUTDIR)\liblwres.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\liblwres.pdb" /debug /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Debug/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\liblwres.def"

-LINK32_OBJS= \

-	"$(INTDIR)\context.obj" \

-	"$(INTDIR)\DLLMain.obj" \

-	"$(INTDIR)\gai_strerror.obj" \

-	"$(INTDIR)\getaddrinfo.obj" \

-	"$(INTDIR)\gethost.obj" \

-	"$(INTDIR)\getipnode.obj" \

-	"$(INTDIR)\getnameinfo.obj" \

-	"$(INTDIR)\getrrset.obj" \

-	"$(INTDIR)\herror.obj" \

-	"$(INTDIR)\lwbuffer.obj" \

-	"$(INTDIR)\lwinetaton.obj" \

-	"$(INTDIR)\lwinetntop.obj" \

-	"$(INTDIR)\lwinetpton.obj" \

-	"$(INTDIR)\lwpacket.obj" \

-	"$(INTDIR)\lwres_gabn.obj" \

-	"$(INTDIR)\lwres_gnba.obj" \

-	"$(INTDIR)\lwres_grbn.obj" \

-	"$(INTDIR)\lwres_noop.obj" \

-	"$(INTDIR)\lwresutil.obj" \

-	"$(INTDIR)\version.obj" \

-	"$(INTDIR)\lwconfig.obj"

-

-"..\..\..\Build\Debug\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("liblwres.dep")

-!INCLUDE "liblwres.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "liblwres.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "liblwres - Win32 Release" || "$(CFG)" == "liblwres - Win32 Debug"

-SOURCE=..\context.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\context.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\context.obj"	"$(INTDIR)\context.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\DLLMain.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\gai_strerror.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\gai_strerror.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\gai_strerror.obj"	"$(INTDIR)\gai_strerror.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\getaddrinfo.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\getaddrinfo.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\getaddrinfo.obj"	"$(INTDIR)\getaddrinfo.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\gethost.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\gethost.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\gethost.obj"	"$(INTDIR)\gethost.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\getipnode.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\getipnode.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\getipnode.obj"	"$(INTDIR)\getipnode.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\getnameinfo.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\getnameinfo.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\getnameinfo.obj"	"$(INTDIR)\getnameinfo.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\getrrset.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\getrrset.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\getrrset.obj"	"$(INTDIR)\getrrset.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\herror.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\herror.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\herror.obj"	"$(INTDIR)\herror.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwbuffer.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwbuffer.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwbuffer.obj"	"$(INTDIR)\lwbuffer.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\lwconfig.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwconfig.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwconfig.obj"	"$(INTDIR)\lwconfig.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=..\lwinetaton.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwinetaton.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwinetaton.obj"	"$(INTDIR)\lwinetaton.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwinetntop.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwinetntop.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwinetntop.obj"	"$(INTDIR)\lwinetntop.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwinetpton.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwinetpton.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwinetpton.obj"	"$(INTDIR)\lwinetpton.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwpacket.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwpacket.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwpacket.obj"	"$(INTDIR)\lwpacket.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwres_gabn.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwres_gabn.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwres_gabn.obj"	"$(INTDIR)\lwres_gabn.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwres_gnba.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwres_gnba.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwres_gnba.obj"	"$(INTDIR)\lwres_gnba.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwres_grbn.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwres_grbn.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwres_grbn.obj"	"$(INTDIR)\lwres_grbn.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwres_noop.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwres_noop.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwres_noop.obj"	"$(INTDIR)\lwres_noop.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=..\lwresutil.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\lwresutil.obj" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\lwresutil.obj"	"$(INTDIR)\lwresutil.sbr" : $(SOURCE) "$(INTDIR)"

-	$(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-SOURCE=.\version.c

-

-!IF  "$(CFG)" == "liblwres - Win32 Release"

-

-

-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"

-

-

-"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on liblwres.dsp
+!IF "$(CFG)" == ""
+CFG=liblwres - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to liblwres - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "liblwres - Win32 Release" && "$(CFG)" != "liblwres - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\liblwres.dll"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\context.obj"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\gai_strerror.obj"
+	-@erase "$(INTDIR)\getaddrinfo.obj"
+	-@erase "$(INTDIR)\gethost.obj"
+	-@erase "$(INTDIR)\getipnode.obj"
+	-@erase "$(INTDIR)\getnameinfo.obj"
+	-@erase "$(INTDIR)\getrrset.obj"
+	-@erase "$(INTDIR)\herror.obj"
+	-@erase "$(INTDIR)\lwbuffer.obj"
+	-@erase "$(INTDIR)\lwconfig.obj"
+	-@erase "$(INTDIR)\lwinetaton.obj"
+	-@erase "$(INTDIR)\lwinetntop.obj"
+	-@erase "$(INTDIR)\lwinetpton.obj"
+	-@erase "$(INTDIR)\lwpacket.obj"
+	-@erase "$(INTDIR)\lwres_gabn.obj"
+	-@erase "$(INTDIR)\lwres_gnba.obj"
+	-@erase "$(INTDIR)\lwres_grbn.obj"
+	-@erase "$(INTDIR)\lwres_noop.obj"
+	-@erase "$(INTDIR)\lwresutil.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(OUTDIR)\liblwres.exp"
+	-@erase "$(OUTDIR)\liblwres.lib"
+	-@erase "..\..\..\Build\Release\liblwres.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\liblwres.pdb" /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Release/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" 
+DEF_FILE= \
+	".\liblwres.def"
+LINK32_OBJS= \
+	"$(INTDIR)\context.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\gai_strerror.obj" \
+	"$(INTDIR)\getaddrinfo.obj" \
+	"$(INTDIR)\gethost.obj" \
+	"$(INTDIR)\getipnode.obj" \
+	"$(INTDIR)\getnameinfo.obj" \
+	"$(INTDIR)\getrrset.obj" \
+	"$(INTDIR)\herror.obj" \
+	"$(INTDIR)\lwbuffer.obj" \
+	"$(INTDIR)\lwinetaton.obj" \
+	"$(INTDIR)\lwinetntop.obj" \
+	"$(INTDIR)\lwinetpton.obj" \
+	"$(INTDIR)\lwpacket.obj" \
+	"$(INTDIR)\lwres_gabn.obj" \
+	"$(INTDIR)\lwres_gnba.obj" \
+	"$(INTDIR)\lwres_grbn.obj" \
+	"$(INTDIR)\lwres_noop.obj" \
+	"$(INTDIR)\lwresutil.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\lwconfig.obj"
+
+"..\..\..\Build\Release\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\liblwres.dll" "$(OUTDIR)\liblwres.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\context.obj"
+	-@erase "$(INTDIR)\context.sbr"
+	-@erase "$(INTDIR)\DLLMain.obj"
+	-@erase "$(INTDIR)\DLLMain.sbr"
+	-@erase "$(INTDIR)\gai_strerror.obj"
+	-@erase "$(INTDIR)\gai_strerror.sbr"
+	-@erase "$(INTDIR)\getaddrinfo.obj"
+	-@erase "$(INTDIR)\getaddrinfo.sbr"
+	-@erase "$(INTDIR)\gethost.obj"
+	-@erase "$(INTDIR)\gethost.sbr"
+	-@erase "$(INTDIR)\getipnode.obj"
+	-@erase "$(INTDIR)\getipnode.sbr"
+	-@erase "$(INTDIR)\getnameinfo.obj"
+	-@erase "$(INTDIR)\getnameinfo.sbr"
+	-@erase "$(INTDIR)\getrrset.obj"
+	-@erase "$(INTDIR)\getrrset.sbr"
+	-@erase "$(INTDIR)\herror.obj"
+	-@erase "$(INTDIR)\herror.sbr"
+	-@erase "$(INTDIR)\lwbuffer.obj"
+	-@erase "$(INTDIR)\lwbuffer.sbr"
+	-@erase "$(INTDIR)\lwconfig.obj"
+	-@erase "$(INTDIR)\lwconfig.sbr"
+	-@erase "$(INTDIR)\lwinetaton.obj"
+	-@erase "$(INTDIR)\lwinetaton.sbr"
+	-@erase "$(INTDIR)\lwinetntop.obj"
+	-@erase "$(INTDIR)\lwinetntop.sbr"
+	-@erase "$(INTDIR)\lwinetpton.obj"
+	-@erase "$(INTDIR)\lwinetpton.sbr"
+	-@erase "$(INTDIR)\lwpacket.obj"
+	-@erase "$(INTDIR)\lwpacket.sbr"
+	-@erase "$(INTDIR)\lwres_gabn.obj"
+	-@erase "$(INTDIR)\lwres_gabn.sbr"
+	-@erase "$(INTDIR)\lwres_gnba.obj"
+	-@erase "$(INTDIR)\lwres_gnba.sbr"
+	-@erase "$(INTDIR)\lwres_grbn.obj"
+	-@erase "$(INTDIR)\lwres_grbn.sbr"
+	-@erase "$(INTDIR)\lwres_noop.obj"
+	-@erase "$(INTDIR)\lwres_noop.sbr"
+	-@erase "$(INTDIR)\lwresutil.obj"
+	-@erase "$(INTDIR)\lwresutil.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\version.sbr"
+	-@erase "$(OUTDIR)\liblwres.bsc"
+	-@erase "$(OUTDIR)\liblwres.exp"
+	-@erase "$(OUTDIR)\liblwres.lib"
+	-@erase "$(OUTDIR)\liblwres.pdb"
+	-@erase "..\..\..\Build\Debug\liblwres.dll"
+	-@erase "..\..\..\Build\Debug\liblwres.ilk"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\context.sbr" \
+	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\gai_strerror.sbr" \
+	"$(INTDIR)\getaddrinfo.sbr" \
+	"$(INTDIR)\gethost.sbr" \
+	"$(INTDIR)\getipnode.sbr" \
+	"$(INTDIR)\getnameinfo.sbr" \
+	"$(INTDIR)\getrrset.sbr" \
+	"$(INTDIR)\herror.sbr" \
+	"$(INTDIR)\lwbuffer.sbr" \
+	"$(INTDIR)\lwinetaton.sbr" \
+	"$(INTDIR)\lwinetntop.sbr" \
+	"$(INTDIR)\lwinetpton.sbr" \
+	"$(INTDIR)\lwpacket.sbr" \
+	"$(INTDIR)\lwres_gabn.sbr" \
+	"$(INTDIR)\lwres_gnba.sbr" \
+	"$(INTDIR)\lwres_grbn.sbr" \
+	"$(INTDIR)\lwres_noop.sbr" \
+	"$(INTDIR)\lwresutil.sbr" \
+	"$(INTDIR)\version.sbr" \
+	"$(INTDIR)\lwconfig.sbr"
+
+"$(OUTDIR)\liblwres.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\liblwres.pdb" /debug /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Debug/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" /pdbtype:sept 
+DEF_FILE= \
+	".\liblwres.def"
+LINK32_OBJS= \
+	"$(INTDIR)\context.obj" \
+	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\gai_strerror.obj" \
+	"$(INTDIR)\getaddrinfo.obj" \
+	"$(INTDIR)\gethost.obj" \
+	"$(INTDIR)\getipnode.obj" \
+	"$(INTDIR)\getnameinfo.obj" \
+	"$(INTDIR)\getrrset.obj" \
+	"$(INTDIR)\herror.obj" \
+	"$(INTDIR)\lwbuffer.obj" \
+	"$(INTDIR)\lwinetaton.obj" \
+	"$(INTDIR)\lwinetntop.obj" \
+	"$(INTDIR)\lwinetpton.obj" \
+	"$(INTDIR)\lwpacket.obj" \
+	"$(INTDIR)\lwres_gabn.obj" \
+	"$(INTDIR)\lwres_gnba.obj" \
+	"$(INTDIR)\lwres_grbn.obj" \
+	"$(INTDIR)\lwres_noop.obj" \
+	"$(INTDIR)\lwresutil.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\lwconfig.obj"
+
+"..\..\..\Build\Debug\liblwres.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("liblwres.dep")
+!INCLUDE "liblwres.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "liblwres.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "liblwres - Win32 Release" || "$(CFG)" == "liblwres - Win32 Debug"
+SOURCE=..\context.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\context.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\context.obj"	"$(INTDIR)\context.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\gai_strerror.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\gai_strerror.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\gai_strerror.obj"	"$(INTDIR)\gai_strerror.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\getaddrinfo.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\getaddrinfo.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\getaddrinfo.obj"	"$(INTDIR)\getaddrinfo.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\gethost.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\gethost.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\gethost.obj"	"$(INTDIR)\gethost.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\getipnode.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\getipnode.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\getipnode.obj"	"$(INTDIR)\getipnode.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\getnameinfo.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\getnameinfo.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\getnameinfo.obj"	"$(INTDIR)\getnameinfo.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\getrrset.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\getrrset.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\getrrset.obj"	"$(INTDIR)\getrrset.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\herror.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\herror.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\herror.obj"	"$(INTDIR)\herror.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwbuffer.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwbuffer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwbuffer.obj"	"$(INTDIR)\lwbuffer.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\lwconfig.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwconfig.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwconfig.obj"	"$(INTDIR)\lwconfig.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=..\lwinetaton.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwinetaton.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwinetaton.obj"	"$(INTDIR)\lwinetaton.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwinetntop.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwinetntop.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwinetntop.obj"	"$(INTDIR)\lwinetntop.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwinetpton.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwinetpton.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwinetpton.obj"	"$(INTDIR)\lwinetpton.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwpacket.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwpacket.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwpacket.obj"	"$(INTDIR)\lwpacket.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwres_gabn.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwres_gabn.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwres_gabn.obj"	"$(INTDIR)\lwres_gabn.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwres_gnba.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwres_gnba.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwres_gnba.obj"	"$(INTDIR)\lwres_gnba.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwres_grbn.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwres_grbn.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwres_grbn.obj"	"$(INTDIR)\lwres_grbn.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwres_noop.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwres_noop.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwres_noop.obj"	"$(INTDIR)\lwres_noop.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\lwresutil.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\lwresutil.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\lwresutil.obj"	"$(INTDIR)\lwresutil.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\version.c
+
+!IF  "$(CFG)" == "liblwres - Win32 Release"
+
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+
+
+"$(INTDIR)\version.obj"	"$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 22a0280c..35d8bdae 100644
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.48.2.1.2.8 2005/06/18 01:03:24 marka Exp $ */
+/* $Id: t_api.c,v 1.48.2.1.2.10 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -540,7 +540,11 @@ t_fgetbs(FILE *fp) {
 			}
 		}
 		*p = '\0';
-		return(((c == EOF) && (n == 0U)) ? NULL : buf);
+		if (c == EOF && n == 0U) {
+			free(buf);
+			return (NULL);
+		}
+		return (buf);
 	} else {
 		fprintf(stderr, "malloc failed %d", errno);
 		return(NULL);
@@ -747,8 +751,10 @@ t_eval(const char *filename, int (*func)(char **), int nargs) {
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, tokens);
 			if (cnt == nargs) {
diff --git a/lib/win32/bindevt/bindevt.dsp b/lib/win32/bindevt/bindevt.dsp
index 6aafb193..4c9dc6b6 100644
--- a/lib/win32/bindevt/bindevt.dsp
+++ b/lib/win32/bindevt/bindevt.dsp
@@ -1,132 +1,132 @@
-# Microsoft Developer Studio Project File - Name="bindevt" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=bindevt - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "bindevt.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "bindevt - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 1

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll"

-

-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 1

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "bindevt - Win32 Release"

-# Name "bindevt - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\bindevt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bindevt.mc

-

-!IF  "$(CFG)" == "bindevt - Win32 Release"

-

-# Begin Custom Build

-TargetName=bindevt

-InputPath=.\bindevt.mc

-InputName=bindevt

-

-"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	mc $(InputName).mc

-

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

-

-# Begin Custom Build

-TargetName=bindevt

-InputPath=.\bindevt.mc

-InputName=bindevt

-

-"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	mc $(InputName).mc

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\bindevt.rc

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="bindevt" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=bindevt - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "bindevt.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "bindevt - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll"
+
+!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "bindevt - Win32 Release"
+# Name "bindevt - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\bindevt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bindevt.mc
+
+!IF  "$(CFG)" == "bindevt - Win32 Release"
+
+# Begin Custom Build
+TargetName=bindevt
+InputPath=.\bindevt.mc
+InputName=bindevt
+
+"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	mc $(InputName).mc
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+
+# Begin Custom Build
+TargetName=bindevt
+InputPath=.\bindevt.mc
+InputName=bindevt
+
+"$(TargetName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	mc $(InputName).mc
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\bindevt.rc
+# End Source File
+# End Target
+# End Project
diff --git a/lib/win32/bindevt/bindevt.dsw b/lib/win32/bindevt/bindevt.dsw
index 7421804f..c9e02a01 100644
--- a/lib/win32/bindevt/bindevt.dsw
+++ b/lib/win32/bindevt/bindevt.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "bindevt"=.\bindevt.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bindevt"=.\bindevt.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/win32/bindevt/bindevt.mak b/lib/win32/bindevt/bindevt.mak
index c4aa47e4..f6399227 100644
--- a/lib/win32/bindevt/bindevt.mak
+++ b/lib/win32/bindevt/bindevt.mak
@@ -1,213 +1,213 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on bindevt.dsp

-!IF "$(CFG)" == ""

-CFG=bindevt - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to bindevt - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "bindevt - Win32 Release" && "$(CFG)" != "bindevt - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "bindevt - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-

-ALL : "..\..\..\Build\Release\bindevt.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\bindevt.obj"

-	-@erase "$(INTDIR)\bindevt.res"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(OUTDIR)\bindevt.exp"

-	-@erase "..\..\..\Build\Release\bindevt.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\bindevt.obj" \

-	"$(INTDIR)\bindevt.res"

-

-"..\..\..\Build\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "..\..\..\Build\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\bindevt.obj"

-	-@erase "$(INTDIR)\bindevt.res"

-	-@erase "$(INTDIR)\bindevt.sbr"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\bindevt.bsc"

-	-@erase "$(OUTDIR)\bindevt.exp"

-	-@erase "..\..\..\Build\Debug\bindevt.dll"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "_DEBUG" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" 

-BSC32_SBRS= \

-	"$(INTDIR)\bindevt.sbr"

-

-"$(OUTDIR)\bindevt.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

-    $(BSC32) @<<

-  $(BSC32_FLAGS) $(BSC32_SBRS)

-<<

-

-LINK32=link.exe

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\bindevt.obj" \

-	"$(INTDIR)\bindevt.res"

-

-"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("bindevt.dep")

-!INCLUDE "bindevt.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "bindevt.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "bindevt - Win32 Release" || "$(CFG)" == "bindevt - Win32 Debug"

-SOURCE=.\bindevt.c

-

-!IF  "$(CFG)" == "bindevt - Win32 Release"

-

-

-"$(INTDIR)\bindevt.obj" : $(SOURCE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

-

-

-"$(INTDIR)\bindevt.obj"	"$(INTDIR)\bindevt.sbr" : $(SOURCE) "$(INTDIR)"

-

-

-!ENDIF 

-

-SOURCE=.\bindevt.mc

-

-!IF  "$(CFG)" == "bindevt - Win32 Release"

-

-TargetName=bindevt

-InputPath=.\bindevt.mc

-InputName=bindevt

-

-".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	<<tempfile.bat 

-	@echo off 

-	mc $(InputName).mc

-<< 

-	

-

-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"

-

-TargetName=bindevt

-InputPath=.\bindevt.mc

-InputName=bindevt

-

-".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	<<tempfile.bat 

-	@echo off 

-	mc $(InputName).mc

-<< 

-	

-

-!ENDIF 

-

-SOURCE=.\bindevt.rc

-

-"$(INTDIR)\bindevt.res" : $(SOURCE) "$(INTDIR)"

-	$(RSC) $(RSC_PROJ) $(SOURCE)

-

-

-

-!ENDIF 

-

+# Microsoft Developer Studio Generated NMAKE File, Based on bindevt.dsp
+!IF "$(CFG)" == ""
+CFG=bindevt - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to bindevt - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "bindevt - Win32 Release" && "$(CFG)" != "bindevt - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "bindevt - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\bindevt.dll"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\bindevt.obj"
+	-@erase "$(INTDIR)\bindevt.res"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\bindevt.exp"
+	-@erase "..\..\..\Build\Release\bindevt.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\bindevt.obj" \
+	"$(INTDIR)\bindevt.res"
+
+"..\..\..\Build\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\bindevt.obj"
+	-@erase "$(INTDIR)\bindevt.res"
+	-@erase "$(INTDIR)\bindevt.sbr"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\bindevt.bsc"
+	-@erase "$(OUTDIR)\bindevt.exp"
+	-@erase "..\..\..\Build\Debug\bindevt.dll"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\bindevt.sbr"
+
+"$(OUTDIR)\bindevt.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\bindevt.obj" \
+	"$(INTDIR)\bindevt.res"
+
+"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("bindevt.dep")
+!INCLUDE "bindevt.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "bindevt.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "bindevt - Win32 Release" || "$(CFG)" == "bindevt - Win32 Debug"
+SOURCE=.\bindevt.c
+
+!IF  "$(CFG)" == "bindevt - Win32 Release"
+
+
+"$(INTDIR)\bindevt.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+
+
+"$(INTDIR)\bindevt.obj"	"$(INTDIR)\bindevt.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+SOURCE=.\bindevt.mc
+
+!IF  "$(CFG)" == "bindevt - Win32 Release"
+
+TargetName=bindevt
+InputPath=.\bindevt.mc
+InputName=bindevt
+
+".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	mc $(InputName).mc
+<< 
+	
+
+!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+
+TargetName=bindevt
+InputPath=.\bindevt.mc
+InputName=bindevt
+
+".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat 
+	@echo off 
+	mc $(InputName).mc
+<< 
+	
+
+!ENDIF 
+
+SOURCE=.\bindevt.rc
+
+"$(INTDIR)\bindevt.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+
diff --git a/libtool.m4 b/libtool.m4
index c3b71e89..551ffd0d 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2557,7 +2557,7 @@ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 AC_LIBTOOL_SYS_LIB_STRIP
 AC_LIBTOOL_DLOPEN_SELF($1)
 
-# Report which librarie types wil actually be built
+# Report which libraries types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
diff --git a/make/rules.in b/make/rules.in
index 6b83bce4..39e82ce4 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.40.2.5.4.8 2005/10/28 01:53:44 marka Exp $
+# $Id: rules.in,v 1.40.2.5.4.10 2006/01/06 00:01:42 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -101,6 +101,12 @@ STD_CINCLUDES =	@STD_CINCLUDES@
 STD_CDEFINES =	@STD_CDEFINES@
 STD_CWARNINGS =	@STD_CWARNINGS@
 
+BUILD_CC = @BUILD_CC@
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
+BUILD_LDFAGS = @BUILD_LDFAGS@
+BUILD_LIBS = @BUILD_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c .@O@
 
diff --git a/version b/version
index 5c9032a3..73b8f12f 100644
--- a/version
+++ b/version
@@ -1,10 +1,10 @@
-# $Id: version,v 1.26.2.17.2.21 2005/12/14 00:43:14 marka Exp $
+# $Id: version,v 1.26.2.17.2.22 2006/05/25 06:15:57 marka Exp $
 #
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
 MAJORVER=9
 MINORVER=3
-PATCHVER=2
-RELEASETYPE=
-RELEASEVER=
+PATCHVER=3
+RELEASETYPE=b
+RELEASEVER=1
diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index 98b473c6..a76a7e4d 100644
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -1,356 +1,356 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "BINDInstall"="..\bin\win32\BINDInstall\BINDInstall.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "bindevt"="..\lib\win32\bindevt\bindevt.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "dig"="..\bin\dig\win32\dig.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "host"="..\bin\dig\win32\host.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "keygen"="..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libbind9"="..\lib\bind9\win32\libbind9.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccfg

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libdns"="..\lib\dns\win32\libdns.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libisc"="..\lib\isc\win32\libisc.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libisccc"="..\lib\isccc\win32\libisccc.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libisccfg"="..\lib\isccfg\win32\libisccfg.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "liblwres"="..\lib\lwres\win32\liblwres.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "named"="..\bin\named\win32\named.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccfg

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name liblwres

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "namedcheckconf"="..\bin\check\win32\namedcheckconf.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccfg

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "namedcheckzone"="..\bin\check\win32\namedcheckzone.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "nslookup"="..\bin\dig\win32\nslookup.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "nsupdate"="..\bin\nsupdate\win32\nsupdate.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "rndc"="..\bin\rndc\win32\rndc.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccc

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisccfg

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libbind9

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "rndcconfgen"="..\bin\rndc\win32\confgen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "signzone"="..\bin\dnssec\win32\signzone.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libdns

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libisc

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BINDInstall"="..\bin\win32\BINDInstall\BINDInstall.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bindevt"="..\lib\win32\bindevt\bindevt.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "dig"="..\bin\dig\win32\dig.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "host"="..\bin\dig\win32\host.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "keygen"="..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libbind9"="..\lib\bind9\win32\libbind9.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccfg
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libdns"="..\lib\dns\win32\libdns.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libisc"="..\lib\isc\win32\libisc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libisccc"="..\lib\isccc\win32\libisccc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libisccfg"="..\lib\isccfg\win32\libisccfg.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "liblwres"="..\lib\lwres\win32\liblwres.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "named"="..\bin\named\win32\named.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccfg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name liblwres
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "namedcheckconf"="..\bin\check\win32\namedcheckconf.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccfg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "namedcheckzone"="..\bin\check\win32\namedcheckzone.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "nslookup"="..\bin\dig\win32\nslookup.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "nsupdate"="..\bin\nsupdate\win32\nsupdate.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "rndc"="..\bin\rndc\win32\rndc.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisccfg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libbind9
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "rndcconfgen"="..\bin\rndc\win32\confgen.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "signzone"="..\bin\dnssec\win32\signzone.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index 0ca3195c..c0077b9e 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -1,131 +1,131 @@
-echo off

-rem

-rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")

-rem Copyright (C) 2001-2002  Internet Software Consortium.

-rem

-rem Permission to use, copy, modify, and distribute this software for any

-rem purpose with or without fee is hereby granted, provided that the above

-rem copyright notice and this permission notice appear in all copies.

-rem 

-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-rem PERFORMANCE OF THIS SOFTWARE.

-

-rem BuildAll.bat

-rem This script sets up the files necessary ready to build BIND 9

-rem and then builds all of the binaries that make up the installation kit.

-rem This requires perl to be installed on the system.

-

-rem IMPORTANT NOTE:

-rem OpenSSL is a prerequisite for building and running this release of

-rem BIND 9. You must fetch the OpenSSL sources yourself from

-rem http://www.OpenSSL.org/ and compile it yourself.  The code must reside

-rem at the same level as the bind 9.2.0 source tree and it's top-level

-rem directory be named openssl-0.9.6k. This restriction will be lifted in

-rem a future release of BIND 9 for Windows NT/2000/XP.

-

-echo Setting up the BIND files required for the build

-

-call BuildSetup.bat

-

-echo Build all of the Library files

-

-cd ..\lib

-

-cd isc\win32

-nmake /nologo -f libisc.mak CFG="libisc - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd dns\win32

-nmake /nologo -f libdns.mak CFG="libdns - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd isccfg\win32

-nmake /nologo -f libisccfg.mak CFG="libisccfg - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd isccc\win32

-nmake /nologo -f libisccc.mak CFG="libisccc - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd bind9\win32

-nmake /nologo -f libbind9.mak CFG="libbind9 - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd lwres\win32

-nmake /nologo -f liblwres.mak CFG="liblwres - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-rem This is the DLL required for the event Viewer

-

-cd win32\bindevt

-nmake /nologo -f bindevt.mak CFG="bindevt - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd ..

-

-echo Now build the apps

-

-cd bin

-

-cd named\win32

-nmake /nologo -f named.mak CFG="named - Win32 Release"  NO_EXTERNAL_DEPS="1"

-

-copy ..\named.html ..\..\..\Build\Release

-cd ..\..

-

-cd rndc\win32

-nmake /nologo -f rndc.mak CFG="rndc - Win32 Release"  NO_EXTERNAL_DEPS="1"

-nmake /nologo -f confgen.mak CFG="rndcconfgen - Win32 Release"  NO_EXTERNAL_DEPS="1"

-

-copy ..\*.html ..\..\..\Build\Release

-cd ..\..

-

-cd dig\win32

-nmake /nologo -f dig.mak CFG="dig - Win32 Release"  NO_EXTERNAL_DEPS="1"

-nmake /nologo /nologo -f host.mak CFG="host - Win32 Release"  NO_EXTERNAL_DEPS="1"

-nmake /nologo -f nslookup.mak CFG="nslookup - Win32 Release"  NO_EXTERNAL_DEPS="1"

-copy ..\*.html ..\..\..\Build\Release

-cd ..\..

-

-cd nsupdate\win32

-nmake /nologo -f nsupdate.mak CFG="nsupdate - Win32 Release"  NO_EXTERNAL_DEPS="1"

-copy ..\*.html ..\..\..\Build\Release

-cd ..\..

-

-cd check\win32

-nmake /nologo -f namedcheckconf.mak CFG="namedcheckconf - Win32 Release"  NO_EXTERNAL_DEPS="1"

-nmake /nologo -f namedcheckzone.mak CFG="namedcheckzone - Win32 Release"  NO_EXTERNAL_DEPS="1"

-copy ..\*.html ..\..\..\Build\Release

-cd ..\..

-

-cd dnssec\win32

-nmake /nologo -f keygen.mak CFG="keygen - Win32 Release"  NO_EXTERNAL_DEPS="1"

-rem nmake /nologo -f makekeyset.mak CFG="makekeyset - Win32 Release"  NO_EXTERNAL_DEPS="1"

-rem nmake /nologo -f signkey.mak CFG="signkey - Win32 Release"  NO_EXTERNAL_DEPS="1"

-nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="1"

-rem copy ..\*.html ..\..\..\Build\Release

-copy ..\dnssec-keygen.html ..\..\..\Build\Release

-copy ..\dnssec-signzone.html ..\..\..\Build\Release

-cd ..\..

-

-rem This is the BIND 9 Installer

-

-cd win32\BINDInstall

-nmake /nologo -f BINDInstall.mak CFG="BINDInstall - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..\..

-

-cd ..

-

-cd win32utils

-

-copy ..\doc\misc\migration ..\Build\Release

-copy ..\doc\misc\migration-4to9 ..\Build\Release

-

-echo Done.

-

-rem exit here.

+echo off
+rem
+rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2002  Internet Software Consortium.
+rem
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem 
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+rem BuildAll.bat
+rem This script sets up the files necessary ready to build BIND 9
+rem and then builds all of the binaries that make up the installation kit.
+rem This requires perl to be installed on the system.
+
+rem IMPORTANT NOTE:
+rem OpenSSL is a prerequisite for building and running this release of
+rem BIND 9. You must fetch the OpenSSL sources yourself from
+rem http://www.OpenSSL.org/ and compile it yourself.  The code must reside
+rem at the same level as the bind 9.2.0 source tree and it's top-level
+rem directory be named openssl-0.9.6k. This restriction will be lifted in
+rem a future release of BIND 9 for Windows NT/2000/XP.
+
+echo Setting up the BIND files required for the build
+
+call BuildSetup.bat
+
+echo Build all of the Library files
+
+cd ..\lib
+
+cd isc\win32
+nmake /nologo -f libisc.mak CFG="libisc - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd dns\win32
+nmake /nologo -f libdns.mak CFG="libdns - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd isccfg\win32
+nmake /nologo -f libisccfg.mak CFG="libisccfg - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd isccc\win32
+nmake /nologo -f libisccc.mak CFG="libisccc - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd bind9\win32
+nmake /nologo -f libbind9.mak CFG="libbind9 - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd lwres\win32
+nmake /nologo -f liblwres.mak CFG="liblwres - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+rem This is the DLL required for the event Viewer
+
+cd win32\bindevt
+nmake /nologo -f bindevt.mak CFG="bindevt - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd ..
+
+echo Now build the apps
+
+cd bin
+
+cd named\win32
+nmake /nologo -f named.mak CFG="named - Win32 Release"  NO_EXTERNAL_DEPS="1"
+
+copy ..\named.html ..\..\..\Build\Release
+cd ..\..
+
+cd rndc\win32
+nmake /nologo -f rndc.mak CFG="rndc - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f confgen.mak CFG="rndcconfgen - Win32 Release"  NO_EXTERNAL_DEPS="1"
+
+copy ..\*.html ..\..\..\Build\Release
+cd ..\..
+
+cd dig\win32
+nmake /nologo -f dig.mak CFG="dig - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo /nologo -f host.mak CFG="host - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f nslookup.mak CFG="nslookup - Win32 Release"  NO_EXTERNAL_DEPS="1"
+copy ..\*.html ..\..\..\Build\Release
+cd ..\..
+
+cd nsupdate\win32
+nmake /nologo -f nsupdate.mak CFG="nsupdate - Win32 Release"  NO_EXTERNAL_DEPS="1"
+copy ..\*.html ..\..\..\Build\Release
+cd ..\..
+
+cd check\win32
+nmake /nologo -f namedcheckconf.mak CFG="namedcheckconf - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f namedcheckzone.mak CFG="namedcheckzone - Win32 Release"  NO_EXTERNAL_DEPS="1"
+copy ..\*.html ..\..\..\Build\Release
+cd ..\..
+
+cd dnssec\win32
+nmake /nologo -f keygen.mak CFG="keygen - Win32 Release"  NO_EXTERNAL_DEPS="1"
+rem nmake /nologo -f makekeyset.mak CFG="makekeyset - Win32 Release"  NO_EXTERNAL_DEPS="1"
+rem nmake /nologo -f signkey.mak CFG="signkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="1"
+rem copy ..\*.html ..\..\..\Build\Release
+copy ..\dnssec-keygen.html ..\..\..\Build\Release
+copy ..\dnssec-signzone.html ..\..\..\Build\Release
+cd ..\..
+
+rem This is the BIND 9 Installer
+
+cd win32\BINDInstall
+nmake /nologo -f BINDInstall.mak CFG="BINDInstall - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd ..
+
+cd win32utils
+
+copy ..\doc\misc\migration ..\Build\Release
+copy ..\doc\misc\migration-4to9 ..\Build\Release
+
+echo Done.
+
+rem exit here.
diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index b7f6790f..e9f70216 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -1,57 +1,57 @@
-echo off

-rem

-rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")

-rem Copyright (C) 2001-2002  Internet Software Consortium.

-rem 

-rem Permission to use, copy, modify, and distribute this software for any

-rem purpose with or without fee is hereby granted, provided that the above

-rem copyright notice and this permission notice appear in all copies.

-rem 

-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-rem PERFORMANCE OF THIS SOFTWARE.

-

-rem BuildSetup.bat

-rem This script sets up the files necessary ready to build BIND 9.

-rem This requires perl to be installed on the system.

-

-rem Set up the configuration file

-cd ..

-copy config.h.win32 config.h

-cd win32utils

-

-rem Generate the version information

-perl makeversion.pl

-

-rem Generate header files for lib/dns

-

-call dnsheadergen.bat

-

-echo Ensure that the OpenSSL sources are at the same level in

-echo the directory tree and is named openssl-0.9.6k or libdns

-echo will not build. 

-

-rem Make sure that the Build directories are there.

-

-if NOT Exist ..\Build mkdir ..\Build

-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 ..\doc\arm\Bv9ARM.pdf ..\Build\Release

-copy ..\CHANGES ..\Build\Release

-copy ..\FAQ ..\Build\Release

-

-echo Copying the OpenSSL DLL.

-

-copy ..\..\openssl-0.9.6k\out32dll\libeay32.dll ..\Build\Release\

-

-

-rem Done

+echo off
+rem
+rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2002  Internet Software Consortium.
+rem 
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem 
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+rem BuildSetup.bat
+rem This script sets up the files necessary ready to build BIND 9.
+rem This requires perl to be installed on the system.
+
+rem Set up the configuration file
+cd ..
+copy config.h.win32 config.h
+cd win32utils
+
+rem Generate the version information
+perl makeversion.pl
+
+rem Generate header files for lib/dns
+
+call dnsheadergen.bat
+
+echo Ensure that the OpenSSL sources are at the same level in
+echo the directory tree and is named openssl-0.9.6k or libdns
+echo will not build. 
+
+rem Make sure that the Build directories are there.
+
+if NOT Exist ..\Build mkdir ..\Build
+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 ..\doc\arm\Bv9ARM.pdf ..\Build\Release
+copy ..\CHANGES ..\Build\Release
+copy ..\FAQ ..\Build\Release
+
+echo Copying the OpenSSL DLL.
+
+copy ..\..\openssl-0.9.6k\out32dll\libeay32.dll ..\Build\Release\
+
+
+rem Done
diff --git a/win32utils/dnsheadergen.bat b/win32utils/dnsheadergen.bat
index 664dcdc5..09422fe8 100644
--- a/win32utils/dnsheadergen.bat
+++ b/win32utils/dnsheadergen.bat
@@ -1,26 +1,26 @@
-echo off

-rem

-rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")

-rem Copyright (C) 2001-2002  Internet Software Consortium.

-rem 

-rem Permission to use, copy, modify, and distribute this software for any

-rem purpose with or without fee is hereby granted, provided that the above

-rem copyright notice and this permission notice appear in all copies.

-rem 

-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-rem PERFORMANCE OF THIS SOFTWARE.

-

-cd ..\lib\dns

-cd win32

-nmake /nologo /f gen.mak CFG="gen - Win32 Release"  NO_EXTERNAL_DEPS="1"

-cd ..

-gen -s . -t > include/dns/enumtype.h

-gen -s . -c > include/dns/enumclass.h

-gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h > include/dns/rdatastruct.h

-gen -s . > code.h

-cd ..\..\win32utils

+echo off
+rem
+rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2002  Internet Software Consortium.
+rem 
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem 
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+cd ..\lib\dns
+cd win32
+nmake /nologo /f gen.mak CFG="gen - Win32 Release"  NO_EXTERNAL_DEPS="1"
+cd ..
+gen -s . -t > include/dns/enumtype.h
+gen -s . -c > include/dns/enumclass.h
+gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h > include/dns/rdatastruct.h
+gen -s . > code.h
+cd ..\..\win32utils
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index ac3db977..2d3116b9 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,153 +1,153 @@
-Copyright (C) 2004, 2005  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.7.2.4.4.4 2005/09/06 02:12:43 marka Exp $

-

-	   Release of BIND 9.3 for Window NT/2000/XP/2003

-

-This is a release of BIND 9.3 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.

-  

-	Important Kit Installation Information

-

-As of release 9.3.0, BINDInstall requires that you install

-it under an account with restricted privileges. The installer

-will prompt you for an account name, the default is "named", and

-a password for that account. It will also check for the existence

-of that account. If it does not exist is will create it with only

-the privileges required to run BIND. If the account does exist it

-will check that it has only the one privilege required:

-"Log on as a service". If it has too many privileges it will prompt

-you if you want to continue. 

-

-With BIND running under an account name it is necessary for all

-files and directories that BIND uses to have permissions set up

-for the named account if the files are on an NTFS disk. BIND requires

-that the account have read and write access to the directory for

-the pid file, any files that are maintained either for slave zones

-or for master zones supporting dynamic updates. The account will

-also need read access to the named.conf and any other file that

-it needs to read.

-

-It is important that on Windows the directory directive is used in

-the options section to tell BIND where to find the files used in

-named.conf.

-

-If you have previously installed BIND 8 or BIND 4 on the system that

-you wish to install this kit, you MUST use the BIND 8 or BIND 4 installer

-to uninstall the previous kit.  For BIND 8.2.x, you can use the

-BINDInstall that comes with the BIND 8 kit to uninstall it. The BIND 9

-installer will NOT uninstall the BIND 8 binaries.  That will be fixed

-in a future release.

-

-Unpack the kit into any convenient directory and run the BINDInstall

-program.  This will install the named and associated programs into

-the correct directories and set up the required registry keys.

-

-Messages are logged to the Application log in the EventViewer.

-

-	Controlling BIND

-

-Windows NT/2000 uses the same rndc program as is used on Unix

-systems.  The rndc.conf file must be configured for your system in

-order to work. You will need to generate a key for this. To do this

-use the rndc-confgen program. The program will be installed in the

-same directory as named: dns/bin/.  From the DOS prompt, use the

-command this way:

-

-rndc-confgen -a

-

-which will create a rndc.key file in the dns/etc directory. This will

-allow you to run rndc without an explicit rndc.conf file or key and

-control entry in named.conf file. See section 3.4.1.2 of the ARM for

-details of this. An rndc.conf can also be generated by running:

-

-rndc-confgen > rndc.conf

-

-which will create the rndc.conf file in the current directory, but not

-copy it to the dns/etc directory where it needs to reside. If you create

-rndc.conf this way you will need to copy the same key statement into

-named.conf.

-

-The additions look like the following:

-

-key "rndc-key" { algorithm hmac-md5; secret "xxxxxxxxx=="; };

-

-controls {

-	inet 127.0.0.1 port 953 allow { localhost; } keys { "rndc-key"; };

-};

-

-Note that the value of the secret must come from the key generated

-above for rndc and must be the same key value for both. Details of

-this may be found in section 3.4.1.2 of the ARM. If you have rndc

-on a Unix box you can use it to control BIND on the NT/W2K box as

-well as using the Windows version of rndc to control a BIND 9

-daemon on a Unix box. However you must have key statements valid for

-the servers you wish to control, specifically the IP address and key

-in both named.conf and rndc.conf. Again see section 3.4.1.2 of the

-ARM for details.

-

-In order to you rndc from a different system it is important to

-ensure that the clocks are synchronized. The clocks must be kept

-within 5 minutes of each other or the rndc commands will fail

-authentication. Use NTP or other time synchronization software

-to keep your clocks accurate. NTP can be found at

-http://www.ntp.org/.

-

-In addition BIND is installed as a win32 system service, can be

-started and stopped in the same way as any other service and

-automatically starts whenever the system is booted. Signals are

-not supported and are in fact ignored.

-

-Note: Unlike most Windows applications, named does not, change its

-working directory when started as a service.  If you wish to use

-relative files in named.conf you will need to specify a working

-directory using the directory directive options.

-

-	Documentation

-

-This kit includes Documentation in HTML format.  The documentation is not

-copied during the installation process so you should move it to any convenient

-location for later reference. Of particular importance is the BIND 9

-Administrator's Reference Manual (Bv9ARM*.html) which provides detailed

-information on BIND 9. In addition, there are HTML pages for each of the

-BIND 9 applications.

-

-	DNS Tools

-

-The following tools have been built for Windows NT: dig, nslookup,

-host, nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,

-dnssec-keygen, dnssec-signzone. The tools will NOT run on Win9x,

-only WinNT and Win2000. The latter tools are for use with DNSSEC.

-All tools are installed in the dns/bin directory.

-

-IMPORTANT NOTE ON USING THE TOOLS:

-

-It is no longer necessary to create a resolv.conf file on Windows as

-the tools will look in the registry for the required nameserver

-information. However if you wish to create a resolv.conf file as

-follows it will use it in preference to the registry nameserver

-entries.

-

-To create a resolv.conf you need to place it in the System32\Drivers\etc

-directory and it needs to contain a list of nameserver addresses to

-use to find the nameserver authoritative for the zone. The format of

-this file is:

-

-nameserver 1.2.3.4

-nameserver 5.6.7.8

-

-Replace the IP addresses with your real addresses.  127.0.0.1 is a valid

-address if you are running a nameserver on the localhost. 

-

-	Problems

-

-Please report all problems to bind9-bugs@isc.org and not to me. All

-other questions should go to the bind-users@isc.org mailing list or the

-comp.protocol.dns.bind news group.

-

-	Danny Mayer

-	mayer@ntp.isc.org

-

+Copyright (C) 2004, 2005  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.7.2.4.4.4 2005/09/06 02:12:43 marka Exp $
+
+	   Release of BIND 9.3 for Window NT/2000/XP/2003
+
+This is a release of BIND 9.3 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.
+  
+	Important Kit Installation Information
+
+As of release 9.3.0, BINDInstall requires that you install
+it under an account with restricted privileges. The installer
+will prompt you for an account name, the default is "named", and
+a password for that account. It will also check for the existence
+of that account. If it does not exist is will create it with only
+the privileges required to run BIND. If the account does exist it
+will check that it has only the one privilege required:
+"Log on as a service". If it has too many privileges it will prompt
+you if you want to continue. 
+
+With BIND running under an account name it is necessary for all
+files and directories that BIND uses to have permissions set up
+for the named account if the files are on an NTFS disk. BIND requires
+that the account have read and write access to the directory for
+the pid file, any files that are maintained either for slave zones
+or for master zones supporting dynamic updates. The account will
+also need read access to the named.conf and any other file that
+it needs to read.
+
+It is important that on Windows the directory directive is used in
+the options section to tell BIND where to find the files used in
+named.conf.
+
+If you have previously installed BIND 8 or BIND 4 on the system that
+you wish to install this kit, you MUST use the BIND 8 or BIND 4 installer
+to uninstall the previous kit.  For BIND 8.2.x, you can use the
+BINDInstall that comes with the BIND 8 kit to uninstall it. The BIND 9
+installer will NOT uninstall the BIND 8 binaries.  That will be fixed
+in a future release.
+
+Unpack the kit into any convenient directory and run the BINDInstall
+program.  This will install the named and associated programs into
+the correct directories and set up the required registry keys.
+
+Messages are logged to the Application log in the EventViewer.
+
+	Controlling BIND
+
+Windows NT/2000 uses the same rndc program as is used on Unix
+systems.  The rndc.conf file must be configured for your system in
+order to work. You will need to generate a key for this. To do this
+use the rndc-confgen program. The program will be installed in the
+same directory as named: dns/bin/.  From the DOS prompt, use the
+command this way:
+
+rndc-confgen -a
+
+which will create a rndc.key file in the dns/etc directory. This will
+allow you to run rndc without an explicit rndc.conf file or key and
+control entry in named.conf file. See section 3.4.1.2 of the ARM for
+details of this. An rndc.conf can also be generated by running:
+
+rndc-confgen > rndc.conf
+
+which will create the rndc.conf file in the current directory, but not
+copy it to the dns/etc directory where it needs to reside. If you create
+rndc.conf this way you will need to copy the same key statement into
+named.conf.
+
+The additions look like the following:
+
+key "rndc-key" { algorithm hmac-md5; secret "xxxxxxxxx=="; };
+
+controls {
+	inet 127.0.0.1 port 953 allow { localhost; } keys { "rndc-key"; };
+};
+
+Note that the value of the secret must come from the key generated
+above for rndc and must be the same key value for both. Details of
+this may be found in section 3.4.1.2 of the ARM. If you have rndc
+on a Unix box you can use it to control BIND on the NT/W2K box as
+well as using the Windows version of rndc to control a BIND 9
+daemon on a Unix box. However you must have key statements valid for
+the servers you wish to control, specifically the IP address and key
+in both named.conf and rndc.conf. Again see section 3.4.1.2 of the
+ARM for details.
+
+In order to you rndc from a different system it is important to
+ensure that the clocks are synchronized. The clocks must be kept
+within 5 minutes of each other or the rndc commands will fail
+authentication. Use NTP or other time synchronization software
+to keep your clocks accurate. NTP can be found at
+http://www.ntp.org/.
+
+In addition BIND is installed as a win32 system service, can be
+started and stopped in the same way as any other service and
+automatically starts whenever the system is booted. Signals are
+not supported and are in fact ignored.
+
+Note: Unlike most Windows applications, named does not, change its
+working directory when started as a service.  If you wish to use
+relative files in named.conf you will need to specify a working
+directory using the directory directive options.
+
+	Documentation
+
+This kit includes Documentation in HTML format.  The documentation is not
+copied during the installation process so you should move it to any convenient
+location for later reference. Of particular importance is the BIND 9
+Administrator's Reference Manual (Bv9ARM*.html) which provides detailed
+information on BIND 9. In addition, there are HTML pages for each of the
+BIND 9 applications.
+
+	DNS Tools
+
+The following tools have been built for Windows NT: dig, nslookup,
+host, nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,
+dnssec-keygen, dnssec-signzone. The tools will NOT run on Win9x,
+only WinNT and Win2000. The latter tools are for use with DNSSEC.
+All tools are installed in the dns/bin directory.
+
+IMPORTANT NOTE ON USING THE TOOLS:
+
+It is no longer necessary to create a resolv.conf file on Windows as
+the tools will look in the registry for the required nameserver
+information. However if you wish to create a resolv.conf file as
+follows it will use it in preference to the registry nameserver
+entries.
+
+To create a resolv.conf you need to place it in the System32\Drivers\etc
+directory and it needs to contain a list of nameserver addresses to
+use to find the nameserver authoritative for the zone. The format of
+this file is:
+
+nameserver 1.2.3.4
+nameserver 5.6.7.8
+
+Replace the IP addresses with your real addresses.  127.0.0.1 is a valid
+address if you are running a nameserver on the localhost. 
+
+	Problems
+
+Please report all problems to bind9-bugs@isc.org and not to me. All
+other questions should go to the bind-users@isc.org mailing list or the
+comp.protocol.dns.bind news group.
+
+	Danny Mayer
+	mayer@ntp.isc.org
+
diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
index 4ecc33b6..bf0bb70c 100644
--- a/win32utils/win32-build.txt
+++ b/win32utils/win32-build.txt
@@ -1,144 +1,144 @@
-Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")

-Copyright (C) 2001, 2002  Internet Software Consortium.

-See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

-

-$Id: win32-build.txt,v 1.5.2.1.4.5 2005/11/01 05:51:50 marka Exp $

-

-       BIND 9.3 for Win32 Source Build Instructions.  28-May-2005

-

-Building BIND 9.3 on Windows NT/2000 has the following prerequisites:

-

-1) You need to install Perl for Windows NT/2000. ActiveState

-(http://www.activestate.com/) is the one most people install and use;

-2) OpenSSL (http://www.openssl.org) needs to be downloaded and built

-on the system on which you are building BIND.

-3) If you want to build using Visual C++ 6.0, you'll need some extra

-files that are to be found in the Platform SDK (which you will need

-to install), namely:

-

-iphlpapi.h

-iptypes.h

-ipexport.h

-iphlpapi.lib

-

-You'll also need an updated Iprtrmib.h - using the VC++6.0 one will

-get you some compilation errors. You can just overwrite the old one if

-you're not using it for any purposes, and maybe keep a backup of it. 

-

-You can copy the header files under VC98\INCLUDE and the library file

-under VC98\LIB. I think you can also put them in a separate directory

-and add it to the include search list, but I don't know if that can be

-made persistent. 

-

-For building on VC++ 7.0 no extra files are required. 

-

-The instructions assume a Visual C++ 6.0 compiler with Visual Studio and

-Visual Studio Service Pack 3 or later. It may build and work with earlier

-versions but it has not been tested. The binaries may be built and run on

-any of the following platforms: NT 4.0 Workstation (SP3 or later), NT 4.0

-Server (SP3 or later), Windows 2000 Professional (SP1 or later),

-Windows 2000 Server or any kind (SP1 or later), Windows XP, Windows 2003

-Server. It will NOT build or run on Windows 95, Windows 98, etc. platforms.

-

-Step 1: Download and Build OpenSSL

-

-Download and untar the OpenSSL sources from http://www.openssl.org/.

-if you have place the BIND sources in /BIND9 you should place the

-OpenSSL sources in /openssl-0.9.7c or the appropriate directory name

-created when you untarred the openssl tarball.

-

-Note: Building OpenSSL also requires that you install Perl as it uses

-it during its build process. Follow the instructions for NT given

-in the INSTALL.W32 file to build the kit. This will produce libeay32.lib

-and libeay32.dll in the out32dll subdirectory. 

-

-

-Step 2 Building BIND

-

-You must build openssl first. 

-

-From the command prompt cd to the win32utils under the BIND root.

-Execute the BuildAll.bat file. This will do the following:

-1) copy config.h.win32 to config.h in the root.

-2) create the versions.h file in the root.

-3) Build the gen application in the lib/dns directory.

-4) Run the gen application and build the required lib/dns header

-   files.

-5) Create the Build/Release subdirectory under the root of the BIND

-   source tree which will hold the binaries being built.

-6) Build the libraries, named, application tools like dig, rndc

-   dnssec tools, installer, checkconf and checkzones programs,

-   BIND 9 Installer.

-7) Copies the release notes and the OpenSSL DLL to the BUILD/Release

-   directory.

-8) Copies the BIND 9 ARM HTML files and the application HTML files

-   to the Build\Release area.

-

-If you wish to use Visual Studio for building, you can just run the

-BuildSetup.bat file which will create all the necessary files and you

-can then use the BINDBuild.dsw to open the workspace for all of the

-libraries and applications. These files reside in the same win32utils

-directory as this file.

-

-The following files are built:

-

-libbind9.dll

-libisc.dll

-libdns.dll

-libisccc.dll

-libisccfg.dll

-liblwres.dll

-named.exe

-bindevt.dll 

-BINDInstall.exe

-

-rndc.exe

-dig.exe

-host.exe

-nslookup.exe

-nsupdate.exe

-

-named-checkconf.exe

-named-checkzone.exe

-

-dnssec-keygen.exe

-dnssec-signzone.exe

-

-If you are building with VS.NET (aka VC++ V7) you will need additional

-system DLL's: 

-

-mfc71.dll

-msvcr71.dll

-

-or

-

-mfc70.dll

-msvcr70.dll

-

-depending on your version of the compiler.

-

-You should end up with 18-20 binaries in the bind9/Build/Release

-directory. The Install instructions Readme1st.txt from win32utils and

-libeay32.dll from the openssl/out32dll/ directory are also copied into

-the Build area. In addition you should have 22 HTML files and a number

-of text files.

-

-The set of files in the directory bind9/Build/Release form the

-installation kit which can then be zipped and distributed to any

-suitable Windows NT 4.0 or Windows 2000 platform.

-

-Installation is accomplished by running the BINDInstall program. All DLL's

-are copied to the system32 area and all applications (including BINDInstall

-which may be necessary for uninstalling BIND 9) to the dns/bin directory.

-If BIND 8 has previously been installed on the system it must be uninstalled

-first by running it's own BINDInstall program.  The BIND 9 installer does

-not yet do this.

-

-All bugs found, whether in the process of building the application or

-running BIND or the tools should be reported to the bind9 bugs email

-account at bind9-bugs@isc.org.

-

-	Danny Mayer

-	mayer@ntp.isc.org

-

-

+Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2002  Internet Software Consortium.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
+$Id: win32-build.txt,v 1.5.2.1.4.5 2005/11/01 05:51:50 marka Exp $
+
+       BIND 9.3 for Win32 Source Build Instructions.  28-May-2005
+
+Building BIND 9.3 on Windows NT/2000 has the following prerequisites:
+
+1) You need to install Perl for Windows NT/2000. ActiveState
+(http://www.activestate.com/) is the one most people install and use;
+2) OpenSSL (http://www.openssl.org) needs to be downloaded and built
+on the system on which you are building BIND.
+3) If you want to build using Visual C++ 6.0, you'll need some extra
+files that are to be found in the Platform SDK (which you will need
+to install), namely:
+
+iphlpapi.h
+iptypes.h
+ipexport.h
+iphlpapi.lib
+
+You'll also need an updated Iprtrmib.h - using the VC++6.0 one will
+get you some compilation errors. You can just overwrite the old one if
+you're not using it for any purposes, and maybe keep a backup of it. 
+
+You can copy the header files under VC98\INCLUDE and the library file
+under VC98\LIB. I think you can also put them in a separate directory
+and add it to the include search list, but I don't know if that can be
+made persistent. 
+
+For building on VC++ 7.0 no extra files are required. 
+
+The instructions assume a Visual C++ 6.0 compiler with Visual Studio and
+Visual Studio Service Pack 3 or later. It may build and work with earlier
+versions but it has not been tested. The binaries may be built and run on
+any of the following platforms: NT 4.0 Workstation (SP3 or later), NT 4.0
+Server (SP3 or later), Windows 2000 Professional (SP1 or later),
+Windows 2000 Server or any kind (SP1 or later), Windows XP, Windows 2003
+Server. It will NOT build or run on Windows 95, Windows 98, etc. platforms.
+
+Step 1: Download and Build OpenSSL
+
+Download and untar the OpenSSL sources from http://www.openssl.org/.
+if you have place the BIND sources in /BIND9 you should place the
+OpenSSL sources in /openssl-0.9.7c or the appropriate directory name
+created when you untarred the openssl tarball.
+
+Note: Building OpenSSL also requires that you install Perl as it uses
+it during its build process. Follow the instructions for NT given
+in the INSTALL.W32 file to build the kit. This will produce libeay32.lib
+and libeay32.dll in the out32dll subdirectory. 
+
+
+Step 2 Building BIND
+
+You must build openssl first. 
+
+From the command prompt cd to the win32utils under the BIND root.
+Execute the BuildAll.bat file. This will do the following:
+1) copy config.h.win32 to config.h in the root.
+2) create the versions.h file in the root.
+3) Build the gen application in the lib/dns directory.
+4) Run the gen application and build the required lib/dns header
+   files.
+5) Create the Build/Release subdirectory under the root of the BIND
+   source tree which will hold the binaries being built.
+6) Build the libraries, named, application tools like dig, rndc
+   dnssec tools, installer, checkconf and checkzones programs,
+   BIND 9 Installer.
+7) Copies the release notes and the OpenSSL DLL to the BUILD/Release
+   directory.
+8) Copies the BIND 9 ARM HTML files and the application HTML files
+   to the Build\Release area.
+
+If you wish to use Visual Studio for building, you can just run the
+BuildSetup.bat file which will create all the necessary files and you
+can then use the BINDBuild.dsw to open the workspace for all of the
+libraries and applications. These files reside in the same win32utils
+directory as this file.
+
+The following files are built:
+
+libbind9.dll
+libisc.dll
+libdns.dll
+libisccc.dll
+libisccfg.dll
+liblwres.dll
+named.exe
+bindevt.dll 
+BINDInstall.exe
+
+rndc.exe
+dig.exe
+host.exe
+nslookup.exe
+nsupdate.exe
+
+named-checkconf.exe
+named-checkzone.exe
+
+dnssec-keygen.exe
+dnssec-signzone.exe
+
+If you are building with VS.NET (aka VC++ V7) you will need additional
+system DLL's: 
+
+mfc71.dll
+msvcr71.dll
+
+or
+
+mfc70.dll
+msvcr70.dll
+
+depending on your version of the compiler.
+
+You should end up with 18-20 binaries in the bind9/Build/Release
+directory. The Install instructions Readme1st.txt from win32utils and
+libeay32.dll from the openssl/out32dll/ directory are also copied into
+the Build area. In addition you should have 22 HTML files and a number
+of text files.
+
+The set of files in the directory bind9/Build/Release form the
+installation kit which can then be zipped and distributed to any
+suitable Windows NT 4.0 or Windows 2000 platform.
+
+Installation is accomplished by running the BINDInstall program. All DLL's
+are copied to the system32 area and all applications (including BINDInstall
+which may be necessary for uninstalling BIND 9) to the dns/bin directory.
+If BIND 8 has previously been installed on the system it must be uninstalled
+first by running it's own BINDInstall program.  The BIND 9 installer does
+not yet do this.
+
+All bugs found, whether in the process of building the application or
+running BIND or the tools should be reported to the bind9 bugs email
+account at bind9-bugs@isc.org.
+
+	Danny Mayer
+	mayer@ntp.isc.org
+
+