This commit was manufactured by cvs2git to create tag 'v9_4_0a3'.

validation from rndc.  This is useful for the
                        mobile hosts where the current connection point
                        breaks DNSSEC (firewall/proxy).  [RT #15592]

                                rndc validation newstate [view]

CHANGES

@@ -1,218 +1,5 @@
-2006.	[security]	Allow-query-cache and allow-recursion now default
-			to the builtin acls "localnets" and "localhost".
 
-			This is being done to make caching servers less
-			attractive as reflective amplifying targets for
-			spoofed traffic.  This still leave authoritative
-			servers exposed.
-
-			The best fix is for full BCP 38 deployment to
-			remove spoofed traffic.
-
-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]
-
-2001.	[func]		Check the KSK flag when updating a secure dynamic zone.
-			New zone option "update-check-ksk yes;".  [RT #15817]
-
-2000.	[bug]		memmove()/strtol() fix was incomplete. [RT #15812]
-
-1999.	[func]		Implement "rrset-order fixed". [RT #13662]
-
-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]
-
-1996.	[bug]		nsupdate: if a zone has been specified it should
-			appear in the output of 'show'. [RT #15797]
-
-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]
-
-1992.	[bug]		Not all incoming zone transfer messages included the
-			view.  [RT #15825]
-
-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]
-
-1988.	[bug]		Remove a bus error from the SHA256/SHA512 support.
-			[RT #15878]
-
-1987.	[func]		DS/DLV SHA256 digest algorithm support. [RT #15608]
-
-1986.	[func]		Report when a zone is removed. [RT #15849]
-
-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.
-
-1984.	[func]		dig, nslookup and host now advertise a 4096 byte
-			EDNS UDP buffer size by default. [RT #15855]
-
-1983.	[func]		Two new update policies.  "selfsub" and "selfwild".
-			[RT #12895]
-
-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.
-
-1980.	[func]		dnssec-signzone: output the SOA record as the
-			first record in the signed zone. [RT #15758]
-
-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.
-
-1973.	[func]		TSIG HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384 and
-			HMACSHA512 support. [RT #13606]
-
-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]
-
-1967.	[func]		dig/nslookup/host: warn about missing "QR". [RT #15779]
-
-1966.	[bug]		Don't set CD when we have fallen back to plain DNS.
-			[RT #15727]
-
-1965.	[func]		Suppress spurious "recusion requested but not
-			available" warning with 'dig +qr'. [RT #15780].
-
-1964.	[func]		Seperate out MX and SRV to CNAME checks. [RT #15723]
-
-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]
-
-1959.	[func]		Control the zeroing of the negative response TTL to
-			a soa query.  Defaults "zero-no-soa-ttl yes;" and
-			"zero-no-soa-ttl-cache no;". [RT #15460]
-
-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]
-
-1954.	[func]		Named now falls back to advertising EDNS with a
-			512 byte receive buffer if the initial EDNS queries
-			fail.  [RT #14852]
-
-1953.	[func]		The maximum EDNS UDP response named will send can
-			now be set in named.conf (max-udp-size).  This is
-			independent of the advertised receive buffer
-			(edns-udp-size). [RT #14852]
-
-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]
-
-1949.	[func]		Addition memory leakage checks. [RT #15544]
-
-1948.	[bug]		If was possible to trigger a REQUIRE failure in
-			xfrin.c:maybe_free() if named ran out of memory.
-			[RT #15568]
-
-1947.	[func]		It is now possible to configure named to accept
-			expired RRSIGs.  Default "dnssec-accept-expired no;".
-			Setting "dnssec-accept-expired yes;" leaves named
-			vulnerable to replay attacks.  [RT #14685]
-
-1946.	[bug]		resume_dslookup() could trigger a REQUIRE failure
-			when using forwarders. [RT #15549]
-
-1945.	[cleanup]	dnssec-keygen: RSA (RSAMD5) is nolonger recommended.
-			To generate a RSAMD5 key you must explicitly request
-			RSAMD5. [RT #13780]
-			
-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]
+	--- 9.4.0a3 released ---
 
 1942.	[bug]		If the name of a DNSKEY match that of one in
 			trusted-keys do not attempt to validate the DNSKEY
@@ -238,9 +25,15 @@
 1935.	[bug]		'acache' was DO sensitive. [RT #15430]
 
 1934.	[func]		Validate pending NS RRsets, in the authority section,
-			prior to returning them if it can be done without
+			prior to returning them if it can be done without 
 			requiring DNSKEYs to be fetched.  [RT #15430]
 
+1919.	[contrib]	queryperf: a set of new features: collecting/printing
+			response delays, printing intermediate results, and
+			adjusting query rate for the "target" qps.
+
+	--- 9.4.0a2 released ---
+
 1933.	[bug]		dump_rdataset_raw() had a incorrect INSIST. [RT #15534]
 
 1932.	[bug]		hpux: LDFLAGS was getting corrupted. [RT #15530]
@@ -279,9 +72,7 @@
 			have the desired performance characteristics.
 			[RT #15454]
 
-1919.	[contrib]	queryperf: a set of new features: collecting/printing
-			response delays, printing intermediate results, and
-			adjusting query rate for the "target" qps.
+	--- 9.4.0a1 released ---
 
 1918.	[bug]		Memory leak when checking acls. [RT #15391]
 
@@ -424,8 +215,6 @@
 
 1872.	[port]		win32: Handle ERROR_NETNAME_DELETED.  [RT #13753]
 
-1871.	[placeholder]
-
 1870.	[func]		Added framework for handling multiple EDNS versions.
 			[RT #14873]
 
@@ -570,8 +359,6 @@
 
 1822.	[bug]		check-names test for RT was reversed. [RT #13382]
 
-1821.	[placeholder]
-
 1820.	[bug]		Gracefully handle acl loops. [RT #13659]
 
 1819.	[bug]		The validator needed to check both the algorithm and
@@ -721,10 +508,6 @@
 
 1773.	[bug]		Fast retry on host / net unreachable. [RT #13153]
 
-1772.	[placeholder]
-
-1771.	[placeholder]
-
 1770.	[bug]		named-checkconf failed to report missing a missing
 			file clause for rbt{64} master/hint zones. [RT#13009]
 
@@ -1028,8 +811,6 @@
 1670.	[func]		Log UPDATE requests to slave zones without an acl as
 			"disabled" at debug level 3. [RT# 11657]
 
-1669.	[placeholder]
-
 1668.	[bug]		DIG_SIGCHASE was making bin/dig/host dump core.
 
 1667.	[port]		linux: not all versions have IF_NAMESIZE.
@@ -1236,9 +1017,7 @@
 1598.	[func]		Specify that certain parts of the namespace must
 			be secure (dnssec-must-be-secure).
 
-1597.	[func]		Allow notify-source and query-source to be specified
-			on a per server basis similar to transfer-source.
-			[RT #6496]
+1597.	[placeholder]	rt6496a
 
 1596.	[func]		Accept 'notify-source' style syntax for query-source.
 
@@ -1778,8 +1557,8 @@
 
 1414.	[func]		Support for KSK flag.
 
-1413.	[func]		Explicitly request the (re-)generation of DS records
-			from keysets (dnssec-signzone -g).
+1413.	[func]		Explictly 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
@@ -6028,7 +5807,7 @@
 			<isc/bufferlist.h>, <isc/task.h>, <isc/mem.h> or
 			<isc/net.h>.
 
- 119.	[cleanup]	structure definitions for generic rdata structures do
+ 119.	[cleanup]	structure definitions for generic rdata stuctures do
 			not have _generic_ in their names.
 
  118.	[cleanup]	libdns.a is now namespace-clean, on NetBSD, excepting

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004, 2005  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.11 2006/01/04 00:37:24 marka Exp $
+$Id: COPYRIGHT,v 1.9.18.1 2005/01/10 23:50:57 marka Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 

FAQ

@@ -4,36 +4,26 @@ 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"?
 
@@ -50,26 +40,23 @@ 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.
-
-   Newer versions of Linux's ps command hide the individual threads and require -L
-   to display them.
+   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.
 
 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?
 
@@ -81,16 +68,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>; };
@@ -104,45 +91,48 @@ A: The following view statement will intercept lookups as the internal view that
 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?
@@ -150,11 +140,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?
 
@@ -162,59 +152,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).
+   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?
+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.
+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.
+   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:
@@ -242,8 +232,8 @@ A: You will need to give the master and slave multiple IP addresses and use thos
            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.
 
@@ -258,7 +248,7 @@ A: BIND 9.3 and later: Use TSIG to select the appropriate view.
            };
            view "external" {
                    match-clients { key external; any; };
-                   server 10.0.1.2 { keys external; };
+                   server 10.0.0.2 { keys external; };
                    recursion no;
                    ...
            };
@@ -274,7 +264,7 @@ A: BIND 9.3 and later: Use TSIG to select the appropriate view.
            };
            view "external" {
                    match-clients { key external; any; };
-                   server 10.0.1.1 { keys external; };
+                   server 10.0.0.1 { keys external; };
                    recursion no;
                    ...
            };
@@ -282,8 +272,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"
@@ -293,33 +283,34 @@ 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".
@@ -328,15 +319,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" {
@@ -379,14 +370,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
@@ -404,23 +395,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".
 
@@ -428,11 +419,12 @@ 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";
@@ -447,11 +439,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>]).
@@ -497,8 +489,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;
@@ -531,102 +523,3 @@ 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)
-

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-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005  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.12 2006/02/27 21:08:42 marka Exp $ -->
+<!-- $Id: FAQ.xml,v 1.4.4.3 2005/11/02 22:53:33 marka Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>
@@ -64,26 +64,6 @@
       </answer>
     </qandaentry>
 
-    <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>
@@ -125,10 +105,6 @@ 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>
 
@@ -540,7 +516,7 @@ Master 10.0.1.1:
 	};
 	view "external" {
 		match-clients { key external; any; };
-		server 10.0.1.2 { keys external; };
+		server 10.0.0.2 { keys external; };
 		recursion no;
 		...
 	};
@@ -556,7 +532,7 @@ Slave 10.0.1.2:
 	};
 	view "external" {
 		match-clients { key external; any; };
-		server 10.0.1.1 { keys external; };
+		server 10.0.0.1 { keys external; };
 		recursion no;
 		...
 	};</programlisting>
@@ -1021,177 +997,11 @@ 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>

Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.45 2005/09/06 03:51:34 marka Exp $
+# $Id: Makefile.in,v 1.43.18.2 2005/09/06 03:47:14 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

README

@@ -401,23 +401,10 @@ 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.
 

README.idnkit

@@ -109,4 +109,4 @@ 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: README.idnkit,v 1.2 2005/09/09 06:13:57 marka Exp $
+; $Id: README.idnkit,v 1.2.2.2 2005/09/12 02:12:08 marka Exp $

acconfig.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acconfig.h,v 1.49 2005/04/29 00:22:24 marka Exp $ */
+/* $Id: acconfig.h,v 1.44.18.5 2005/04/29 00:15:20 marka Exp $ */
 
 /*! \file */
 

bin/check/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.28 2005/09/12 02:16:29 marka Exp $
+# $Id: Makefile.in,v 1.24.18.4 2005/09/07 00:29:53 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

bin/check/check-tool.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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: check-tool.c,v 1.24 2006/01/07 00:23:35 marka Exp $ */
+/* $Id: check-tool.c,v 1.10.18.10 2005/09/30 08:22:58 marka Exp $ */
 
 /*! \file */
 
@@ -71,9 +71,7 @@ unsigned int zone_options = DNS_ZONEOPT_CHECKNS |
 			    DNS_ZONEOPT_MANYERRORS |
 			    DNS_ZONEOPT_CHECKNAMES |
 			    DNS_ZONEOPT_CHECKINTEGRITY |
-			    DNS_ZONEOPT_CHECKWILDCARD |
-			    DNS_ZONEOPT_WARNMXCNAME |
-			    DNS_ZONEOPT_WARNSRVCNAME;
+			    DNS_ZONEOPT_CHECKWILDCARD;
 
 /*
  * This needs to match the list in bin/named/log.c.
@@ -130,11 +128,10 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
 	case 0:
 		if (strcasecmp(ai->ai_canonname, namebuf) != 0) {
 			dns_zone_log(zone, ISC_LOG_ERROR,
-				     "%s/NS '%s' (out of zone) "
+			             "%s/NS '%s' (out of zone) "
 				     "is a CNAME (illegal)",
 				     ownerbuf, namebuf);
-			/* XXX950 make fatal for 9.5.0 */
-			/* answer = ISC_FALSE; */
+			answer = ISC_FALSE;
 		}
 		break;
 	case EAI_NONAME:
@@ -144,8 +141,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
 		dns_zone_log(zone, ISC_LOG_ERROR, "%s/NS '%s' (out of zone) "
 			     "has no addresses records (A or AAAA)",
 			     ownerbuf, namebuf);
-		/* XXX950 make fatal for 9.5.0 */
-		return (ISC_TRUE);
+		return (ISC_FALSE);
 
 	default:
 		dns_zone_log(zone, ISC_LOG_WARNING,
@@ -179,8 +175,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
 				     ownerbuf, namebuf,
 				     inet_ntop(AF_INET, rdata.data,
 					       addrbuf, sizeof(addrbuf)));
-			/* XXX950 make fatal for 9.5.0 */
-			/* answer = ISC_FALSE; */
+			answer = ISC_FALSE;
 		}
 		dns_rdata_reset(&rdata);
 		result = dns_rdataset_next(a);
@@ -208,8 +203,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
 				     ownerbuf, namebuf,
 				     inet_ntop(AF_INET6, rdata.data,
 					       addrbuf, sizeof(addrbuf)));
-			/* XXX950 make fatal for 9.5.0. */
-			/* answer = ISC_FALSE; */
+			answer = ISC_FALSE;
 		}
 		dns_rdata_reset(&rdata);
 		result = dns_rdataset_next(aaaa);
@@ -252,8 +246,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
 				     ownerbuf, namebuf, type,
 				     inet_ntop(cur->ai_family, ptr,
 					       addrbuf, sizeof(addrbuf)));
-			/* XXX950 make fatal for 9.5.0. */
-			/* answer = ISC_FALSE; */
+			answer = ISC_FALSE;
 		}
 	}
 	freeaddrinfo(ai);
@@ -270,8 +263,6 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 	char namebuf[DNS_NAME_FORMATSIZE + 1];
 	char ownerbuf[DNS_NAME_FORMATSIZE];
 	int result;
-	int level = ISC_LOG_ERROR;
-	isc_boolean_t answer = ISC_TRUE;
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_CANONNAME;
@@ -291,21 +282,13 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 	dns_name_format(name, namebuf, sizeof(namebuf) - 1);
 	switch (result) {
 	case 0:
-		if (strcasecmp(ai->ai_canonname, namebuf) != 0) {
-			if ((zone_options & DNS_ZONEOPT_WARNMXCNAME) != 0)
-				level = ISC_LOG_WARNING;
-			if ((zone_options & DNS_ZONEOPT_IGNOREMXCNAME) == 0) {
-				dns_zone_log(zone, ISC_LOG_WARNING,
-					     "%s/MX '%s' (out of zone) "
-					     "is a CNAME (illegal)",
-					     ownerbuf, namebuf);
-				if (level == ISC_LOG_ERROR)
-					answer = ISC_FALSE;
-			}
-		}
+		if (strcasecmp(ai->ai_canonname, namebuf) != 0)
+			dns_zone_log(zone, ISC_LOG_WARNING,
+			             "%s/MX '%s' (out of zone) "
+				     "is a CNAME (illegal)",
+				     ownerbuf, namebuf);
 		freeaddrinfo(ai);
-		return (answer);
-
+		break;
 	case EAI_NONAME:
 #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
 	case EAI_NODATA:
@@ -313,8 +296,7 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 		dns_zone_log(zone, ISC_LOG_ERROR, "%s/MX '%s' (out of zone) "
 			     "has no addresses records (A or AAAA)",
 			     ownerbuf, namebuf);
-		/* XXX950 make fatal for 9.5.0. */
-		return (ISC_TRUE);
+		return (ISC_FALSE);
 
 	default:
 		dns_zone_log(zone, ISC_LOG_WARNING,
@@ -322,9 +304,8 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 			     namebuf, gai_strerror(result));
 		return (ISC_TRUE);
 	}
-#else
-	return (ISC_TRUE);
 #endif
+	return (ISC_TRUE);
 }
 
 static isc_boolean_t
@@ -334,8 +315,6 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 	char namebuf[DNS_NAME_FORMATSIZE + 1];
 	char ownerbuf[DNS_NAME_FORMATSIZE];
 	int result;
-	int level = ISC_LOG_ERROR;
-	isc_boolean_t answer = ISC_TRUE;
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_CANONNAME;
@@ -355,21 +334,13 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 	dns_name_format(name, namebuf, sizeof(namebuf) - 1);
 	switch (result) {
 	case 0:
-		if (strcasecmp(ai->ai_canonname, namebuf) != 0) {
-			if ((zone_options & DNS_ZONEOPT_WARNSRVCNAME) != 0)
-				level = ISC_LOG_WARNING;
-			if ((zone_options & DNS_ZONEOPT_IGNORESRVCNAME) == 0) {
-				dns_zone_log(zone, level,
-					     "%s/SRV '%s' (out of zone) "
-					     "is a CNAME (illegal)",
-					     ownerbuf, namebuf);
-				if (level == ISC_LOG_ERROR)
-					answer = ISC_FALSE;
-			}
-		}
+		if (strcasecmp(ai->ai_canonname, namebuf) != 0)
+			dns_zone_log(zone, ISC_LOG_WARNING,
+			             "%s/SRV '%s' (out of zone) "
+				     "is a CNAME (illegal)",
+				     ownerbuf, namebuf);
 		freeaddrinfo(ai);
-		return (answer);
-
+		break;
 	case EAI_NONAME:
 #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
 	case EAI_NODATA:
@@ -377,8 +348,7 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 		dns_zone_log(zone, ISC_LOG_ERROR, "%s/SRV '%s' (out of zone) "
 			     "has no addresses records (A or AAAA)",
 			     ownerbuf, namebuf);
-		/* XXX950 make fatal for 9.5.0. */
-		return (ISC_TRUE);
+		return (ISC_FALSE);
 
 	default:
 		dns_zone_log(zone, ISC_LOG_WARNING,
@@ -386,9 +356,8 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
 			     namebuf, gai_strerror(result));
 		return (ISC_TRUE);
 	}
-#else
-	return (ISC_TRUE);
 #endif
+	return (ISC_TRUE);
 }
 
 isc_result_t

bin/check/check-tool.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.h,v 1.11 2005/06/20 01:03:48 marka Exp $ */
+/* $Id: check-tool.h,v 1.7.18.4 2005/06/20 01:19:25 marka Exp $ */
 
 #ifndef CHECK_TOOL_H
 #define CHECK_TOOL_H

bin/check/named-checkconf.8

@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: named-checkconf.8,v 1.24 2005/10/13 03:13:55 marka Exp $
+.\" $Id: named-checkconf.8,v 1.16.18.8 2005/10/13 02:52:58 marka Exp $
 .\"
 .hy 0
 .ad l

bin/check/named-checkconf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.42 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: named-checkconf.c,v 1.28.18.11 2005/09/18 07:58:03 marka Exp $ */
 
 /*! \file */
 
@@ -66,7 +66,7 @@ usage(void) {
 
 /*% directory callback */
 static isc_result_t
-directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) {
+directory_callback(const char *clausename, cfg_obj_t *obj, void *arg) {
 	isc_result_t result;
 	const char *directory;
 
@@ -91,7 +91,7 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) {
 }
 
 static isc_boolean_t
-get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
+get_maps(cfg_obj_t **maps, const char *name, cfg_obj_t **obj) {
 	int i;
 	for (i = 0;; i++) {
 		if (maps[i] == NULL)
@@ -102,11 +102,11 @@ get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
 }
 
 static isc_boolean_t
-get_checknames(const cfg_obj_t **maps, 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;
+get_checknames(cfg_obj_t **maps, cfg_obj_t **obj) {
+	cfg_listelt_t *element;
+	cfg_obj_t *checknames;
+	cfg_obj_t *type;
+	cfg_obj_t *value;
 	isc_result_t result;
 	int i;
 
@@ -135,7 +135,7 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) {
 }
 
 static isc_result_t
-config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
+config_get(cfg_obj_t **maps, const char *name, cfg_obj_t **obj) {
 	int i;
 
 	for (i = 0;; i++) {
@@ -148,23 +148,22 @@ config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
 
 /*% configure the zone */
 static isc_result_t
-configure_zone(const char *vclass, const char *view,
-	       const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
-	       const cfg_obj_t *config, isc_mem_t *mctx)
+configure_zone(const char *vclass, const char *view, cfg_obj_t *zconfig,
+	       cfg_obj_t *vconfig, cfg_obj_t *config, isc_mem_t *mctx)
 {
 	int i = 0;
 	isc_result_t result;
 	const char *zclass;
 	const char *zname;
 	const char *zfile;
-	const cfg_obj_t *maps[4];
-	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;
-	const cfg_obj_t *obj = NULL;
-	const cfg_obj_t *fmtobj = NULL;
+	cfg_obj_t *maps[4];
+	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;
+	cfg_obj_t *obj = NULL;
+	cfg_obj_t *fmtobj = NULL;
 	dns_masterformat_t masterformat;
 
 	zone_options = DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_MANYERRORS;
@@ -226,42 +225,6 @@ configure_zone(const char *vclass, const char *view,
 			zone_options &= ~DNS_ZONEOPT_CHECKINTEGRITY;
 	}
 
-	obj = NULL;
-	if (get_maps(maps, "check-mx-cname", &obj)) {
-		if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) {
-			zone_options |= DNS_ZONEOPT_WARNMXCNAME;
-			zone_options &= ~DNS_ZONEOPT_IGNOREMXCNAME;
-		} else if (strcasecmp(cfg_obj_asstring(obj), "fail") == 0) {
-			zone_options &= ~DNS_ZONEOPT_WARNMXCNAME;
-			zone_options &= ~DNS_ZONEOPT_IGNOREMXCNAME;
-		} else if (strcasecmp(cfg_obj_asstring(obj), "ignore") == 0) {
-			zone_options |= DNS_ZONEOPT_WARNMXCNAME;
-			zone_options |= DNS_ZONEOPT_IGNOREMXCNAME;
-		} else
-			INSIST(0);
-	} else {
-		zone_options |= DNS_ZONEOPT_WARNMXCNAME;
-		zone_options &= ~DNS_ZONEOPT_IGNOREMXCNAME;
-	}
-
-	obj = NULL;
-	if (get_maps(maps, "check-srv-cname", &obj)) {
-		if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) {
-			zone_options |= DNS_ZONEOPT_WARNSRVCNAME;
-			zone_options &= ~DNS_ZONEOPT_IGNORESRVCNAME;
-		} else if (strcasecmp(cfg_obj_asstring(obj), "fail") == 0) {
-			zone_options &= ~DNS_ZONEOPT_WARNSRVCNAME;
-			zone_options &= ~DNS_ZONEOPT_IGNORESRVCNAME;
-		} else if (strcasecmp(cfg_obj_asstring(obj), "ignore") == 0) {
-			zone_options |= DNS_ZONEOPT_WARNSRVCNAME;
-			zone_options |= DNS_ZONEOPT_IGNORESRVCNAME;
-		} else
-			INSIST(0);
-	} else {
-		zone_options |= DNS_ZONEOPT_WARNSRVCNAME;
-		zone_options &= ~DNS_ZONEOPT_IGNORESRVCNAME;
-	}
-
 	obj = NULL;
 	if (get_maps(maps, "check-sibling", &obj)) {
 		if (cfg_obj_asboolean(obj))
@@ -310,12 +273,12 @@ configure_zone(const char *vclass, const char *view,
 
 /*% configure a view */
 static isc_result_t
-configure_view(const char *vclass, const char *view, const cfg_obj_t *config,
-	       const cfg_obj_t *vconfig, isc_mem_t *mctx)
+configure_view(const char *vclass, const char *view, cfg_obj_t *config,
+	       cfg_obj_t *vconfig, isc_mem_t *mctx)
 {
-	const cfg_listelt_t *element;
-	const cfg_obj_t *voptions;
-	const cfg_obj_t *zonelist;
+	cfg_listelt_t *element;
+	cfg_obj_t *voptions;
+	cfg_obj_t *zonelist;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;
 
@@ -333,7 +296,7 @@ configure_view(const char *vclass, const char *view, const cfg_obj_t *config,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		const cfg_obj_t *zconfig = cfg_listelt_value(element);
+		cfg_obj_t *zconfig = cfg_listelt_value(element);
 		tresult = configure_zone(vclass, view, zconfig, vconfig,
 					 config, mctx);
 		if (tresult != ISC_R_SUCCESS)
@@ -345,11 +308,11 @@ configure_view(const char *vclass, const char *view, const cfg_obj_t *config,
 
 /*% load zones from the configuration */
 static isc_result_t
-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;
+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;
 	const char *vclass;
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_result_t tresult;

bin/check/named-checkconf.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.13 2005/07/19 04:55:19 marka Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.8.18.5 2005/07/19 05:55:41 marka Exp $ -->
 <refentry id="man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>

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.22 2005/10/13 03:13:56 marka Exp $ -->
+<!-- $Id: named-checkconf.html,v 1.9.18.13 2005/10/13 02:52:58 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/check/named-checkzone.8

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-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: named-checkzone.8,v 1.33 2006/01/07 03:34:55 marka Exp $
+.\" $Id: named-checkzone.8,v 1.18.18.13 2005/10/13 02:52:58 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -30,9 +30,9 @@
 named\-checkzone, named\-compilezone \- zone file validity checking or converting tool
 .SH "SYNOPSIS"
 .HP 16
-\fBnamed\-checkzone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-M\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-S\ \fR\fB\fImode\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename}
+\fBnamed\-checkzone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename}
 .HP 18
-\fBnamed\-compilezone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-C\ \fR\fB\fImode\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename}
+\fBnamed\-compilezone\fR [\fB\-d\fR] [\fB\-j\fR] [\fB\-q\fR] [\fB\-v\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-F\ \fR\fB\fIformat\fR\fR] [\fB\-i\ \fR\fB\fImode\fR\fR] [\fB\-k\ \fR\fB\fImode\fR\fR] [\fB\-m\ \fR\fB\fImode\fR\fR] [\fB\-n\ \fR\fB\fImode\fR\fR] [\fB\-o\ \fR\fB\fIfilename\fR\fR] [\fB\-s\ \fR\fB\fIstyle\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-w\ \fR\fB\fIdirectory\fR\fR] [\fB\-D\fR] [\fB\-W\ \fR\fB\fImode\fR\fR] {zonename} {filename}
 .SH "DESCRIPTION"
 .PP
 \fBnamed\-checkzone\fR
@@ -141,13 +141,6 @@ Specify whether MX records should be checked to see if they are addresses. Possi
 (default) and
 \fB"ignore"\fR.
 .TP
-\-M \fImode\fR
-Check if a MX record refers to a CNAME. Possible modes are
-\fB"fail"\fR,
-\fB"warn"\fR
-(default) and
-\fB"ignore"\fR.
-.TP
 \-n \fImode\fR
 Specify whether NS records should be checked to see if they are addresses. Possible modes are
 \fB"fail"\fR
@@ -171,13 +164,6 @@ Specify the style of the dumped zone file. Possible styles are
 \fBnamed\-checkzone\fR
 this does not cause any effects unless it dumps the zone contents. It also does not have any meaning if the output format is not text.
 .TP
-\-S \fImode\fR
-Check if a SRV record refers to a CNAME. Possible modes are
-\fB"fail"\fR,
-\fB"warn"\fR
-(default) and
-\fB"ignore"\fR.
-.TP
 \-t \fIdirectory\fR
 chroot to
 \fIdirectory\fR

bin/check/named-checkzone.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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: named-checkzone.c,v 1.43 2006/01/07 00:23:35 marka Exp $ */
+/* $Id: named-checkzone.c,v 1.29.18.12 2005/09/18 07:58:03 marka Exp $ */
 
 /*! \file */
 
@@ -77,8 +77,7 @@ usage(void) {
 		"[-f inputformat] [-F outputformat] "
 		"[-t directory] [-w directory] [-k (ignore|warn|fail)] "
 		"[-n (ignore|warn|fail)] [-m (ignore|warn|fail)] "
-		"[-i (full|local|none)] [-M (ignore|warn|fail)] "
-		"[-S (ignore|warn|fail)] [-W (ignore|warn)] "
+		"[-i (full|local|none)] [-W (ignore|warn)] "
 		"zonename filename\n", prog_name);
 	exit(1);
 }
@@ -135,10 +134,8 @@ main(int argc, char **argv) {
 				 DNS_ZONEOPT_CHECKWILDCARD);
 	}
 
-#define ARGCMP(X) (strcmp(isc_commandline_argument, X) == 0)
-
 	while ((c = isc_commandline_parse(argc, argv,
-					  "c:df:i:jk:m:n:qst:o:vw:DF:M:S:W:"))
+					  "c:df:i:jk:m:n:qst:o:vw:DF:W:"))
 	       != EOF) {
 		switch (c) {
 		case 'c':
@@ -150,31 +147,35 @@ main(int argc, char **argv) {
 			break;
 
 		case 'i':
-			if (ARGCMP("full")) {
+			if (!strcmp(isc_commandline_argument, "full")) {
 				zone_options |= DNS_ZONEOPT_CHECKINTEGRITY |
 						DNS_ZONEOPT_CHECKSIBLING;
 				docheckmx = ISC_TRUE;
 				docheckns = ISC_TRUE;
 				dochecksrv = ISC_TRUE;
-			} else if (ARGCMP("full-sibling")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "full-sibling")) {
 				zone_options |= DNS_ZONEOPT_CHECKINTEGRITY;
 				zone_options &= ~DNS_ZONEOPT_CHECKSIBLING;
 				docheckmx = ISC_TRUE;
 				docheckns = ISC_TRUE;
 				dochecksrv = ISC_TRUE;
-			} else if (ARGCMP("local")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "local")) {
 				zone_options |= DNS_ZONEOPT_CHECKINTEGRITY;
 				zone_options |= DNS_ZONEOPT_CHECKSIBLING;
 				docheckmx = ISC_FALSE;
 				docheckns = ISC_FALSE;
 				dochecksrv = ISC_FALSE;
-			} else if (ARGCMP("local-sibling")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "local-sibling")) {
 				zone_options |= DNS_ZONEOPT_CHECKINTEGRITY;
 				zone_options &= ~DNS_ZONEOPT_CHECKSIBLING;
 				docheckmx = ISC_FALSE;
 				docheckns = ISC_FALSE;
 				dochecksrv = ISC_FALSE;
-			} else if (ARGCMP("none")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "none")) {
 				zone_options &= ~DNS_ZONEOPT_CHECKINTEGRITY;
 				zone_options &= ~DNS_ZONEOPT_CHECKSIBLING;
 				docheckmx = ISC_FALSE;
@@ -200,13 +201,15 @@ main(int argc, char **argv) {
 			break;
 
 		case 'k':
-			if (ARGCMP("warn")) {
+			if (!strcmp(isc_commandline_argument, "warn")) {
 				zone_options |= DNS_ZONEOPT_CHECKNAMES;
 				zone_options &= ~DNS_ZONEOPT_CHECKNAMESFAIL;
-			} else if (ARGCMP("fail")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "fail")) {
 				zone_options |= DNS_ZONEOPT_CHECKNAMES |
 						DNS_ZONEOPT_CHECKNAMESFAIL;
-			} else if (ARGCMP("ignore")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "ignore")) {
 				zone_options &= ~(DNS_ZONEOPT_CHECKNAMES |
 						  DNS_ZONEOPT_CHECKNAMESFAIL);
 			} else {
@@ -217,13 +220,13 @@ main(int argc, char **argv) {
 			break;
 
 		case 'n':
-			if (ARGCMP("ignore")) {
+			if (!strcmp(isc_commandline_argument, "ignore")) {
 				zone_options &= ~(DNS_ZONEOPT_CHECKNS|
 						  DNS_ZONEOPT_FATALNS);
-			} else if (ARGCMP("warn")) {
+			} else if (!strcmp(isc_commandline_argument, "warn")) {
 				zone_options |= DNS_ZONEOPT_CHECKNS;
 				zone_options &= ~DNS_ZONEOPT_FATALNS;
-			} else if (ARGCMP("fail")) {
+			} else if (!strcmp(isc_commandline_argument, "fail")) {
 				zone_options |= DNS_ZONEOPT_CHECKNS|
 					        DNS_ZONEOPT_FATALNS;
 			} else {
@@ -234,13 +237,15 @@ main(int argc, char **argv) {
 			break;
 
 		case 'm':
-			if (ARGCMP("warn")) {
+			if (!strcmp(isc_commandline_argument, "warn")) {
 				zone_options |= DNS_ZONEOPT_CHECKMX;
 				zone_options &= ~DNS_ZONEOPT_CHECKMXFAIL;
-			} else if (ARGCMP("fail")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "fail")) {
 				zone_options |= DNS_ZONEOPT_CHECKMX |
 						DNS_ZONEOPT_CHECKMXFAIL;
-			} else if (ARGCMP("ignore")) {
+			} else if (!strcmp(isc_commandline_argument,
+					   "ignore")) {
 				zone_options &= ~(DNS_ZONEOPT_CHECKMX |
 						  DNS_ZONEOPT_CHECKMXFAIL);
 			} else {
@@ -271,9 +276,10 @@ main(int argc, char **argv) {
 			break;
 
 		case 's':
-			if (ARGCMP("full"))
+			if (strcmp(isc_commandline_argument, "full") == 0)
 				outputstyle = &dns_master_style_full;
-			else if (ARGCMP("default")) {
+			else if (strcmp(isc_commandline_argument,
+					"default") == 0) {
 				outputstyle = &dns_master_style_default;
 			} else {
 				fprintf(stderr,
@@ -299,44 +305,10 @@ main(int argc, char **argv) {
 			dumpzone++;
 			break;
 
-		case 'M':
-			if (ARGCMP("fail")) {
-				zone_options &= ~DNS_ZONEOPT_WARNMXCNAME;
-				zone_options &= ~DNS_ZONEOPT_IGNOREMXCNAME;
-			} else if (ARGCMP("warn")) {
-				zone_options |= DNS_ZONEOPT_WARNMXCNAME;
-				zone_options &= ~DNS_ZONEOPT_IGNOREMXCNAME;
-			} else if (ARGCMP("ignore")) {
-				zone_options |= DNS_ZONEOPT_WARNMXCNAME;
-				zone_options |= DNS_ZONEOPT_IGNOREMXCNAME;
-			} else {
-				fprintf(stderr, "invalid argument to -M: %s\n",
-					isc_commandline_argument);
-				exit(1);
-			}
-			break;
-
-		case 'S':
-			if (ARGCMP("fail")) {
-				zone_options &= ~DNS_ZONEOPT_WARNSRVCNAME;
-				zone_options &= ~DNS_ZONEOPT_IGNORESRVCNAME;
-			} else if (ARGCMP("warn")) {
-				zone_options |= DNS_ZONEOPT_WARNSRVCNAME;
-				zone_options &= ~DNS_ZONEOPT_IGNORESRVCNAME;
-			} else if (ARGCMP("ignore")) {
-				zone_options |= DNS_ZONEOPT_WARNSRVCNAME;
-				zone_options |= DNS_ZONEOPT_IGNORESRVCNAME;
-			} else {
-				fprintf(stderr, "invalid argument to -S: %s\n",
-					isc_commandline_argument);
-				exit(1);
-			}
-			break;
-
 		case 'W':
-			if (ARGCMP("warn"))
+			if (!strcmp(isc_commandline_argument, "warn"))
 				zone_options |= DNS_ZONEOPT_CHECKWILDCARD;
-			else if (ARGCMP("ignore"))
+			else if (!strcmp(isc_commandline_argument, "ignore"))
 				zone_options &= ~DNS_ZONEOPT_CHECKWILDCARD;
 			break;
 

bin/check/named-checkzone.docbook

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.25 2006/01/07 00:23:35 marka Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.11.18.11 2005/08/25 00:05:41 marka Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
@@ -34,7 +34,6 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
-      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -64,11 +63,9 @@
       <arg><option>-i <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-k <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-m <replaceable class="parameter">mode</replaceable></option></arg>
-      <arg><option>-M <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-n <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-o <replaceable class="parameter">filename</replaceable></option></arg>
       <arg><option>-s <replaceable class="parameter">style</replaceable></option></arg>
-      <arg><option>-S <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg>
       <arg><option>-w <replaceable class="parameter">directory</replaceable></option></arg>
       <arg><option>-D</option></arg>
@@ -83,7 +80,6 @@
       <arg><option>-q</option></arg>
       <arg><option>-v</option></arg>
       <arg><option>-c <replaceable class="parameter">class</replaceable></option></arg>
-      <arg><option>-C <replaceable class="parameter">mode</replaceable></option></arg>
       <arg><option>-f <replaceable class="parameter">format</replaceable></option></arg>
       <arg><option>-F <replaceable class="parameter">format</replaceable></option></arg>
       <arg><option>-i <replaceable class="parameter">mode</replaceable></option></arg>
@@ -268,18 +264,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>-M <replaceable class="parameter">mode</replaceable></term>
-        <listitem>
-	  <para>
-	    Check if a MX record refers to a CNAME.
-            Possible modes are <command>"fail"</command>,
-            <command>"warn"</command> (default) and
-            <command>"ignore"</command>.
-	  </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>-n <replaceable class="parameter">mode</replaceable></term>
         <listitem>
@@ -325,18 +309,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>-S <replaceable class="parameter">mode</replaceable></term>
-        <listitem>
-	  <para>
-	    Check if a SRV record refers to a CNAME.
-            Possible modes are <command>"fail"</command>,
-            <command>"warn"</command> (default) and
-            <command>"ignore"</command>.
-	  </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>-t <replaceable class="parameter">directory</replaceable></term>
         <listitem>

bin/check/named-checkzone.html

@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002 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-checkzone.html,v 1.31 2006/01/07 03:34:55 marka Exp $ -->
+<!-- $Id: named-checkzone.html,v 1.11.18.18 2005/10/13 02:52:58 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -29,11 +29,11 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<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">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-M <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">-s <em class="replaceable"><code>style</code></em></code>] [<code class="option">-S <em class="replaceable"><code>mode</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>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div>
-<div class="cmdsynopsis"><p><code class="command">named-compilezone</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">-C <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <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">-s <em class="replaceable"><code>style</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>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div>
+<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">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <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">-s <em class="replaceable"><code>style</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>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div>
+<div class="cmdsynopsis"><p><code class="command">named-compilezone</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">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <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">-s <em class="replaceable"><code>style</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>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {zonename} {filename}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526157"></a><h2>DESCRIPTION</h2>
+<a name="id2526129"></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> does when loading a
@@ -53,7 +53,7 @@
      </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526193"></a><h2>OPTIONS</h2>
+<a name="id2526164"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-d</span></dt>
 <dd><p>
@@ -149,13 +149,6 @@
             <span><strong class="command">"warn"</strong></span> (default) and
             <span><strong class="command">"ignore"</strong></span>.
           </p></dd>
-<dt><span class="term">-M <em class="replaceable"><code>mode</code></em></span></dt>
-<dd><p>
-	    Check if a MX record refers to a CNAME.
-            Possible modes are <span><strong class="command">"fail"</strong></span>,
-            <span><strong class="command">"warn"</strong></span> (default) and
-            <span><strong class="command">"ignore"</strong></span>.
-	  </p></dd>
 <dt><span class="term">-n <em class="replaceable"><code>mode</code></em></span></dt>
 <dd><p>
             Specify whether NS records should be checked to see if they
@@ -186,13 +179,6 @@
 	    It also does not have any meaning if the output format
 	    is not text.
 	  </p></dd>
-<dt><span class="term">-S <em class="replaceable"><code>mode</code></em></span></dt>
-<dd><p>
-	    Check if a SRV record refers to a CNAME.
-            Possible modes are <span><strong class="command">"fail"</strong></span>,
-            <span><strong class="command">"warn"</strong></span> (default) and
-            <span><strong class="command">"ignore"</strong></span>.
-	  </p></dd>
 <dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
 <dd><p>
             chroot to <code class="filename">directory</code> so that
@@ -233,21 +219,21 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526792"></a><h2>RETURN VALUES</h2>
+<a name="id2526710"></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="id2526804"></a><h2>SEE ALSO</h2>
+<a name="id2526722"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <em class="citetitle">RFC 1035</em>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526828"></a><h2>AUTHOR</h2>
+<a name="id2526746"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>

bin/dig/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.39 2005/09/09 14:11:37 marka Exp $
+# $Id: Makefile.in,v 1.33.18.6 2005/09/09 14:11:04 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

bin/dig/dig.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-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: dig.1,v 1.38 2006/01/28 02:15:53 marka Exp $
+.\" $Id: dig.1,v 1.23.18.13 2005/10/26 06:02:01 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -30,7 +30,7 @@
 dig \- DNS lookup utility
 .SH "SYNOPSIS"
 .HP 4
-\fBdig\fR [@server] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-k\ \fR\fB\fIfilename\fR\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIname:key\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [name] [type] [class] [queryopt...]
+\fBdig\fR [@server] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-k\ \fR\fB\fIfilename\fR\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [\fB\-y\ \fR\fB\fIname:key\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [name] [type] [class] [queryopt...]
 .HP 4
 \fBdig\fR [\fB\-h\fR]
 .HP 4
@@ -180,8 +180,6 @@ and their responses using transaction signatures (TSIG), specify a TSIG key file
 option. You can also specify the TSIG key itself on the command line using the
 \fB\-y\fR
 option;
-\fIhmac\fR
-is the type of the TSIG, default HMAC\-MD5,
 \fIname\fR
 is the name of the TSIG key and
 \fIkey\fR

bin/dig/dig.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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: dig.c,v 1.211 2006/01/27 02:35:14 marka Exp $ */
+/* $Id: dig.c,v 1.186.18.21 2005/10/14 01:28:19 marka Exp $ */
 
 /*! \file */
 
@@ -42,7 +42,6 @@
 #include <dns/rdatatype.h>
 #include <dns/rdataclass.h>
 #include <dns/result.h>
-#include <dns/tsig.h>
 
 #include <bind9/getaddresses.h>
 
@@ -153,7 +152,7 @@ help(void) {
 "                 -t type             (specify query type)\n"
 "                 -c class            (specify query class)\n"
 "                 -k keyfile          (specify tsig key file)\n"
-"                 -y [hmac:]name:key  (specify named base64 tsig key)\n"
+"                 -y name:key         (specify named base64 tsig key)\n"
 "                 -4                  (use IPv4 query transport only)\n"
 "                 -6                  (use IPv6 query transport only)\n"
 "        d-opt    is of the form +keyword[=value], where keyword is:\n"
@@ -492,8 +491,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 			       msg->counts[DNS_SECTION_AUTHORITY],
 			       msg->counts[DNS_SECTION_ADDITIONAL]);
 
-			if (msg != query->lookup->sendmsg &&
-			    (msg->flags & DNS_MESSAGEFLAG_RD) != 0 &&
+			if ((msg->flags & DNS_MESSAGEFLAG_RD) != 0 &&
 			    (msg->flags & DNS_MESSAGEFLAG_RA) == 0)
 				printf(";; WARNING: recusion requested "
 				       "but not available\n");
@@ -1106,7 +1104,7 @@ static isc_boolean_t
 dash_option(char *option, char *next, dig_lookup_t **lookup,
 	    isc_boolean_t *open_type_class, isc_boolean_t config_only)
 {
-	char opt, *value, *ptr, *ptr2, *ptr3;
+	char opt, *value, *ptr;
 	isc_result_t result;
 	isc_boolean_t value_from_next;
 	isc_textregion_t tr;
@@ -1296,83 +1294,16 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
 				 value);
 		return (value_from_next);
 	case 'y':
-		ptr = next_token(&value,":");	/* hmac type or name */
+		ptr = next_token(&value,":");
 		if (ptr == NULL) {
 			usage();
 		}
-		ptr2 = next_token(&value, ":");	/* name or secret */
-		if (ptr2 == NULL)
-			usage();
-		ptr3 = next_token(&value,":"); /* secret or NULL */
-		if (ptr3 != NULL) {	
-			if (strcasecmp(ptr, "hmac-md5") == 0) {
-				hmacname = DNS_TSIG_HMACMD5_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-md5-", 9) == 0) {
-				hmacname = DNS_TSIG_HMACMD5_NAME;
-				digestbits = parse_uint(&ptr[9],
-							"digest-bits [0..128]",
-							128);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else if (strcasecmp(ptr, "hmac-sha1") == 0) {
-				hmacname = DNS_TSIG_HMACSHA1_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-sha1-", 10) == 0) {
-				hmacname = DNS_TSIG_HMACSHA1_NAME;
-				digestbits = parse_uint(&ptr[10],
-							"digest-bits [0..160]",
-							160);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else if (strcasecmp(ptr, "hmac-sha224") == 0) {
-				hmacname = DNS_TSIG_HMACSHA224_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-sha224-", 12) == 0) {
-				hmacname = DNS_TSIG_HMACSHA224_NAME;
-				digestbits = parse_uint(&ptr[12],
-							"digest-bits [0..224]",
-							224);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else if (strcasecmp(ptr, "hmac-sha256") == 0) {
-				hmacname = DNS_TSIG_HMACSHA256_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-sha256-", 12) == 0) {
-				hmacname = DNS_TSIG_HMACSHA256_NAME;
-				digestbits = parse_uint(&ptr[12],
-							"digest-bits [0..256]",
-							256);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else if (strcasecmp(ptr, "hmac-sha384") == 0) {
-				hmacname = DNS_TSIG_HMACSHA384_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-sha384-", 12) == 0) {
-				hmacname = DNS_TSIG_HMACSHA384_NAME;
-				digestbits = parse_uint(&ptr[12],
-							"digest-bits [0..384]",
-							384);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else if (strcasecmp(ptr, "hmac-sha512") == 0) {
-				hmacname = DNS_TSIG_HMACSHA512_NAME;
-				digestbits = 0;
-			} else if (strncasecmp(ptr, "hmac-sha512-", 12) == 0) {
-				hmacname = DNS_TSIG_HMACSHA512_NAME;
-				digestbits = parse_uint(&ptr[12],
-							"digest-bits [0..512]",
-							512);
-				digestbits = (digestbits + 7) & ~0x7U;
-			} else {
-				fprintf(stderr, ";; Warning, ignoring "
-					"invalid TSIG algorithm %s\n", ptr);
-				return (value_from_next);
-			}
-			ptr = ptr2;
-			ptr2 = ptr3;
-		} else  {
-			hmacname = DNS_TSIG_HMACMD5_NAME;
-			digestbits = 0;
-		}
 		strncpy(keynametext, ptr, sizeof(keynametext));
 		keynametext[sizeof(keynametext)-1]=0;
-		strncpy(keysecret, ptr2, sizeof(keysecret));
+		ptr = next_token(&value, "");
+		if (ptr == NULL)
+			usage();
+		strncpy(keysecret, ptr, sizeof(keysecret));
 		keysecret[sizeof(keysecret)-1]=0;
 		return (value_from_next);
 	case 'x':

bin/dig/dig.docbook

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005  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.
 -->
 
-<!-- $Id: dig.docbook,v 1.30 2006/01/27 23:57:46 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.17.18.11 2005/10/26 04:57:21 marka Exp $ -->
 <refentry id="man.dig">
 
   <refentryinfo>
@@ -40,7 +40,6 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
-      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
@@ -64,7 +63,7 @@
       <arg><option>-q <replaceable class="parameter">name</replaceable></option></arg>
       <arg><option>-t <replaceable class="parameter">type</replaceable></option></arg>
       <arg><option>-x <replaceable class="parameter">addr</replaceable></option></arg>
-      <arg><option>-y <replaceable class="parameter"><optional>hmac:</optional>name:key</replaceable></option></arg>
+      <arg><option>-y <replaceable class="parameter">name:key</replaceable></option></arg>
       <arg><option>-4</option></arg>
       <arg><option>-6</option></arg>
       <arg choice="opt">name</arg>
@@ -282,7 +281,6 @@
       responses using transaction signatures (TSIG), specify a TSIG key file
       using the <option>-k</option> option.  You can also specify the TSIG
       key itself on the command line using the <option>-y</option> option;
-      <parameter>hmac</parameter> is the type of the TSIG, default HMAC-MD5,
       <parameter>name</parameter> is the name of the TSIG key and
       <parameter>key</parameter> is the actual key.  The key is a
       base-64

bin/dig/dig.html

@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005 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: dig.html,v 1.32 2006/01/28 02:15:53 marka Exp $ -->
+<!-- $Id: dig.html,v 1.13.18.17 2005/10/26 06:02:01 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -29,12 +29,12 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">dig</code>  [@server] [<code class="option">-b <em class="replaceable"><code>address</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-k <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port#</code></em></code>] [<code class="option">-q <em class="replaceable"><code>name</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-x <em class="replaceable"><code>addr</code></em></code>] [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]name:key</code></em></code>] [<code class="option">-4</code>] [<code class="option">-6</code>] [name] [type] [class] [queryopt...]</p></div>
+<div class="cmdsynopsis"><p><code class="command">dig</code>  [@server] [<code class="option">-b <em class="replaceable"><code>address</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-k <em class="replaceable"><code>filename</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port#</code></em></code>] [<code class="option">-q <em class="replaceable"><code>name</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-x <em class="replaceable"><code>addr</code></em></code>] [<code class="option">-y <em class="replaceable"><code>name:key</code></em></code>] [<code class="option">-4</code>] [<code class="option">-6</code>] [name] [type] [class] [queryopt...]</p></div>
 <div class="cmdsynopsis"><p><code class="command">dig</code>  [<code class="option">-h</code>]</p></div>
 <div class="cmdsynopsis"><p><code class="command">dig</code>  [global-queryopt...] [query...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526001"></a><h2>DESCRIPTION</h2>
+<a name="id2525995"></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
@@ -73,7 +73,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526056"></a><h2>SIMPLE USAGE</h2>
+<a name="id2526051"></a><h2>SIMPLE USAGE</h2>
 <p>
       A typical invocation of <span><strong class="command">dig</strong></span> looks like:
       </p>
@@ -119,7 +119,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526215"></a><h2>OPTIONS</h2>
+<a name="id2526210"></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
@@ -200,7 +200,6 @@
       responses using transaction signatures (TSIG), specify a TSIG key file
       using the <code class="option">-k</code> option.  You can also specify the TSIG
       key itself on the command line using the <code class="option">-y</code> option;
-      <em class="parameter"><code>hmac</code></em> is the type of the TSIG, default HMAC-MD5,
       <em class="parameter"><code>name</code></em> is the name of the TSIG key and
       <em class="parameter"><code>key</code></em> is the actual key.  The key is a
       base-64
@@ -219,7 +218,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526418"></a><h2>QUERY OPTIONS</h2>
+<a name="id2526408"></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
@@ -538,7 +537,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527675"></a><h2>MULTIPLE QUERIES</h2>
+<a name="id2527734"></a><h2>MULTIPLE QUERIES</h2>
 <p>
       The BIND 9 implementation of <span><strong class="command">dig </strong></span>
       supports
@@ -584,7 +583,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527737"></a><h2>IDN SUPPORT</h2>
+<a name="id2527796"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class="command">dig</strong></span> has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names.
@@ -598,14 +597,14 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527760"></a><h2>FILES</h2>
+<a name="id2527818"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 <p><code class="filename">${HOME}/.digrc</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527777"></a><h2>SEE ALSO</h2>
+<a name="id2527835"></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>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
@@ -613,7 +612,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527814"></a><h2>BUGS</h2>
+<a name="id2527873"></a><h2>BUGS</h2>
 <p>
       There are probably too many query options.
     </p>

bin/dig/dighost.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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: dighost.c,v 1.292 2006/02/17 00:10:42 marka Exp $ */
+/* $Id: dighost.c,v 1.259.18.28 2005/10/14 01:28:19 marka Exp $ */
 
 /*! \file
  *  \note
@@ -161,8 +161,6 @@ int fatalexit = 0;
 char keynametext[MXNAME];
 char keyfile[MXNAME] = "";
 char keysecret[MXNAME] = "";
-dns_name_t *hmacname = NULL;
-unsigned int digestbits = 0;
 isc_buffer_t *namebuf = NULL;
 dns_tsigkey_t *key = NULL;
 isc_boolean_t validated = ISC_TRUE;
@@ -892,15 +890,14 @@ setup_text_key(void) {
 	if (result != ISC_R_SUCCESS)
 		goto failure;
 
-	result = dns_tsigkey_create(&keyname, hmacname, secretstore,
-				    secretsize, ISC_FALSE, NULL, 0, 0, mctx,
+	result = dns_tsigkey_create(&keyname, dns_tsig_hmacmd5_name,
+				    secretstore, secretsize,
+				    ISC_FALSE, NULL, 0, 0, mctx,
 				    NULL, &key);
  failure:
 	if (result != ISC_R_SUCCESS)
 		printf(";; Couldn't create key %s: %s\n",
 		       keynametext, isc_result_totext(result));
-	else
-		dst_key_setbits(key->key, digestbits);
 
 	isc_mem_free(mctx, secretstore);
 	dns_name_invalidate(&keyname);
@@ -921,31 +918,8 @@ setup_file_key(void) {
 		goto failure;
 	}
 
-	switch (dst_key_alg(dstkey)) {
-	case DST_ALG_HMACMD5:
-		hmacname = DNS_TSIG_HMACMD5_NAME;
-		break;
-	case DST_ALG_HMACSHA1:
-		hmacname = DNS_TSIG_HMACSHA1_NAME;
-		break;
-	case DST_ALG_HMACSHA224:
-		hmacname = DNS_TSIG_HMACSHA224_NAME;
-		break;
-	case DST_ALG_HMACSHA256:
-		hmacname = DNS_TSIG_HMACSHA256_NAME;
-		break;
-	case DST_ALG_HMACSHA384:
-		hmacname = DNS_TSIG_HMACSHA384_NAME;
-		break;
-	case DST_ALG_HMACSHA512:
-		hmacname = DNS_TSIG_HMACSHA512_NAME;
-		break;
-	default:
-		printf(";; Couldn't create key %s: bad algorithm\n",
-		       keynametext);
-		goto failure;
-	}
-	result = dns_tsigkey_createfromkey(dst_key_name(dstkey), hmacname,
+	result = dns_tsigkey_createfromkey(dst_key_name(dstkey),
+					   dns_tsig_hmacmd5_name,
 					   dstkey, ISC_FALSE, NULL, 0, 0,
 					   mctx, NULL, &key);
 	if (result != ISC_R_SUCCESS) {
@@ -1946,7 +1920,7 @@ setup_lookup(dig_lookup_t *lookup) {
 	check_result(result, "dns_message_renderbegin");
 	if (lookup->udpsize > 0 || lookup->dnssec || lookup->edns > -1) {
 		if (lookup->udpsize == 0)
-			lookup->udpsize = 4096;
+			lookup->udpsize = 2048;
 		if (lookup->edns < 0)
 			lookup->edns = 0;
 		add_opt(lookup->sendmsg, lookup->udpsize,
@@ -2825,9 +2799,6 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 			       "(< header size) message received\n");
 	}
 
-	if (result == ISC_R_SUCCESS && (msgflags & DNS_MESSAGEFLAG_QR) == 0)
-		printf(";; Warning: query response not set\n");
-
 	if (!match) {
 		isc_buffer_invalidate(&query->recvbuf);
 		isc_buffer_init(&query->recvbuf, query->recvspace, COMMSIZE);

bin/dig/host.1

@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: host.1,v 1.24 2005/10/13 03:13:56 marka Exp $
+.\" $Id: host.1,v 1.14.18.10 2005/10/13 02:52:59 marka Exp $
 .\"
 .hy 0
 .ad l

bin/dig/host.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.108 2006/03/02 23:48:50 marka Exp $ */
+/* $Id: host.c,v 1.94.18.11 2005/08/25 00:43:25 marka Exp $ */
 
 /*! \file */
 
@@ -39,7 +39,6 @@
 #include <dns/rdataclass.h>
 #include <dns/rdataset.h>
 #include <dns/rdatatype.h>
-#include <dns/rdatastruct.h>
 
 #include <dig/dig.h>
 
@@ -356,32 +355,6 @@ 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;
@@ -420,15 +393,10 @@ 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_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));
+
+		dns_name_format(query->lookup->name, namestr, sizeof(namestr));
 		lookup = clone_lookup(query->lookup, ISC_FALSE);
 		if (lookup != NULL) {
 			strncpy(lookup->textname, namestr,

bin/dig/host.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: host.docbook,v 1.12 2005/09/09 06:13:59 marka Exp $ -->
+<!-- $Id: host.docbook,v 1.5.18.7 2005/09/09 06:22:06 marka Exp $ -->
 <refentry id="man.host">
 
   <refentryinfo>

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.21 2005/10/13 03:13:57 marka Exp $ -->
+<!-- $Id: host.html,v 1.7.18.14 2005/10/13 02:52:59 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/dig/include/dig/dig.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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: dig.h,v 1.98 2006/01/27 23:57:46 marka Exp $ */
+/* $Id: dig.h,v 1.82.18.14 2005/08/25 00:43:26 marka Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -257,8 +257,6 @@ extern isc_sockaddr_t bind_address;
 extern char keynametext[MXNAME];
 extern char keyfile[MXNAME];
 extern char keysecret[MXNAME];
-extern dns_name_t *hmacname;
-extern unsigned int digestbits;
 #ifdef DIG_SIGCHASE
 extern char trustedkey[MXNAME];
 #endif

bin/dig/nslookup.1

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005 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.8 2006/01/06 01:55:38 marka Exp $
+.\" $Id: nslookup.1,v 1.1.10.7 2005/10/13 02:52:59 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 type of the information query.
+Change the top of the information query.
 .sp
 (Default = A; abbreviations = q, ty)
 .TP

bin/dig/nslookup.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.111 2005/08/25 00:40:50 marka Exp $ */
+/* $Id: nslookup.c,v 1.101.18.9 2005/08/25 00:43:25 marka Exp $ */
 
 #include <config.h>
 

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-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005  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.10 2006/01/06 00:01:44 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.4.2.5 2005/08/25 00:33:36 marka Exp $ -->
 <!--
  - Copyright (c) 1985, 1989
  -    The Regents of the University of California.  All rights reserved.
@@ -71,7 +71,6 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
-      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -386,7 +385,7 @@ nslookup -query=hinfo  -timeout=10
                 <term><constant>type=</constant><replaceable>value</replaceable></term>
                 <listitem>
                   <para>
-                    Change the type of the information query.
+                    Change the top of the information query.
                   </para>
 		  <para>
                     (Default = A; abbreviations = q, ty)

bin/dig/nslookup.html

@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005 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.13 2006/01/06 01:55:38 marka Exp $ -->
+<!-- $Id: nslookup.html,v 1.1.10.12 2005/10/13 02:52:59 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -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="id2525985"></a><h2>DESCRIPTION</h2>
+<a name="id2525981"></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>
       has two modes: interactive and non-interactive.  Interactive mode allows
@@ -43,7 +43,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526001"></a><h2>ARGUMENTS</h2>
+<a name="id2525997"></a><h2>ARGUMENTS</h2>
 <p>
       Interactive mode is entered in the following cases:
       </p>
@@ -76,7 +76,7 @@ nslookup -query=hinfo  -timeout=10
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526042"></a><h2>INTERACTIVE COMMANDS</h2>
+<a name="id2526039"></a><h2>INTERACTIVE COMMANDS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">host [<span class="optional">server</span>]</span></dt>
 <dd>
@@ -231,7 +231,7 @@ nslookup -query=hinfo  -timeout=10
 <dt><span class="term"><code class="constant">type=</code><em class="replaceable"><code>value</code></em></span></dt>
 <dd>
 <p>
-                    Change the type of the information query.
+                    Change the top of the information query.
                   </p>
 <p>
                     (Default = A; abbreviations = q, ty)
@@ -288,19 +288,19 @@ nslookup -query=hinfo  -timeout=10
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2528906"></a><h2>FILES</h2>
+<a name="id2528835"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2528918"></a><h2>SEE ALSO</h2>
+<a name="id2528846"></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>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2528952"></a><h2>Author</h2>
+<a name="id2528881"></a><h2>Author</h2>
 <p>
       Andrew Cherenson
     </p>

bin/dnssec/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.30 2005/05/02 00:26:28 marka Exp $
+# $Id: Makefile.in,v 1.26.18.4 2005/05/02 00:26:11 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

bin/dnssec/dnssec-keygen.8

@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-keygen.8,v 1.33 2005/10/13 03:13:57 marka Exp $
+.\" $Id: dnssec-keygen.8,v 1.23.18.10 2005/10/13 02:53:00 marka Exp $
 .\"
 .hy 0
 .ad l

bin/dnssec/dnssec-keygen.c

@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000-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-keygen.c,v 1.73 2006/01/27 02:35:14 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.66.18.4 2005/09/18 07:58:05 marka Exp $ */
 
 /*! \file */
 
@@ -49,9 +49,7 @@
 const char *program = "dnssec-keygen";
 int verbose;
 
-static const char *algs = "RSA | RSAMD5 | DH | DSA | RSASHA1 | HMAC-MD5 |"
-			  " HMAC-SHA1 | HMAC-SHA224 | HMAC-SHA256 | "
-			  " HMAC-SHA384 | HMAC-SHA512";
+static const char *algs = "RSA | RSAMD5 | DH | DSA | RSASHA1 | HMAC-MD5";
 
 static isc_boolean_t
 dsa_size_ok(int size) {
@@ -72,16 +70,10 @@ usage(void) {
 	fprintf(stderr, "        DH:\t\t[128..4096]\n");
 	fprintf(stderr, "        DSA:\t\t[512..1024] and divisible by 64\n");
 	fprintf(stderr, "        HMAC-MD5:\t[1..512]\n");
-	fprintf(stderr, "        HMAC-SHA1:\t[1..160]\n");
-	fprintf(stderr, "        HMAC-SHA224:\t[1..224]\n");
-	fprintf(stderr, "        HMAC-SHA256:\t[1..256]\n");
-	fprintf(stderr, "        HMAC-SHA384:\t[1..384]\n");
-	fprintf(stderr, "        HMAC-SHA512:\t[1..512]\n");
 	fprintf(stderr, "    -n nametype: ZONE | HOST | ENTITY | USER | OTHER\n");
 	fprintf(stderr, "    name: owner of the key\n");
 	fprintf(stderr, "Other options:\n");
 	fprintf(stderr, "    -c <class> (default: IN)\n");
-	fprintf(stderr, "    -d <digest bits> (0 => max, default)\n");
 	fprintf(stderr, "    -e use large exponent (RSAMD5/RSASHA1 only)\n");
 	fprintf(stderr, "    -f keyflag: KSK\n");
 	fprintf(stderr, "    -g <generator> use specified generator "
@@ -125,7 +117,6 @@ main(int argc, char **argv) {
 	isc_entropy_t	*ectx = NULL;
 	dns_rdataclass_t rdclass;
 	int		options = DST_TYPE_PRIVATE | DST_TYPE_PUBLIC;
-	int		dbits = 0;
 
 	if (argc == 1)
 		usage();
@@ -135,7 +126,7 @@ main(int argc, char **argv) {
 	dns_result_register();
 
 	while ((ch = isc_commandline_parse(argc, argv,
-					   "a:b:c:d:ef:g:kn:t:p:s:r:v:h")) != -1)
+					   "a:b:c:ef:g:kn:t:p:s:r:v:h")) != -1)
 	{
 	    switch (ch) {
 		case 'a':
@@ -149,11 +140,6 @@ main(int argc, char **argv) {
 		case 'c':
 			classname = isc_commandline_argument;
 			break;
-		case 'd':
-			dbits = strtol(isc_commandline_argument, &endp, 10);
-			if (*endp != '\0' || dbits < 0)
-				fatal("-d requires a non-negative number");
-			break;
 		case 'e':
 			rsa_exp = 1;
 			break;
@@ -227,29 +213,9 @@ main(int argc, char **argv) {
 
 	if (algname == NULL)
 		fatal("no algorithm was specified");
-	if (strcasecmp(algname, "RSA") == 0) {
-		fprintf(stderr, "The use of RSA (RSAMD5) is not recommended.\n"
-				"If you still wish to use RSA (RSAMD5) please "
-				"specify \"-a RSAMD5\"\n");
-		return (1);
-	} else if (strcasecmp(algname, "HMAC-MD5") == 0) {
+	if (strcasecmp(algname, "HMAC-MD5") == 0) {
 		options |= DST_TYPE_KEY;
 		alg = DST_ALG_HMACMD5;
-	} else if (strcasecmp(algname, "HMAC-SHA1") == 0) {
-		options |= DST_TYPE_KEY;
-		alg = DST_ALG_HMACSHA1;
-	} else if (strcasecmp(algname, "HMAC-SHA224") == 0) {
-		options |= DST_TYPE_KEY;
-		alg = DST_ALG_HMACSHA224;
-	} else if (strcasecmp(algname, "HMAC-SHA256") == 0) {
-		options |= DST_TYPE_KEY;
-		alg = DST_ALG_HMACSHA256;
-	} else if (strcasecmp(algname, "HMAC-SHA384") == 0) {
-		options |= DST_TYPE_KEY;
-		alg = DST_ALG_HMACSHA384;
-	} else if (strcasecmp(algname, "HMAC-SHA512") == 0) {
-		options |= DST_TYPE_KEY;
-		alg = DST_ALG_HMACSHA512;
 	} else {
 		r.base = algname;
 		r.length = strlen(algname);
@@ -296,56 +262,6 @@ main(int argc, char **argv) {
 	case DST_ALG_HMACMD5:
 		if (size < 1 || size > 512)
 			fatal("HMAC-MD5 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 80 || dbits > 128))
-			fatal("HMAC-MD5 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-MD5 digest bits %d not divisible by 8",
-			      dbits);
-		break;
-	case DST_ALG_HMACSHA1:
-		if (size < 1 || size > 160)
-			fatal("HMAC-SHA1 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 80 || dbits > 160))
-			fatal("HMAC-SHA1 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-SHA1 digest bits %d not divisible by 8",
-			      dbits);
-		break;
-	case DST_ALG_HMACSHA224:
-		if (size < 1 || size > 224)
-			fatal("HMAC-SHA224 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 112 || dbits > 224))
-			fatal("HMAC-SHA224 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-SHA224 digest bits %d not divisible by 8",
-			      dbits);
-		break;
-	case DST_ALG_HMACSHA256:
-		if (size < 1 || size > 256)
-			fatal("HMAC-SHA256 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 128 || dbits > 256))
-			fatal("HMAC-SHA256 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-SHA256 digest bits %d not divisible by 8",
-			      dbits);
-		break;
-	case DST_ALG_HMACSHA384:
-		if (size < 1 || size > 384)
-			fatal("HMAC-384 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 192 || dbits > 384))
-			fatal("HMAC-SHA384 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-SHA384 digest bits %d not divisible by 8",
-			      dbits);
-		break;
-	case DST_ALG_HMACSHA512:
-		if (size < 1 || size > 512)
-			fatal("HMAC-SHA512 key size %d out of range", size);
-		if (dbits != 0 && (dbits < 256 || dbits > 512))
-			fatal("HMAC-SHA512 digest bits %d out of range", dbits);
-		if ((dbits % 8) != 0)
-			fatal("HMAC-SHA512 digest bits %d not divisible by 8",
-			      dbits);
 		break;
 	}
 
@@ -392,10 +308,7 @@ main(int argc, char **argv) {
 	}
 
 	if ((flags & DNS_KEYFLAG_OWNERMASK) == DNS_KEYOWNER_ZONE &&
-	    (alg == DNS_KEYALG_DH || alg == DST_ALG_HMACMD5 ||
-	     alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 ||
-	     alg == DST_ALG_HMACSHA256 || alg == DST_ALG_HMACSHA384 ||
-	     alg == DST_ALG_HMACSHA512))
+	    (alg == DNS_KEYALG_DH || alg == DST_ALG_HMACMD5))
 		fatal("a key with algorithm '%s' cannot be a zone key",
 		      algname);
 
@@ -419,11 +332,6 @@ main(int argc, char **argv) {
 		break;
 	case DNS_KEYALG_DSA:
 	case DST_ALG_HMACMD5:
-	case DST_ALG_HMACSHA1:
-	case DST_ALG_HMACSHA224:
-	case DST_ALG_HMACSHA256:
-	case DST_ALG_HMACSHA384:
-	case DST_ALG_HMACSHA512:
 		param = 0;
 		break;
 	}
@@ -452,8 +360,6 @@ main(int argc, char **argv) {
 			exit(-1);
 		}
 
-		dst_key_setbits(key, dbits);
-
 		/*
 		 * Try to read a key with the same name, alg and id from disk.
 		 * If there is one we must continue generating a new one

bin/dnssec/dnssec-keygen.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keygen.docbook,v 1.14 2005/08/30 01:50:05 marka Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.7.18.7 2005/08/30 01:42:12 marka Exp $ -->
 <refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>

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.23 2005/10/13 03:13:57 marka Exp $ -->
+<!-- $Id: dnssec-keygen.html,v 1.9.18.14 2005/10/13 02:53:00 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/dnssec/dnssec-signzone.8

@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-signzone.8,v 1.40 2005/10/13 03:13:57 marka Exp $
+.\" $Id: dnssec-signzone.8,v 1.28.18.12 2005/10/13 02:53:00 marka Exp $
 .\"
 .hy 0
 .ad l

bin/dnssec/dnssec-signzone.c

@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005  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.197 2006/02/21 23:49:50 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.177.18.15 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 
@@ -632,16 +632,6 @@ loadds(dns_name_t *name, isc_uint32_t ttl, dns_rdataset_t *dsset) {
 					      ttl, &ds, &tuple);
 		check_result(result, "dns_difftuple_create");
 		dns_diff_append(&diff, &tuple);
-
-		dns_rdata_reset(&ds);
-		result = dns_ds_buildrdata(name, &key, DNS_DSDIGEST_SHA256,
-					   dsbuf, &ds);
-		check_result(result, "dns_ds_buildrdata");
-
-		result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD, name,
-					      ttl, &ds, &tuple);
-		check_result(result, "dns_difftuple_create");
-		dns_diff_append(&diff, &tuple);
 	}
 	result = dns_diff_apply(&diff, db, ver);
 	check_result(result, "dns_diff_apply");
@@ -1101,32 +1091,6 @@ postsign(void) {
 	dns_dbiterator_destroy(&gdbiter);
 }
 
-/*%
- * Sign the apex of the zone.
- */
-static void
-signapex(void) {
-	dns_dbnode_t *node = NULL;
-	dns_fixedname_t fixed;
-	dns_name_t *name;
-	isc_result_t result;
-	
-	dns_fixedname_init(&fixed);
-	name = dns_fixedname_name(&fixed);
-	result = dns_dbiterator_current(gdbiter, &node, name);
-	check_result(result, "dns_dbiterator_current()");
-	signname(node, name);
-	dumpnode(name, node);
-	cleannode(gdb, gversion, node);
-	dns_db_detachnode(gdb, &node);
-	result = dns_dbiterator_next(gdbiter);
-	if (result == ISC_R_NOMORE)
-		finished = ISC_TRUE;
-	else if (result != ISC_R_SUCCESS)
-		fatal("failure iterating database: %s",
-		      isc_result_totext(result));
-}
-
 /*%
  * Assigns a node to a worker thread.  This is protected by the master task's
  * lock.
@@ -1595,19 +1559,6 @@ writeset(const char *prefix, dns_rdatatype_t type) {
 				ds.type = dns_rdatatype_dlv;
 			result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
 						      name, 0, &ds, &tuple);
-			check_result(result, "dns_difftuple_create");
-			dns_diff_append(&diff, &tuple);
-
-			dns_rdata_reset(&ds);
-			result = dns_ds_buildrdata(gorigin, &rdata,
-						   DNS_DSDIGEST_SHA256,
-						   dsbuf, &ds);
-			check_result(result, "dns_ds_buildrdata");
-			if (type == dns_rdatatype_dlv)
-				ds.type = dns_rdatatype_dlv;
-			result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
-						      name, 0, &ds, &tuple);
-
 		} else
 			result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
 						      gorigin, zonettl,
@@ -2126,6 +2077,10 @@ main(int argc, char *argv[]) {
 		if (result != ISC_R_SUCCESS)
 			fatal("failed to create task: %s",
 			      isc_result_totext(result));
+		result = isc_app_onrun(mctx, master, startworker, tasks[i]);
+		if (result != ISC_R_SUCCESS)
+			fatal("failed to start task: %s",
+			      isc_result_totext(result));
 	}
 
 	RUNTIME_CHECK(isc_mutex_init(&namelock) == ISC_R_SUCCESS);
@@ -2133,24 +2088,9 @@ main(int argc, char *argv[]) {
 		RUNTIME_CHECK(isc_mutex_init(&statslock) == ISC_R_SUCCESS);
 
 	presign();
-	signapex();
-	if (!finished) {
-		/*
-		 * There is more work to do.  Spread it out over multiple
-		 * processors if possible.
-		 */
-		for (i = 0; i < (int)ntasks; i++) {
-			result = isc_app_onrun(mctx, master, startworker,
-					       tasks[i]);
-			if (result != ISC_R_SUCCESS)
-				fatal("failed to start task: %s",
-				      isc_result_totext(result));
-		}
-		(void)isc_app_run();
-		if (!finished)
-			fatal("process aborted by user");
-	} else
-		isc_task_detach(&master);
+	(void)isc_app_run();
+	if (!finished)
+		fatal("process aborted by user");
 	shuttingdown = ISC_TRUE;
 	for (i = 0; i < (int)ntasks; i++)
 		isc_task_detach(&tasks[i]);

bin/dnssec/dnssec-signzone.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-signzone.docbook,v 1.20 2005/07/19 04:55:20 marka Exp $ -->
+<!-- $Id: dnssec-signzone.docbook,v 1.10.18.10 2005/07/19 05:55:43 marka Exp $ -->
 <refentry id="man.dnssec-signzone">
   <refentryinfo>
     <date>June 30, 2000</date>

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.25 2005/10/13 03:13:57 marka Exp $ -->
+<!-- $Id: dnssec-signzone.html,v 1.8.18.17 2005/10/13 02:53:00 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/dnssec/dnssectool.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.c,v 1.43 2005/07/01 03:28:42 marka Exp $ */
+/* $Id: dnssectool.c,v 1.40.18.3 2005/07/01 03:55:28 marka Exp $ */
 
 /*! \file */
 

bin/named/Makefile.in

@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.87 2005/09/05 00:10:51 marka Exp $
+# $Id: Makefile.in,v 1.80.18.7 2005/09/05 00:18:10 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

bin/named/builtin.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.c,v 1.10 2005/08/23 04:07:57 marka Exp $ */
+/* $Id: builtin.c,v 1.5.18.5 2005/08/23 04:12:38 marka Exp $ */
 
 /*! \file
  * \brief

bin/named/client.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.235 2006/01/05 00:01:46 marka Exp $ */
+/* $Id: client.c,v 1.219.18.13 2005/10/16 23:29:38 marka Exp $ */
 
 #include <config.h>
 
@@ -34,13 +34,12 @@
 #include <dns/dispatch.h>
 #include <dns/events.h>
 #include <dns/message.h>
-#include <dns/peer.h>
 #include <dns/rcode.h>
+#include <dns/resolver.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>
-#include <dns/resolver.h>
 #include <dns/tsig.h>
 #include <dns/view.h>
 #include <dns/zone.h>
@@ -192,13 +191,6 @@ 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
-
 unsigned int ns_client_requests;
 
 static void client_read(ns_client_t *client);
@@ -1009,34 +1001,6 @@ 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;
@@ -1049,28 +1013,6 @@ 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
@@ -1355,17 +1297,6 @@ 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",
@@ -1706,19 +1637,6 @@ client_request(isc_task_t *task, isc_event_t *event) {
 		      ISC_LOG_DEBUG(3), ra ? "recursion available" :
 		      			     "recursion not available");
 
-	/*
-	 * Adjust maximum UDP response size for this client.
-	 */
-	if (client->udpsize > 512) {
-		dns_peer_t *peer = NULL;
-		isc_uint16_t udpsize = view->maxudp;
-		(void) dns_peerlist_peerbyaddr(view->peers, &netaddr, &peer);
-		if (peer != NULL)
-			dns_peer_getmaxudp(peer, &udpsize);
-		if (client->udpsize > udpsize)
-			client->udpsize = udpsize;
-	}
-
 	/*
 	 * Dispatch the request.
 	 */

bin/named/config.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.72 2006/03/09 03:30:18 marka Exp $ */
+/* $Id: config.c,v 1.47.18.16 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 
@@ -27,7 +27,6 @@
 #include <isc/buffer.h>
 #include <isc/log.h>
 #include <isc/mem.h>
-#include <isc/parseint.h>
 #include <isc/region.h>
 #include <isc/result.h>
 #include <isc/sockaddr.h>
@@ -80,7 +79,7 @@ options {\n\
 #endif
 "\
 	recursive-clients 1000;\n\
-	rrset-order {type NS order random; order cyclic; };\n\
+	rrset-order {order cyclic;};\n\
 	serial-queries 20;\n\
 	serial-query-rate 20;\n\
 	server-id none;\n\
@@ -98,13 +97,11 @@ options {\n\
 	use-id-pool true;\n\
 	use-ixfr true;\n\
 	edns-udp-size 4096;\n\
-	max-udp-size 4096;\n\
 \n\
 	/* view */\n\
 	allow-notify {none;};\n\
 	allow-update-forwarding {none;};\n\
-	allow-query-cache { localnets; localhost; };\n\
-	allow-recursion { localnets; localhost; };\n\
+	allow-recursion {any;};\n\
 #	allow-v6-synthesis <obsolete>;\n\
 #	sortlist <none>\n\
 #	topology <none>\n\
@@ -136,10 +133,8 @@ options {\n\
 	acache-cleaning-interval 60;\n\
 	max-acache-size 0;\n\
 	dnssec-enable no; /* Make yes for 9.4. */ \n\
-	dnssec-accept-expired no;\n\
 	clients-per-query 10;\n\
 	max-clients-per-query 100;\n\
-	zero-no-soa-ttl-cache no;\n\
 "
 
 "	/* zone */\n\
@@ -173,10 +168,6 @@ options {\n\
 	check-wildcard yes;\n\
 	check-sibling yes;\n\
 	check-integrity yes;\n\
-	check-mx-cname warn;\n\
-	check-srv-cname warn;\n\
-	zero-no-soa-ttl yes;\n\
-	update-check-ksk yes;\n\
 };\n\
 "
 
@@ -218,7 +209,7 @@ ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) {
 }
 
 isc_result_t
-ns_config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
+ns_config_get(cfg_obj_t **maps, const char *name, cfg_obj_t **obj) {
 	int i;
 
 	for (i = 0;; i++) {
@@ -230,13 +221,11 @@ ns_config_get(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) {
 }
 
 isc_result_t
-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;
+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;
 	int i;
 
 	for (i = 0;; i++) {
@@ -267,8 +256,8 @@ ns_checknames_get(const cfg_obj_t **maps, const char *which,
 }
 
 int
-ns_config_listcount(const cfg_obj_t *list) {
-	const cfg_listelt_t *e;
+ns_config_listcount(cfg_obj_t *list) {
+	cfg_listelt_t *e;
 	int i = 0;
 
 	for (e = cfg_list_first(list); e != NULL; e = cfg_list_next(e))
@@ -278,7 +267,7 @@ ns_config_listcount(const cfg_obj_t *list) {
 }
 
 isc_result_t
-ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass,
+ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
 		   dns_rdataclass_t *classp) {
 	isc_textregion_t r;
 	isc_result_t result;
@@ -297,7 +286,7 @@ ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass,
 }
 
 isc_result_t
-ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype,
+ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 		   dns_rdatatype_t *typep) {
 	isc_textregion_t r;
 	isc_result_t result;
@@ -316,7 +305,7 @@ ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 }
 
 dns_zonetype_t
-ns_config_getzonetype(const cfg_obj_t *zonetypeobj) {
+ns_config_getzonetype(cfg_obj_t *zonetypeobj) {
 	dns_zonetype_t ztype = dns_zone_none;
 	const char *str;
 
@@ -333,14 +322,14 @@ ns_config_getzonetype(const cfg_obj_t *zonetypeobj) {
 }
 
 isc_result_t
-ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list,
+ns_config_getiplist(cfg_obj_t *config, cfg_obj_t *list,
 		    in_port_t defport, isc_mem_t *mctx,
 		    isc_sockaddr_t **addrsp, isc_uint32_t *countp)
 {
 	int count, i = 0;
-	const cfg_obj_t *addrlist;
-	const cfg_obj_t *portobj;
-	const cfg_listelt_t *element;
+	cfg_obj_t *addrlist;
+	cfg_obj_t *portobj;
+	cfg_listelt_t *element;
 	isc_sockaddr_t *addrs;
 	in_port_t port;
 	isc_result_t result;
@@ -400,12 +389,10 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 }
 
 static isc_result_t
-get_masters_def(const cfg_obj_t *cctx, const char *name,
-	        const cfg_obj_t **ret)
-{
+get_masters_def(cfg_obj_t *cctx, const char *name, cfg_obj_t **ret) {
 	isc_result_t result;
-	const cfg_obj_t *masters = NULL;
-	const cfg_listelt_t *elt;
+	cfg_obj_t *masters = NULL;
+	cfg_listelt_t *elt;
 
 	result = cfg_map_get(cctx, "masters", &masters);
 	if (result != ISC_R_SUCCESS)
@@ -413,7 +400,7 @@ get_masters_def(const cfg_obj_t *cctx, const char *name,
 	for (elt = cfg_list_first(masters);
 	     elt != NULL;
 	     elt = cfg_list_next(elt)) {
-		const cfg_obj_t *list;
+		cfg_obj_t *list;
 		const char *listname;
 
 		list = cfg_listelt_value(elt);
@@ -428,24 +415,24 @@ get_masters_def(const cfg_obj_t *cctx, const char *name,
 }
 
 isc_result_t
-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)
+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)
 {
 	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;
-	const cfg_listelt_t *element;
-	const cfg_obj_t *addrlist;
-	const cfg_obj_t *portobj;
+	cfg_listelt_t *element;
+	cfg_obj_t *addrlist;
+	cfg_obj_t *portobj;
 	in_port_t port;
 	dns_fixedname_t fname;
 	isc_sockaddr_t *addrs = NULL;
 	dns_name_t **keys = NULL;
 	struct { const char *name; } *lists = NULL;
 	struct {
-		const cfg_listelt_t *element;
+		cfg_listelt_t *element;
 		in_port_t port;
 	} *stack = NULL;
 
@@ -479,8 +466,8 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		const cfg_obj_t *addr;
-		const cfg_obj_t *key;
+		cfg_obj_t *addr;
+		cfg_obj_t *key;
 		const char *keystr;
 		isc_buffer_t b;
 
@@ -705,10 +692,10 @@ ns_config_putipandkeylist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 }
 
 isc_result_t
-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;
+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;
 	isc_result_t result;
 	int i;
 
@@ -731,65 +718,16 @@ ns_config_getport(const cfg_obj_t *config, in_port_t *portp) {
 	return (ISC_R_SUCCESS);
 }
 
-struct keyalgorithms {
-	const char *str;
-	enum { hmacnone, hmacmd5, hmacsha1, hmacsha224,
-	       hmacsha256, hmacsha384, hmacsha512 } hmac;
-	isc_uint16_t size;
-} algorithms[] = {
-	{ "hmac-md5", hmacmd5, 128 },
-	{ "hmac-md5.sig-alg.reg.int", hmacmd5, 0 },
-	{ "hmac-md5.sig-alg.reg.int.", hmacmd5, 0 },
-	{ "hmac-sha1", hmacsha1, 160 },
-	{ "hmac-sha224", hmacsha224, 224 },
-	{ "hmac-sha256", hmacsha256, 256 },
-	{ "hmac-sha384", hmacsha384, 384 },
-	{ "hmac-sha512", hmacsha512, 512 },
-	{  NULL, hmacnone, 0 }
-};
-
 isc_result_t
-ns_config_getkeyalgorithm(const char *str, dns_name_t **name,
-			  isc_uint16_t *digestbits)
+ns_config_getkeyalgorithm(const char *str, dns_name_t **name)
 {
-	int i;
-	size_t len = 0;
-	isc_uint16_t bits;
-	isc_result_t result;
-
-	for (i = 0; algorithms[i].str != NULL; i++) {
-		len = strlen(algorithms[i].str);
-		if (strncasecmp(algorithms[i].str, str, len) == 0 &&
-		    (str[len] == '\0' ||
-		     (algorithms[i].size != 0 && str[len] == '-')))
-			break;
+	if (strcasecmp(str, "hmac-md5") == 0 ||
+	    strcasecmp(str, "hmac-md5.sig-alg.reg.int") == 0 ||
+	    strcasecmp(str, "hmac-md5.sig-alg.reg.int.") == 0)
+	{
+		if (name != NULL)
+			*name = dns_tsig_hmacmd5_name;
+		return (ISC_R_SUCCESS);
 	}
-	if (algorithms[i].str == NULL)
-		return (ISC_R_NOTFOUND);
-	if (str[len] == '-') {
-		result = isc_parse_uint16(&bits, str + len + 1, 10);
-		if (result != ISC_R_SUCCESS)
-			return (result);
-		if (bits > algorithms[i].size)
-			return (ISC_R_RANGE);
-	} else if (algorithms[i].size == 0)
-		bits = 128;
-	else
-		bits = algorithms[i].size;
-
-	if (name != NULL) {
-		switch (algorithms[i].hmac) {
-		case hmacmd5: *name = dns_tsig_hmacmd5_name; break;
-		case hmacsha1: *name = dns_tsig_hmacsha1_name; break;
-		case hmacsha224: *name = dns_tsig_hmacsha224_name; break;
-		case hmacsha256: *name = dns_tsig_hmacsha256_name; break;
-		case hmacsha384: *name = dns_tsig_hmacsha384_name; break;
-		case hmacsha512: *name = dns_tsig_hmacsha512_name; break;
-		default:
-			INSIST(0);
-		}
-	}
-	if (digestbits != NULL)
-		*digestbits = bits;
-	return (ISC_R_SUCCESS);
+	return (ISC_R_NOTFOUND);
 }

bin/named/control.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.26 2005/04/29 00:36:15 marka Exp $ */
+/* $Id: control.c,v 1.20.10.6 2005/04/29 00:55:52 marka Exp $ */
 
 /*! \file */
 

bin/named/controlconf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.50 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: controlconf.c,v 1.40.18.6 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 
@@ -659,12 +659,10 @@ ns_controls_shutdown(ns_controls_t *controls) {
 }
 
 static isc_result_t
-cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname,
-	        const cfg_obj_t **objp)
-{
-	const cfg_listelt_t *element;
+cfgkeylist_find(cfg_obj_t *keylist, const char *keyname, cfg_obj_t **objp) {
+	cfg_listelt_t *element;
 	const char *str;
-	const cfg_obj_t *obj;
+	cfg_obj_t *obj;
 
 	for (element = cfg_list_first(keylist);
 	     element != NULL;
@@ -683,13 +681,13 @@ cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname,
 }
 
 static isc_result_t
-controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
+controlkeylist_fromcfg(cfg_obj_t *keylist, isc_mem_t *mctx,
 		       controlkeylist_t *keyids)
 {
-	const cfg_listelt_t *element;
+	cfg_listelt_t *element;
 	char *newstr = NULL;
 	const char *str;
-	const cfg_obj_t *obj;
+	cfg_obj_t *obj;
 	controlkey_t *key = NULL;
 
 	for (element = cfg_list_first(keylist);
@@ -724,11 +722,11 @@ controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx,
 }
 
 static void
-register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
+register_keys(cfg_obj_t *control, cfg_obj_t *keylist,
 	      controlkeylist_t *keyids, isc_mem_t *mctx, const char *socktext)
 {
 	controlkey_t *keyid, *next;
-	const cfg_obj_t *keydef;
+	cfg_obj_t *keydef;
 	char secret[1024];
 	isc_buffer_t b;
 	isc_result_t result;
@@ -748,8 +746,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
 			ISC_LIST_UNLINK(*keyids, keyid, link);
 			free_controlkey(keyid, mctx);
 		} else {
-			const cfg_obj_t *algobj = NULL;
-			const cfg_obj_t *secretobj = NULL;
+			cfg_obj_t *algobj = NULL;
+			cfg_obj_t *secretobj = NULL;
 			const char *algstr = NULL;
 			const char *secretstr = NULL;
 
@@ -760,7 +758,7 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
 			algstr = cfg_obj_asstring(algobj);
 			secretstr = cfg_obj_asstring(secretobj);
 
-			if (ns_config_getkeyalgorithm(algstr, NULL, NULL) !=
+			if (ns_config_getkeyalgorithm(algstr, NULL) !=
 			    ISC_R_SUCCESS)
 			{
 				cfg_obj_log(control, ns_g_lctx,
@@ -817,9 +815,9 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
 	isc_result_t result;
 	cfg_parser_t *pctx = NULL;
 	cfg_obj_t *config = NULL;
-	const cfg_obj_t *key = NULL;
-	const cfg_obj_t *algobj = NULL;
-	const cfg_obj_t *secretobj = NULL;
+	cfg_obj_t *key = NULL;
+	cfg_obj_t *algobj = NULL;
+	cfg_obj_t *secretobj = NULL;
 	const char *algstr = NULL;
 	const char *secretstr = NULL;
 	controlkey_t *keyid = NULL;
@@ -850,7 +848,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
 	algstr = cfg_obj_asstring(algobj);
 	secretstr = cfg_obj_asstring(secretobj);
 
-	if (ns_config_getkeyalgorithm(algstr, NULL, NULL) != ISC_R_SUCCESS) {
+	if (ns_config_getkeyalgorithm(algstr, NULL) != ISC_R_SUCCESS) {
 		cfg_obj_log(key, ns_g_lctx,
 			    ISC_LOG_WARNING,
 			    "unsupported algorithm '%s' in "
@@ -900,13 +898,12 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
  * valid or both are NULL.
  */
 static void
-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)
+get_key_info(cfg_obj_t *config, cfg_obj_t *control,
+	     cfg_obj_t **global_keylistp, cfg_obj_t **control_keylistp)
 {
 	isc_result_t result;
-	const cfg_obj_t *control_keylist = NULL;
-	const cfg_obj_t *global_keylist = NULL;
+	cfg_obj_t *control_keylist = NULL;
+	cfg_obj_t *global_keylist = NULL;
 
 	REQUIRE(global_keylistp != NULL && *global_keylistp == NULL);
 	REQUIRE(control_keylistp != NULL && *control_keylistp == NULL);
@@ -925,15 +922,16 @@ get_key_info(const cfg_obj_t *config, const cfg_obj_t *control,
 }
 
 static void
-update_listener(ns_controls_t *cp, controllistener_t **listenerp,
-		const cfg_obj_t *control, const cfg_obj_t *config,
-		isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx,
-	        const char *socktext, isc_sockettype_t type)
+update_listener(ns_controls_t *cp,
+		controllistener_t **listenerp, cfg_obj_t *control,
+		cfg_obj_t *config, isc_sockaddr_t *addr,
+		cfg_aclconfctx_t *aclconfctx, const char *socktext,
+		isc_sockettype_t type)
 {
 	controllistener_t *listener;
-	const cfg_obj_t *allow;
-	const cfg_obj_t *global_keylist = NULL;
-	const cfg_obj_t *control_keylist = NULL;
+	cfg_obj_t *allow;
+	cfg_obj_t *global_keylist = NULL;
+	cfg_obj_t *control_keylist = NULL;
 	dns_acl_t *new_acl = NULL;
 	controlkeylist_t keys;
 	isc_result_t result = ISC_R_SUCCESS;
@@ -1064,15 +1062,15 @@ update_listener(ns_controls_t *cp, controllistener_t **listenerp,
 
 static void
 add_listener(ns_controls_t *cp, controllistener_t **listenerp,
-	     const cfg_obj_t *control, const cfg_obj_t *config,
-	     isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx,
-	     const char *socktext, isc_sockettype_t type)
+	     cfg_obj_t *control, cfg_obj_t *config, isc_sockaddr_t *addr,
+	     cfg_aclconfctx_t *aclconfctx, const char *socktext,
+	     isc_sockettype_t type)
 {
 	isc_mem_t *mctx = cp->server->mctx;
 	controllistener_t *listener;
-	const cfg_obj_t *allow;
-	const cfg_obj_t *global_keylist = NULL;
-	const cfg_obj_t *control_keylist = NULL;
+	cfg_obj_t *allow;
+	cfg_obj_t *global_keylist = NULL;
+	cfg_obj_t *control_keylist = NULL;
 	dns_acl_t *new_acl = NULL;
 	isc_result_t result = ISC_R_SUCCESS;
 
@@ -1202,13 +1200,13 @@ add_listener(ns_controls_t *cp, controllistener_t **listenerp,
 }
 
 isc_result_t
-ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
+ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
 		      cfg_aclconfctx_t *aclconfctx)
 {
 	controllistener_t *listener;
 	controllistenerlist_t new_listeners;
-	const cfg_obj_t *controlslist = NULL;
-	const cfg_listelt_t *element, *element2;
+	cfg_obj_t *controlslist = NULL;
+	cfg_listelt_t *element, *element2;
 	char socktext[ISC_SOCKADDR_FORMATSIZE];
 
 	ISC_LIST_INIT(new_listeners);
@@ -1230,8 +1228,8 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 		for (element = cfg_list_first(controlslist);
 		     element != NULL;
 		     element = cfg_list_next(element)) {
-			const cfg_obj_t *controls;
-			const cfg_obj_t *inetcontrols = NULL;
+			cfg_obj_t *controls;
+			cfg_obj_t *inetcontrols = NULL;
 
 			controls = cfg_listelt_value(element);
 			(void)cfg_map_get(controls, "inet", &inetcontrols);
@@ -1241,9 +1239,9 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 			for (element2 = cfg_list_first(inetcontrols);
 			     element2 != NULL;
 			     element2 = cfg_list_next(element2)) {
-				const cfg_obj_t *control;
-				const cfg_obj_t *obj;
-				isc_sockaddr_t addr;
+				cfg_obj_t *control;
+				cfg_obj_t *obj;
+				isc_sockaddr_t *addr;
 
 				/*
 				 * The parser handles BIND 8 configuration file
@@ -1253,12 +1251,12 @@ ns_controls_configure(ns_controls_t *cp, const 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,
@@ -1269,7 +1267,7 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 					      socktext);
 
 				update_listener(cp, &listener, control, config,
-						&addr, aclconfctx, socktext,
+						addr, aclconfctx, socktext,
 						isc_sockettype_tcp);
 
 				if (listener != NULL)
@@ -1284,7 +1282,7 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 					 * This is a new listener.
 					 */
 					add_listener(cp, &listener, control,
-						     config, &addr, aclconfctx,
+						     config, addr, aclconfctx,
 						     socktext,
 						     isc_sockettype_tcp);
 
@@ -1296,8 +1294,8 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 		for (element = cfg_list_first(controlslist);
 		     element != NULL;
 		     element = cfg_list_next(element)) {
-			const cfg_obj_t *controls;
-			const cfg_obj_t *unixcontrols = NULL;
+			cfg_obj_t *controls;
+			cfg_obj_t *unixcontrols = NULL;
 
 			controls = cfg_listelt_value(element);
 			(void)cfg_map_get(controls, "unix", &unixcontrols);
@@ -1307,8 +1305,8 @@ ns_controls_configure(ns_controls_t *cp, const cfg_obj_t *config,
 			for (element2 = cfg_list_first(unixcontrols);
 			     element2 != NULL;
 			     element2 = cfg_list_next(element2)) {
-				const cfg_obj_t *control;
-				const cfg_obj_t *path;
+				cfg_obj_t *control;
+				cfg_obj_t *path;
 				isc_sockaddr_t addr;
 				isc_result_t result;
 

bin/named/include/named/builtin.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.h,v 1.4 2005/04/29 00:22:29 marka Exp $ */
+/* $Id: builtin.h,v 1.2.18.2 2005/04/29 00:15:34 marka Exp $ */
 
 #ifndef NAMED_BUILTIN_H
 #define NAMED_BUILTIN_H 1

bin/named/include/named/client.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.77 2005/08/15 01:21:04 marka Exp $ */
+/* $Id: client.h,v 1.69.18.7 2005/08/15 01:46:49 marka Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1

bin/named/include/named/config.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.12 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: config.h,v 1.6.18.3 2005/04/29 00:15:34 marka Exp $ */
 
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1
@@ -31,28 +31,27 @@ isc_result_t
 ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf);
 
 isc_result_t
-ns_config_get(const cfg_obj_t **maps, const char* name, const cfg_obj_t **obj);
+ns_config_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
 
 isc_result_t
-ns_checknames_get(const cfg_obj_t **maps, const char* name,
-		  const cfg_obj_t **obj);
+ns_checknames_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
 
 int
-ns_config_listcount(const cfg_obj_t *list);
+ns_config_listcount(cfg_obj_t *list);
 
 isc_result_t
-ns_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass,
+ns_config_getclass(cfg_obj_t *classobj, dns_rdataclass_t defclass,
 		   dns_rdataclass_t *classp);
 
 isc_result_t
-ns_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype,
+ns_config_gettype(cfg_obj_t *typeobj, dns_rdatatype_t deftype,
 		  dns_rdatatype_t *typep);
 
 dns_zonetype_t
-ns_config_getzonetype(const cfg_obj_t *zonetypeobj);
+ns_config_getzonetype(cfg_obj_t *zonetypeobj);
 
 isc_result_t
-ns_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list,
+ns_config_getiplist(cfg_obj_t *config, cfg_obj_t *list,
 		    in_port_t defport, isc_mem_t *mctx,
 		    isc_sockaddr_t **addrsp, isc_uint32_t *countp);
 
@@ -61,19 +60,18 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
 		    isc_uint32_t count);
 
 isc_result_t
-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);
+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);
 
 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(const cfg_obj_t *config, in_port_t *portp);
+ns_config_getport(cfg_obj_t *config, in_port_t *portp);
 
 isc_result_t
-ns_config_getkeyalgorithm(const char *str, dns_name_t **name,
-			  isc_uint16_t *digestbits);
+ns_config_getkeyalgorithm(const char *str, dns_name_t **name);
 
 #endif /* NAMED_CONFIG_H */

bin/named/include/named/control.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.21 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: control.h,v 1.14.18.5 2005/04/27 05:00:35 sra Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
@@ -71,7 +71,7 @@ ns_controls_destroy(ns_controls_t **ctrlsp);
  */
 
 isc_result_t
-ns_controls_configure(ns_controls_t *controls, const cfg_obj_t *config,
+ns_controls_configure(ns_controls_t *controls, cfg_obj_t *config,
 		      cfg_aclconfctx_t *aclconfctx);
 /*%<
  * Configure zero or more command channels into 'controls'

bin/named/include/named/globals.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.68 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: globals.h,v 1.64.18.2 2005/04/29 00:15:34 marka Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
@@ -77,7 +77,7 @@ EXTERN unsigned int		ns_g_debuglevel		INIT(0);
  * Current configuration information.
  */
 EXTERN cfg_obj_t *		ns_g_config		INIT(NULL);
-EXTERN const cfg_obj_t *	ns_g_defaults		INIT(NULL);
+EXTERN 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

bin/named/include/named/interfacemgr.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.h,v 1.31 2005/07/18 05:58:57 marka Exp $ */
+/* $Id: interfacemgr.h,v 1.26.18.4 2005/04/27 05:00:35 sra Exp $ */
 
 #ifndef NAMED_INTERFACEMGR_H
 #define NAMED_INTERFACEMGR_H 1

bin/named/include/named/listenlist.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: listenlist.h,v 1.13 2005/04/29 00:22:30 marka Exp $ */
+/* $Id: listenlist.h,v 1.11.18.2 2005/04/29 00:15:34 marka Exp $ */
 
 #ifndef NAMED_LISTENLIST_H
 #define NAMED_LISTENLIST_H 1

bin/named/include/named/log.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.23 2005/04/29 00:22:30 marka Exp $ */
+/* $Id: log.h,v 1.21.18.2 2005/04/29 00:15:35 marka Exp $ */
 
 #ifndef NAMED_LOG_H
 #define NAMED_LOG_H 1

bin/named/include/named/logconf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.15 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: logconf.h,v 1.11.18.2 2005/04/29 00:15:35 marka Exp $ */
 
 #ifndef NAMED_LOGCONF_H
 #define NAMED_LOGCONF_H 1
@@ -25,7 +25,7 @@
 #include <isc/log.h>
 
 isc_result_t
-ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt);
+ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt);
 /*%<
  * Set up the logging configuration in '*logconf' according to
  * the named.conf data in 'logstmt'.

bin/named/include/named/lwaddr.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwaddr.h,v 1.6 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwaddr.h,v 1.4.18.2 2005/04/29 00:15:35 marka Exp $ */
 
 /*! \file */
 

bin/named/include/named/lwdclient.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.h,v 1.16 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwdclient.h,v 1.14.18.2 2005/04/29 00:15:36 marka Exp $ */
 
 #ifndef NAMED_LWDCLIENT_H
 #define NAMED_LWDCLIENT_H 1

bin/named/include/named/lwresd.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.17 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwresd.h,v 1.13.18.2 2005/04/29 00:15:36 marka Exp $ */
 
 #ifndef NAMED_LWRESD_H
 #define NAMED_LWRESD_H 1
@@ -58,7 +58,7 @@ struct ns_lwreslistener {
  * Configure lwresd.
  */
 isc_result_t
-ns_lwresd_configure(isc_mem_t *mctx, const cfg_obj_t *config);
+ns_lwresd_configure(isc_mem_t *mctx, cfg_obj_t *config);
 
 isc_result_t
 ns_lwresd_parseeresolvconf(isc_mem_t *mctx, cfg_parser_t *pctx,
@@ -75,8 +75,7 @@ ns_lwresd_shutdown(void);
  */
 /*% create manager */
 isc_result_t
-ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres,
-		      ns_lwresd_t **lwresdp);
+ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres, ns_lwresd_t **lwresdp);
 
 /*% attach to manager */
 void

bin/named/include/named/lwsearch.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwsearch.h,v 1.7 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwsearch.h,v 1.5.18.2 2005/04/29 00:15:36 marka Exp $ */
 
 #ifndef NAMED_LWSEARCH_H
 #define NAMED_LWSEARCH_H 1

bin/named/include/named/main.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.h,v 1.13 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: main.h,v 1.11.18.2 2005/04/29 00:15:37 marka Exp $ */
 
 #ifndef NAMED_MAIN_H
 #define NAMED_MAIN_H 1

bin/named/include/named/notify.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: notify.h,v 1.12 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: notify.h,v 1.10.18.2 2005/04/29 00:15:37 marka Exp $ */
 
 #ifndef NAMED_NOTIFY_H
 #define NAMED_NOTIFY_H 1

bin/named/include/named/ns_smf_globals.h

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_smf_globals.h,v 1.5 2005/05/13 01:35:41 marka Exp $ */
+/* $Id: ns_smf_globals.h,v 1.2.2.4 2005/05/13 01:32:46 marka Exp $ */
 
 #ifndef NS_SMF_GLOBALS_H
 #define NS_SMF_GLOBALS_H 1

bin/named/include/named/query.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.h,v 1.38 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: query.h,v 1.36.18.2 2005/04/29 00:15:37 marka Exp $ */
 
 #ifndef NAMED_QUERY_H
 #define NAMED_QUERY_H 1

bin/named/include/named/server.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.82 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: server.h,v 1.73.18.5 2005/08/15 01:46:49 marka Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
@@ -219,6 +219,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, const isc_sockaddr_t *addr);
+ns_add_reserved_dispatch(ns_server_t *server, isc_sockaddr_t *addr);
 
 #endif /* NAMED_SERVER_H */

bin/named/include/named/sortlist.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.9 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: sortlist.h,v 1.5.18.2 2005/04/29 00:15:38 marka Exp $ */
 
 #ifndef NAMED_SORTLIST_H
 #define NAMED_SORTLIST_H 1
@@ -30,7 +30,7 @@
  * Type for callback functions that rank addresses.
  */
 typedef int 
-(*dns_addressorderfunc_t)(const isc_netaddr_t *address, const void *arg);
+(*dns_addressorderfunc_t)(isc_netaddr_t *address, void *arg);
 
 /*%
  * Return value type for setup_sortlist.
@@ -42,8 +42,7 @@ typedef enum {
 } ns_sortlisttype_t;
 
 ns_sortlisttype_t
-ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr,
-		  const void **argp);
+ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr, void **argp);
 /*%<
  * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.
  *
@@ -58,14 +57,14 @@ ns_sortlist_setup(dns_acl_t *acl, isc_netaddr_t *clientaddr,
  */
 
 int
-ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg);
+ns_sortlist_addrorder1(isc_netaddr_t *addr, 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(const isc_netaddr_t *addr, const void *arg);
+ns_sortlist_addrorder2(isc_netaddr_t *addr, void *arg);
 /*%<
  * Find the sort order of 'addr' in 'arg', a topology-like
  * ACL forming the second element in a 2-element top-level
@@ -75,7 +74,7 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg);
 void
 ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, isc_netaddr_t *client_addr,
 			dns_addressorderfunc_t *orderp,
-			const void **argp);
+			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

bin/named/include/named/tkeyconf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.14 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: tkeyconf.h,v 1.10.18.2 2005/04/29 00:15:38 marka Exp $ */
 
 #ifndef NS_TKEYCONF_H
 #define NS_TKEYCONF_H 1
@@ -30,8 +30,8 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
-		      isc_entropy_t *ectx, dns_tkeyctx_t **tctxp);
+ns_tkeyctx_fromconfig(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'.

bin/named/include/named/tsigconf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.14 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: tsigconf.h,v 1.10.18.2 2005/04/29 00:15:38 marka Exp $ */
 
 #ifndef NS_TSIGCONF_H
 #define NS_TSIGCONF_H 1
@@ -28,7 +28,7 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
+ns_tsigkeyring_fromconfig(cfg_obj_t *config, 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'

bin/named/include/named/types.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.23 2005/04/29 00:22:33 marka Exp $ */
+/* $Id: types.h,v 1.21.18.2 2005/04/29 00:15:38 marka Exp $ */
 
 #ifndef NAMED_TYPES_H
 #define NAMED_TYPES_H 1

bin/named/include/named/update.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.h,v 1.11 2005/04/29 00:22:33 marka Exp $ */
+/* $Id: update.h,v 1.9.18.2 2005/04/29 00:15:39 marka Exp $ */
 
 #ifndef NAMED_UPDATE_H
 #define NAMED_UPDATE_H 1

bin/named/include/named/xfrout.h

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.h,v 1.10 2005/04/29 00:22:33 marka Exp $ */
+/* $Id: xfrout.h,v 1.8.18.2 2005/04/29 00:15:39 marka Exp $ */
 
 #ifndef NAMED_XFROUT_H
 #define NAMED_XFROUT_H 1

bin/named/include/named/zoneconf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.24 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: zoneconf.h,v 1.19.18.3 2005/04/27 05:00:37 sra Exp $ */
 
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1
@@ -31,9 +31,8 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
-		  const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac,
-		  dns_zone_t *zone);
+ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
+		  cfg_aclconfctx_t *ac, dns_zone_t *zone);
 /*%<
  * Configure or reconfigure a zone according to the named.conf
  * data in 'cctx' and 'czone'.
@@ -50,7 +49,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
  */
 
 isc_boolean_t
-ns_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig);
+ns_zone_reusable(dns_zone_t *zone, 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

bin/named/interfacemgr.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.83 2005/11/30 03:33:48 marka Exp $ */
+/* $Id: interfacemgr.c,v 1.76.18.6 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 

bin/named/listenlist.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: listenlist.c,v 1.12 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: listenlist.c,v 1.10.18.2 2005/04/29 00:15:22 marka Exp $ */
 
 /*! \file */
 

bin/named/log.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.41 2005/05/20 01:19:42 marka Exp $ */
+/* $Id: log.c,v 1.37.18.4 2005/05/20 01:21:44 marka Exp $ */
 
 /*! \file */
 

bin/named/logconf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.40 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: logconf.c,v 1.35.18.3 2005/08/23 02:31:31 marka Exp $ */
 
 /*! \file */
 
@@ -43,13 +43,13 @@
  * in 'ccat' and add it to 'lctx'.
  */
 static isc_result_t
-category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *lctx) {
+category_fromconf(cfg_obj_t *ccat, isc_logconfig_t *lctx) {
 	isc_result_t result;
 	const char *catname;
 	isc_logcategory_t *category;
 	isc_logmodule_t *module;
-	const cfg_obj_t *destinations = NULL;
-	const cfg_listelt_t *element = NULL;
+	cfg_obj_t *destinations = NULL;
+	cfg_listelt_t *element = NULL;
 
 	catname = cfg_obj_asstring(cfg_tuple_get(ccat, "name"));
 	category = isc_log_categorybyname(ns_g_lctx, catname);
@@ -70,7 +70,7 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *lctx) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		const cfg_obj_t *channel = cfg_listelt_value(element);
+		cfg_obj_t *channel = cfg_listelt_value(element);
 		const char *channelname = cfg_obj_asstring(channel);
 
 		result = isc_log_usechannel(lctx, channelname, category,
@@ -91,18 +91,18 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *lctx) {
  * in 'cchan' and add it to 'lctx'.
  */
 static isc_result_t
-channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
+channel_fromconf(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;
-	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;
+	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;
 	int i;
 
 	channelname = cfg_obj_asstring(cfg_map_getname(channel));
@@ -132,10 +132,9 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	type = ISC_LOG_TONULL;
 	
 	if (fileobj != NULL) {
-		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");
+		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");
 		isc_int32_t versions = ISC_LOG_ROLLNEVER;
 		isc_offset_t size = 0;
 
@@ -177,9 +176,9 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 	 * Munge flags.
 	 */
 	{
-		const cfg_obj_t *printcat = NULL;
-		const cfg_obj_t *printsev = NULL;
-		const cfg_obj_t *printtime = NULL;
+		cfg_obj_t *printcat = NULL;
+		cfg_obj_t *printsev = NULL;
+		cfg_obj_t *printtime = NULL;
 
 		(void)cfg_map_get(channel, "print-category", &printcat);
 		(void)cfg_map_get(channel, "print-severity", &printsev);
@@ -245,14 +244,13 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 }
 
 isc_result_t
-ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt) {
+ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt) {
 	isc_result_t result;
-	const cfg_obj_t *channels = NULL;
-	const cfg_obj_t *categories = NULL;
-	const cfg_listelt_t *element;
+	cfg_obj_t *channels = NULL;
+	cfg_obj_t *categories = NULL;
+	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));
 
@@ -261,7 +259,7 @@ ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		const cfg_obj_t *channel = cfg_listelt_value(element);
+		cfg_obj_t *channel = cfg_listelt_value(element);
 		CHECK(channel_fromconf(channel, logconf));
 	}
 
@@ -270,15 +268,15 @@ ns_log_configure(isc_logconfig_t *logconf, const cfg_obj_t *logstmt) {
 	     element != NULL;
 	     element = cfg_list_next(element))
 	{
-		const cfg_obj_t *category = cfg_listelt_value(element);
+		cfg_obj_t *category = cfg_listelt_value(element);
 		CHECK(category_fromconf(category, logconf));
 		if (!default_set) {
-			catname = cfg_tuple_get(category, "name");
+			cfg_obj_t *catname = cfg_tuple_get(category, "name");
 			if (strcmp(cfg_obj_asstring(catname), "default") == 0)
 				default_set = ISC_TRUE;
 		}
 		if (!unmatched_set) {
-			catname = cfg_tuple_get(category, "name");
+			cfg_obj_t *catname = cfg_tuple_get(category, "name");
 			if (strcmp(cfg_obj_asstring(catname), "unmatched") == 0)
 				unmatched_set = ISC_TRUE;
 		}

bin/named/lwaddr.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwaddr.c,v 1.6 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: lwaddr.c,v 1.4.18.2 2005/04/29 00:15:23 marka Exp $ */
 
 /*! \file */
 

bin/named/lwdclient.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.c,v 1.19 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: lwdclient.c,v 1.17.18.2 2005/04/29 00:15:23 marka Exp $ */
 
 /*! \file */
 

bin/named/lwderror.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwderror.c,v 1.10 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwderror.c,v 1.8.18.2 2005/04/29 00:15:24 marka Exp $ */
 
 /*! \file */
 

bin/named/lwdgabn.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.20 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwdgabn.c,v 1.15.18.3 2005/06/23 04:23:13 marka Exp $ */
 
 /*! \file */
 
@@ -122,7 +122,7 @@ sort_addresses(ns_lwdclient_t *client) {
 	rankedaddress *addrs;
 	isc_netaddr_t remote;
 	dns_addressorderfunc_t order;
-	const void *arg;
+	void *arg;
 	ns_lwresd_t *lwresd = client->clientmgr->listener->manager;
 	unsigned int i;
 	isc_result_t result;

bin/named/lwdgnba.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgnba.c,v 1.18 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwdgnba.c,v 1.16.18.2 2005/04/29 00:15:24 marka Exp $ */
 
 /*! \file */
 

bin/named/lwdgrbn.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgrbn.c,v 1.16 2005/11/30 03:33:48 marka Exp $ */
+/* $Id: lwdgrbn.c,v 1.13.18.3 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 

bin/named/lwdnoop.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdnoop.c,v 1.9 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwdnoop.c,v 1.7.18.2 2005/04/29 00:15:25 marka Exp $ */
 
 /*! \file */
 

bin/named/lwresd.8

@@ -13,7 +13,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: lwresd.8,v 1.22 2005/10/13 03:13:58 marka Exp $
+.\" $Id: lwresd.8,v 1.15.18.7 2005/10/13 02:53:01 marka Exp $
 .\"
 .hy 0
 .ad l

bin/named/lwresd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.53 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwresd.c,v 1.46.18.5 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file 
  * \brief
@@ -286,14 +286,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, const cfg_obj_t *lwres,
+ns_lwdmanager_create(isc_mem_t *mctx, cfg_obj_t *lwres,
 		     ns_lwresd_t **lwresdp)
 {
 	ns_lwresd_t *lwresd;
 	const char *vname;
 	dns_rdataclass_t vclass;
-	const cfg_obj_t *obj, *viewobj, *searchobj;
-	const cfg_listelt_t *element;
+	cfg_obj_t *obj, *viewobj, *searchobj;
+	cfg_listelt_t *element;
 	isc_result_t result;
 
 	INSIST(lwresdp != NULL && *lwresdp == NULL);
@@ -357,7 +357,7 @@ ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres,
 		     element != NULL;
 		     element = cfg_list_next(element))
 		{
-			const cfg_obj_t *search;
+			cfg_obj_t *search;
 			const char *searchstr;
 			isc_buffer_t namebuf;
 			dns_fixedname_t fname;
@@ -752,11 +752,11 @@ configure_listener(isc_sockaddr_t *address, ns_lwresd_t *lwresd,
 }
 
 isc_result_t
-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_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_lwreslistener_t *listener;
 	ns_lwreslistenerlist_t newlisteners;
 	isc_result_t result;

bin/named/lwresd.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwresd.docbook,v 1.10 2005/05/13 01:35:40 marka Exp $ -->
+<!-- $Id: lwresd.docbook,v 1.7.18.3 2005/05/13 01:32:45 marka Exp $ -->
 <refentry>
   <refentryinfo>
     <date>June 30, 2000</date>

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.16 2005/10/13 03:13:58 marka Exp $ -->
+<!-- $Id: lwresd.html,v 1.5.18.11 2005/10/13 02:53:02 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/named/lwsearch.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwsearch.c,v 1.11 2005/07/12 01:00:13 marka Exp $ */
+/* $Id: lwsearch.c,v 1.8.18.3 2005/07/12 01:22:17 marka Exp $ */
 
 /*! \file */
 

bin/named/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.152 2006/01/05 01:37:19 marka Exp $ */
+/* $Id: main.c,v 1.136.18.13 2005/09/18 07:58:05 marka Exp $ */
 
 /*! \file */
 
@@ -484,7 +484,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__,
-				 "isc_taskmgr_create() failed: %s",
+				 "ns_taskmgr_create() failed: %s",
 				 isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
@@ -492,7 +492,7 @@ create_managers(void) {
 	result = isc_timermgr_create(ns_g_mctx, &ns_g_timermgr);
 	if (result != ISC_R_SUCCESS) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "isc_timermgr_create() failed: %s",
+				 "ns_timermgr_create() failed: %s",
 				 isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
@@ -912,7 +912,6 @@ main(int argc, char *argv[]) {
 		}
 	}
 	isc_mem_destroy(&ns_g_mctx);
-	isc_mem_checkdestroyed(stderr);
 
 	ns_main_setmemstats(NULL);
 

bin/named/named.8

@@ -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.27 2005/10/13 03:13:58 marka Exp $
+.\" $Id: named.8,v 1.20.18.7 2005/10/13 02:53:01 marka Exp $
 .\"
 .hy 0
 .ad l

bin/named/named.conf.5

@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005 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.17 2006/03/06 02:23:19 marka Exp $
+.\" $Id: named.conf.5,v 1.1.2.15 2005/10/13 02:53:01 marka Exp $
 .\"
 .hy 0
 .ad l
@@ -69,7 +69,6 @@ server ( \fIipv4_address\fR\fI[/prefixlen]\fR | \fIipv6_address\fR\fI[/prefixlen
 	bogus \fIboolean\fR;
 	edns \fIboolean\fR;
 	edns\-udp\-size \fIinteger\fR;
-	max\-udp\-size \fIinteger\fR;
 	provide\-ixfr \fIboolean\fR;
 	request\-ixfr \fIboolean\fR;
 	keys \fIserver_key\fR;
@@ -201,9 +200,7 @@ options {
 	check\-names ( master | slave | response )
 		( fail | warn | ignore );
 	check\-mx ( fail | warn | ignore );
-	check\-integrity \fIboolean\fR;
-	check\-mx\-cname ( fail | warn | ignore );
-	check\-srv\-cname ( fail | warn | ignore );
+	integrity\-check \fIboolean\fR;
 	cache\-file \fIquoted_string\fR;
 	suppress\-initial\-notify \fIboolean\fR; // not yet implemented
 	preferred\-glue \fIstring\fR;
@@ -211,15 +208,13 @@ options {
 		( \fIquoted_string\fR [port \fIinteger\fR] |
 		\fIipv4_address\fR [port \fIinteger\fR] |
 		\fIipv6_address\fR [port \fIinteger\fR] ); ...
-	};
+	}
 	edns\-udp\-size \fIinteger\fR;
-	max\-udp\-size \fIinteger\fR;
 	root\-delegation\-only [ exclude { \fIquoted_string\fR; ... } ];
 	disable\-algorithms \fIstring\fR { \fIstring\fR; ... };
 	dnssec\-enable \fIboolean\fR;
 	dnssec\-lookaside \fIstring\fR trust\-anchor \fIstring\fR;
 	dnssec\-must\-be\-secure \fIstring\fR \fIboolean\fR;
-	dnssec\-accept\-expired \fIboolean\fR;
 	empty\-server \fIstring\fR;
 	empty\-contact \fIstring\fR;
 	empty\-zones\-enable \fIboolean\fR;
@@ -231,7 +226,6 @@ options {
 	allow\-transfer { \fIaddress_match_element\fR; ... };
 	allow\-update { \fIaddress_match_element\fR; ... };
 	allow\-update\-forwarding { \fIaddress_match_element\fR; ... };
-	update\-check\-ksk \fIboolean\fR;
 	notify \fInotifytype\fR;
 	notify\-source ( \fIipv4_address\fR | * ) [ port ( \fIinteger\fR | * ) ];
 	notify\-source\-v6 ( \fIipv6_address\fR | * ) [ port ( \fIinteger\fR | * ) ];
@@ -265,8 +259,6 @@ options {
 	use\-alt\-transfer\-source \fIboolean\fR;
 	zone\-statistics \fIboolean\fR;
 	key\-directory \fIquoted_string\fR;
-	zero\-no\-soa\-ttl \fIboolean\fR;
-	zero\-no\-soa\-ttl\-cache \fIboolean\fR;
 	allow\-v6\-synthesis { \fIaddress_match_element\fR; ... }; // obsolete
 	deallocate\-on\-exit \fIboolean\fR; // obsolete
 	fake\-iquery \fIboolean\fR; // obsolete
@@ -331,9 +323,7 @@ view \fIstring\fR \fIoptional_class\fR {
 	check\-names ( master | slave | response )
 		( fail | warn | ignore );
 	check\-mx ( fail | warn | ignore );
-	check\-integrity \fIboolean\fR;
-	check\-mx\-cname ( fail | warn | ignore );
-	check\-srv\-cname ( fail | warn | ignore );
+	integrity\-check \fIboolean\fR;
 	cache\-file \fIquoted_string\fR;
 	suppress\-initial\-notify \fIboolean\fR; // not yet implemented
 	preferred\-glue \fIstring\fR;
@@ -343,13 +333,11 @@ view \fIstring\fR \fIoptional_class\fR {
 		\fIipv6_address\fR [port \fIinteger\fR] ); ...
 	};
 	edns\-udp\-size \fIinteger\fR;
-	max\-udp\-size \fIinteger\fR;
 	root\-delegation\-only [ exclude { \fIquoted_string\fR; ... } ];
 	disable\-algorithms \fIstring\fR { \fIstring\fR; ... };
 	dnssec\-enable \fIboolean\fR;
 	dnssec\-lookaside \fIstring\fR trust\-anchor \fIstring\fR;
 	dnssec\-must\-be\-secure \fIstring\fR \fIboolean\fR;
-	dnssec\-accept\-expired \fIboolean\fR;
 	empty\-server \fIstring\fR;
 	empty\-contact \fIstring\fR;
 	empty\-zones\-enable \fIboolean\fR;
@@ -361,7 +349,6 @@ view \fIstring\fR \fIoptional_class\fR {
 	allow\-transfer { \fIaddress_match_element\fR; ... };
 	allow\-update { \fIaddress_match_element\fR; ... };
 	allow\-update\-forwarding { \fIaddress_match_element\fR; ... };
-	update\-check\-ksk \fIboolean\fR;
 	notify \fInotifytype\fR;
 	notify\-source ( \fIipv4_address\fR | * ) [ port ( \fIinteger\fR | * ) ];
 	notify\-source\-v6 ( \fIipv6_address\fR | * ) [ port ( \fIinteger\fR | * ) ];
@@ -395,8 +382,6 @@ view \fIstring\fR \fIoptional_class\fR {
 	use\-alt\-transfer\-source \fIboolean\fR;
 	zone\-statistics \fIboolean\fR;
 	key\-directory \fIquoted_string\fR;
-	zero\-no\-soa\-ttl \fIboolean\fR;
-	zero\-no\-soa\-ttl\-cache \fIboolean\fR;
 	allow\-v6\-synthesis { \fIaddress_match_element\fR; ... }; // obsolete
 	fetch\-glue \fIboolean\fR; // obsolete
 	maintain\-ixfr\-base \fIboolean\fR; // obsolete
@@ -419,13 +404,10 @@ zone \fIstring\fR \fIoptional_class\fR {
 	delegation\-only \fIboolean\fR;
 	check\-names ( fail | warn | ignore );
 	check\-mx ( fail | warn | ignore );
-	check\-integrity \fIboolean\fR;
-	check\-mx\-cname ( fail | warn | ignore );
-	check\-srv\-cname ( fail | warn | ignore );
+	integrity\-check \fIboolean\fR;
 	dialup \fIdialuptype\fR;
 	ixfr\-from\-differences \fIboolean\fR;
 	journal \fIquoted_string\fR;
-	zero\-no\-soa\-ttl \fIboolean\fR;
 	allow\-query { \fIaddress_match_element\fR; ... };
 	allow\-transfer { \fIaddress_match_element\fR; ... };
 	allow\-update { \fIaddress_match_element\fR; ... };
@@ -435,7 +417,6 @@ zone \fIstring\fR \fIoptional_class\fR {
 		( name | subdomain | wildcard | self ) \fIstring\fR
 		\fIrrtypelist\fR; ...
 	};
-	update\-check\-ksk \fIboolean\fR;
 	notify \fInotifytype\fR;
 	notify\-source ( \fIipv4_address\fR | * ) [ port ( \fIinteger\fR | * ) ];
 	notify\-source\-v6 ( \fIipv6_address\fR | * ) [ port ( \fIinteger\fR | * ) ];

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-2006  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005  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.20 2006/03/06 01:27:51 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.1.2.14 2005/08/18 01:02:58 marka Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -38,7 +38,6 @@
     <copyright>
       <year>2004</year>
       <year>2005</year>
-      <year>2006</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -104,7 +103,6 @@ server ( <replaceable>ipv4_address<optional>/prefixlen</optional></replaceable>
 	bogus <replaceable>boolean</replaceable>;
 	edns <replaceable>boolean</replaceable>;
 	edns-udp-size <replaceable>integer</replaceable>;
-	max-udp-size <replaceable>integer</replaceable>;
 	provide-ixfr <replaceable>boolean</replaceable>;
 	request-ixfr <replaceable>boolean</replaceable>;
 	keys <replaceable>server_key</replaceable>;
@@ -247,9 +245,7 @@ options {
 	check-names ( master | slave | response )
 		( fail | warn | ignore );
 	check-mx ( fail | warn | ignore );
-	check-integrity <replaceable>boolean</replaceable>;
-	check-mx-cname ( fail | warn | ignore );
-	check-srv-cname ( fail | warn | ignore );
+	integrity-check <replaceable>boolean</replaceable>;
 	cache-file <replaceable>quoted_string</replaceable>;
 	suppress-initial-notify <replaceable>boolean</replaceable>; // not yet implemented
 	preferred-glue <replaceable>string</replaceable>;
@@ -257,15 +253,13 @@ options {
 		( <replaceable>quoted_string</replaceable> <optional>port <replaceable>integer</replaceable></optional> |
 		<replaceable>ipv4_address</replaceable> <optional>port <replaceable>integer</replaceable></optional> |
 		<replaceable>ipv6_address</replaceable> <optional>port <replaceable>integer</replaceable></optional> ); ...
-	};
+	}
 	edns-udp-size <replaceable>integer</replaceable>;
-	max-udp-size <replaceable>integer</replaceable>;
 	root-delegation-only <optional> exclude { <replaceable>quoted_string</replaceable>; ... } </optional>;
 	disable-algorithms <replaceable>string</replaceable> { <replaceable>string</replaceable>; ... };
 	dnssec-enable <replaceable>boolean</replaceable>;
 	dnssec-lookaside <replaceable>string</replaceable> trust-anchor <replaceable>string</replaceable>;
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
-	dnssec-accept-expired <replaceable>boolean</replaceable>;
 
 	empty-server <replaceable>string</replaceable>;
 	empty-contact <replaceable>string</replaceable>;
@@ -280,7 +274,6 @@ options {
 	allow-transfer { <replaceable>address_match_element</replaceable>; ... };
 	allow-update { <replaceable>address_match_element</replaceable>; ... };
 	allow-update-forwarding { <replaceable>address_match_element</replaceable>; ... };
-	update-check-ksk <replaceable>boolean</replaceable>;
 
 	notify <replaceable>notifytype</replaceable>;
 	notify-source ( <replaceable>ipv4_address</replaceable> | * ) <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
@@ -320,8 +313,6 @@ options {
 
 	zone-statistics <replaceable>boolean</replaceable>;
 	key-directory <replaceable>quoted_string</replaceable>;
-	zero-no-soa-ttl <replaceable>boolean</replaceable>;
-	zero-no-soa-ttl-cache <replaceable>boolean</replaceable>;
 
 	allow-v6-synthesis { <replaceable>address_match_element</replaceable>; ... }; // obsolete
 	deallocate-on-exit <replaceable>boolean</replaceable>; // obsolete
@@ -394,9 +385,7 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 	check-names ( master | slave | response )
 		( fail | warn | ignore );
 	check-mx ( fail | warn | ignore );
-	check-integrity <replaceable>boolean</replaceable>;
-	check-mx-cname ( fail | warn | ignore );
-	check-srv-cname ( fail | warn | ignore );
+	integrity-check <replaceable>boolean</replaceable>;
 	cache-file <replaceable>quoted_string</replaceable>;
 	suppress-initial-notify <replaceable>boolean</replaceable>; // not yet implemented
 	preferred-glue <replaceable>string</replaceable>;
@@ -406,13 +395,12 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 		<replaceable>ipv6_address</replaceable> <optional>port <replaceable>integer</replaceable></optional> ); ...
 	};
 	edns-udp-size <replaceable>integer</replaceable>;
-	max-udp-size <replaceable>integer</replaceable>;
 	root-delegation-only <optional> exclude { <replaceable>quoted_string</replaceable>; ... } </optional>;
 	disable-algorithms <replaceable>string</replaceable> { <replaceable>string</replaceable>; ... };
 	dnssec-enable <replaceable>boolean</replaceable>;
 	dnssec-lookaside <replaceable>string</replaceable> trust-anchor <replaceable>string</replaceable>;
+
 	dnssec-must-be-secure <replaceable>string</replaceable> <replaceable>boolean</replaceable>;
-	dnssec-accept-expired <replaceable>boolean</replaceable>;
 
 	empty-server <replaceable>string</replaceable>;
 	empty-contact <replaceable>string</replaceable>;
@@ -427,7 +415,6 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 	allow-transfer { <replaceable>address_match_element</replaceable>; ... };
 	allow-update { <replaceable>address_match_element</replaceable>; ... };
 	allow-update-forwarding { <replaceable>address_match_element</replaceable>; ... };
-	update-check-ksk <replaceable>boolean</replaceable>;
 
 	notify <replaceable>notifytype</replaceable>;
 	notify-source ( <replaceable>ipv4_address</replaceable> | * ) <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;
@@ -467,8 +454,6 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 
 	zone-statistics <replaceable>boolean</replaceable>;
 	key-directory <replaceable>quoted_string</replaceable>;
-	zero-no-soa-ttl <replaceable>boolean</replaceable>;
-	zero-no-soa-ttl-cache <replaceable>boolean</replaceable>;
 
 	allow-v6-synthesis { <replaceable>address_match_element</replaceable>; ... }; // obsolete
 	fetch-glue <replaceable>boolean</replaceable>; // obsolete
@@ -496,13 +481,10 @@ zone <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 	delegation-only <replaceable>boolean</replaceable>;
 	check-names ( fail | warn | ignore );
 	check-mx ( fail | warn | ignore );
-	check-integrity <replaceable>boolean</replaceable>;
-	check-mx-cname ( fail | warn | ignore );
-	check-srv-cname ( fail | warn | ignore );
+	integrity-check <replaceable>boolean</replaceable>;
 	dialup <replaceable>dialuptype</replaceable>;
 	ixfr-from-differences <replaceable>boolean</replaceable>;
 	journal <replaceable>quoted_string</replaceable>;
-	zero-no-soa-ttl <replaceable>boolean</replaceable>;
 
 	allow-query { <replaceable>address_match_element</replaceable>; ... };
 	allow-transfer { <replaceable>address_match_element</replaceable>; ... };
@@ -513,7 +495,6 @@ zone <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
 		( name | subdomain | wildcard | self ) <replaceable>string</replaceable>
 		<replaceable>rrtypelist</replaceable>; ...
 	};
-	update-check-ksk <replaceable>boolean</replaceable>;
 
 	notify <replaceable>notifytype</replaceable>;
 	notify-source ( <replaceable>ipv4_address</replaceable> | * ) <optional> port ( <replaceable>integer</replaceable> | * ) </optional>;

bin/named/named.conf.html

@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005 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.23 2006/03/06 02:23:19 marka Exp $ -->
+<!-- $Id: named.conf.html,v 1.1.2.21 2005/10/13 02:53:02 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -31,7 +31,7 @@
 <div class="cmdsynopsis"><p><code class="command">named.conf</code> </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525900"></a><h2>DESCRIPTION</h2>
+<a name="id2525897"></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="id2525928"></a><h2>ACL</h2>
+<a name="id2525925"></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="id2525944"></a><h2>KEY</h2>
+<a name="id2525941"></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
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2525963"></a><h2>MASTERS</h2>
+<a name="id2525960"></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,13 +75,12 @@ masters
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526009"></a><h2>SERVER</h2>
+<a name="id2526006"></a><h2>SERVER</h2>
 <div class="literallayout"><p><br>
 server ( <em class="replaceable"><code>ipv4_address[<span class="optional">/prefixlen</span>]</code></em> | <em class="replaceable"><code>ipv6_address[<span class="optional">/prefixlen</span>]</code></em> ) {<br>
 	bogus <em class="replaceable"><code>boolean</code></em>;<br>
 	edns <em class="replaceable"><code>boolean</code></em>;<br>
 	edns-udp-size <em class="replaceable"><code>integer</code></em>;<br>
-	max-udp-size <em class="replaceable"><code>integer</code></em>;<br>
 	provide-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
 	request-ixfr <em class="replaceable"><code>boolean</code></em>;<br>
 	keys <em class="replaceable"><code>server_key</code></em>;<br>
@@ -97,7 +96,7 @@ server
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526077"></a><h2>TRUSTED-KEYS</h2>
+<a name="id2526071"></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>
@@ -105,7 +104,7 @@ trusted-keys
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526103"></a><h2>CONTROLS</h2>
+<a name="id2526097"></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>
@@ -117,7 +116,7 @@ controls
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526138"></a><h2>LOGGING</h2>
+<a name="id2526132"></a><h2>LOGGING</h2>
 <div class="literallayout"><p><br>
 logging {<br>
 	channel <em class="replaceable"><code>string</code></em> {<br>
@@ -135,7 +134,7 @@ logging
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526177"></a><h2>LWRES</h2>
+<a name="id2526170"></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>
@@ -148,7 +147,7 @@ lwres
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526218"></a><h2>OPTIONS</h2>
+<a name="id2526212"></a><h2>OPTIONS</h2>
 <div class="literallayout"><p><br>
 options {<br>
 	avoid-v4-udp-ports { <em class="replaceable"><code>port</code></em>; ... };<br>
@@ -219,9 +218,7 @@ options
 	check-names ( master | slave | response )<br>
 		( fail | warn | ignore );<br>
 	check-mx ( fail | warn | ignore );<br>
-	check-integrity <em class="replaceable"><code>boolean</code></em>;<br>
-	check-mx-cname ( fail | warn | ignore );<br>
-	check-srv-cname ( fail | warn | ignore );<br>
+	integrity-check <em class="replaceable"><code>boolean</code></em>;<br>
 	cache-file <em class="replaceable"><code>quoted_string</code></em>;<br>
 	suppress-initial-notify <em class="replaceable"><code>boolean</code></em>; // not yet implemented<br>
 	preferred-glue <em class="replaceable"><code>string</code></em>;<br>
@@ -229,15 +226,13 @@ options
 		( <em class="replaceable"><code>quoted_string</code></em> [<span class="optional">port <em class="replaceable"><code>integer</code></em></span>] |<br>
 		<em class="replaceable"><code>ipv4_address</code></em> [<span class="optional">port <em class="replaceable"><code>integer</code></em></span>] |<br>
 		<em class="replaceable"><code>ipv6_address</code></em> [<span class="optional">port <em class="replaceable"><code>integer</code></em></span>] ); ...<br>
-	};<br>
+	}<br>
 	edns-udp-size <em class="replaceable"><code>integer</code></em>;<br>
-	max-udp-size <em class="replaceable"><code>integer</code></em>;<br>
 	root-delegation-only [<span class="optional"> exclude { <em class="replaceable"><code>quoted_string</code></em>; ... } </span>];<br>
 	disable-algorithms <em class="replaceable"><code>string</code></em> { <em class="replaceable"><code>string</code></em>; ... };<br>
 	dnssec-enable <em class="replaceable"><code>boolean</code></em>;<br>
 	dnssec-lookaside <em class="replaceable"><code>string</code></em> trust-anchor <em class="replaceable"><code>string</code></em>;<br>
 	dnssec-must-be-secure <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>boolean</code></em>;<br>
-	dnssec-accept-expired <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	empty-server <em class="replaceable"><code>string</code></em>;<br>
 	empty-contact <em class="replaceable"><code>string</code></em>;<br>
@@ -252,7 +247,6 @@ options
 	allow-transfer { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 	allow-update { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 	allow-update-forwarding { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
-	update-check-ksk <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	notify <em class="replaceable"><code>notifytype</code></em>;<br>
 	notify-source ( <em class="replaceable"><code>ipv4_address</code></em> | * ) [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
@@ -292,8 +286,6 @@ options
 <br>
 	zone-statistics <em class="replaceable"><code>boolean</code></em>;<br>
 	key-directory <em class="replaceable"><code>quoted_string</code></em>;<br>
-	zero-no-soa-ttl <em class="replaceable"><code>boolean</code></em>;<br>
-	zero-no-soa-ttl-cache <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	allow-v6-synthesis { <em class="replaceable"><code>address_match_element</code></em>; ... }; // obsolete<br>
 	deallocate-on-exit <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
@@ -311,7 +303,7 @@ options
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2526931"></a><h2>VIEW</h2>
+<a name="id2526908"></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>
@@ -365,9 +357,7 @@ view
 	check-names ( master | slave | response )<br>
 		( fail | warn | ignore );<br>
 	check-mx ( fail | warn | ignore );<br>
-	check-integrity <em class="replaceable"><code>boolean</code></em>;<br>
-	check-mx-cname ( fail | warn | ignore );<br>
-	check-srv-cname ( fail | warn | ignore );<br>
+	integrity-check <em class="replaceable"><code>boolean</code></em>;<br>
 	cache-file <em class="replaceable"><code>quoted_string</code></em>;<br>
 	suppress-initial-notify <em class="replaceable"><code>boolean</code></em>; // not yet implemented<br>
 	preferred-glue <em class="replaceable"><code>string</code></em>;<br>
@@ -377,13 +367,12 @@ view
 		<em class="replaceable"><code>ipv6_address</code></em> [<span class="optional">port <em class="replaceable"><code>integer</code></em></span>] ); ...<br>
 	};<br>
 	edns-udp-size <em class="replaceable"><code>integer</code></em>;<br>
-	max-udp-size <em class="replaceable"><code>integer</code></em>;<br>
 	root-delegation-only [<span class="optional"> exclude { <em class="replaceable"><code>quoted_string</code></em>; ... } </span>];<br>
 	disable-algorithms <em class="replaceable"><code>string</code></em> { <em class="replaceable"><code>string</code></em>; ... };<br>
 	dnssec-enable <em class="replaceable"><code>boolean</code></em>;<br>
 	dnssec-lookaside <em class="replaceable"><code>string</code></em> trust-anchor <em class="replaceable"><code>string</code></em>;<br>
+<br>
 	dnssec-must-be-secure <em class="replaceable"><code>string</code></em> <em class="replaceable"><code>boolean</code></em>;<br>
-	dnssec-accept-expired <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	empty-server <em class="replaceable"><code>string</code></em>;<br>
 	empty-contact <em class="replaceable"><code>string</code></em>;<br>
@@ -398,7 +387,6 @@ view
 	allow-transfer { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 	allow-update { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 	allow-update-forwarding { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
-	update-check-ksk <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	notify <em class="replaceable"><code>notifytype</code></em>;<br>
 	notify-source ( <em class="replaceable"><code>ipv4_address</code></em> | * ) [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
@@ -438,8 +426,6 @@ view
 <br>
 	zone-statistics <em class="replaceable"><code>boolean</code></em>;<br>
 	key-directory <em class="replaceable"><code>quoted_string</code></em>;<br>
-	zero-no-soa-ttl <em class="replaceable"><code>boolean</code></em>;<br>
-	zero-no-soa-ttl-cache <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	allow-v6-synthesis { <em class="replaceable"><code>address_match_element</code></em>; ... }; // obsolete<br>
 	fetch-glue <em class="replaceable"><code>boolean</code></em>; // obsolete<br>
@@ -449,7 +435,7 @@ view
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527397"></a><h2>ZONE</h2>
+<a name="id2527358"></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>
@@ -466,13 +452,10 @@ zone
 	delegation-only <em class="replaceable"><code>boolean</code></em>;<br>
 	check-names ( fail | warn | ignore );<br>
 	check-mx ( fail | warn | ignore );<br>
-	check-integrity <em class="replaceable"><code>boolean</code></em>;<br>
-	check-mx-cname ( fail | warn | ignore );<br>
-	check-srv-cname ( fail | warn | ignore );<br>
+	integrity-check <em class="replaceable"><code>boolean</code></em>;<br>
 	dialup <em class="replaceable"><code>dialuptype</code></em>;<br>
 	ixfr-from-differences <em class="replaceable"><code>boolean</code></em>;<br>
 	journal <em class="replaceable"><code>quoted_string</code></em>;<br>
-	zero-no-soa-ttl <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	allow-query { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
 	allow-transfer { <em class="replaceable"><code>address_match_element</code></em>; ... };<br>
@@ -483,7 +466,6 @@ zone
 		( name | subdomain | wildcard | self ) <em class="replaceable"><code>string</code></em><br>
 		<em class="replaceable"><code>rrtypelist</code></em>; ...<br>
 	};<br>
-	update-check-ksk <em class="replaceable"><code>boolean</code></em>;<br>
 <br>
 	notify <em class="replaceable"><code>notifytype</code></em>;<br>
 	notify-source ( <em class="replaceable"><code>ipv4_address</code></em> | * ) [<span class="optional"> port ( <em class="replaceable"><code>integer</code></em> | * ) </span>];<br>
@@ -533,12 +515,12 @@ zone
 </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527817"></a><h2>FILES</h2>
+<a name="id2527772"></a><h2>FILES</h2>
 <p><code class="filename">/etc/named.conf</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2527829"></a><h2>SEE ALSO</h2>
+<a name="id2527784"></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>,
       <span class="citerefentry"><span class="refentrytitle">BIND 9 Administrator Reference Manual</span></span>.

bin/named/named.docbook

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.11 2005/07/19 04:55:21 marka Exp $ -->
+<!-- $Id: named.docbook,v 1.7.18.4 2005/07/19 05:55:43 marka Exp $ -->
 <refentry id="man.named">
   <refentryinfo>
     <date>June 30, 2000</date>

bin/named/named.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.html,v 1.17 2005/10/13 03:13:58 marka Exp $ -->
+<!-- $Id: named.html,v 1.6.18.11 2005/10/13 02:53:01 marka Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

bin/named/notify.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: notify.c,v 1.33 2005/04/29 00:22:29 marka Exp $ */
+/* $Id: notify.c,v 1.30.18.3 2005/04/29 00:15:26 marka Exp $ */
 
 #include <config.h>
 

bin/named/query.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005  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.282 2006/03/03 00:43:34 marka Exp $ */
+/* $Id: query.c,v 1.257.18.20 2005/11/30 03:44:38 marka Exp $ */
 
 /*! \file */
 
@@ -1914,8 +1914,6 @@ query_addrdataset(ns_client_t *client, dns_name_t *fname,
 		rdataset->attributes |= dns_order_find(client->view->order,
 						       fname, rdataset->type,
 						       rdataset->rdclass);
-	rdataset->attributes |= DNS_RDATASETATTR_LOADORDER;
-
 	if (NOADDITIONAL(client))
 		return;
 
@@ -2362,21 +2360,13 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig,
 
 static isc_boolean_t
 verify(dst_key_t *key, dns_name_t *name, dns_rdataset_t *rdataset,
-       dns_rdata_t *rdata, isc_mem_t *mctx, isc_boolean_t acceptexpired)
+       dns_rdata_t *rdata, isc_mem_t *mctx)
 {
 	isc_result_t result;
 	dns_fixedname_t fixed;
-	isc_boolean_t ignore = ISC_FALSE;
-
 	dns_fixedname_init(&fixed);
-	
-again:
-	result = dns_dnssec_verify2(name, rdataset, key, ignore, mctx,
-				    rdata, NULL);
-	if (result == DNS_R_SIGEXPIRED && acceptexpired) {
-		ignore = ISC_TRUE;
-		goto again;
-	}
+	result = dns_dnssec_verify2(name, rdataset, key, ISC_FALSE,
+				    mctx, rdata, NULL);
 	if (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD)
 		return (ISC_TRUE);
 	return (ISC_FALSE);
@@ -2416,8 +2406,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name,
 		do {
 			if (!get_key(client, db, &rrsig, &keyrdataset, &key))
 				break;
-			if (verify(key, name, rdataset, &rdata, client->mctx,
-				   client->view->acceptexpired)) {
+			if (verify(key, name, rdataset, &rdata, client->mctx)) {
 				dst_key_free(&key);
 				dns_rdataset_disassociate(&keyrdataset);
 				mark_secure(client, db, name, rdataset,
@@ -3054,7 +3043,7 @@ do { \
  *	ISC_R_NOTIMPLEMENTED	The rdata is not a known address type.
  */
 static isc_result_t
-rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
+rdata_tonetaddr(dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
 	struct in_addr ina;
 	struct in6_addr in6a;
 
@@ -3080,7 +3069,7 @@ rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
  * sortlist statement.
  */
 static int
-query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) {
+query_sortlist_order_2element(dns_rdata_t *rdata, void *arg) {
 	isc_netaddr_t netaddr;
 
 	if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS)
@@ -3093,7 +3082,7 @@ query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) {
  * of a 1-element top-level sortlist statement.
  */
 static int
-query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) {
+query_sortlist_order_1element(dns_rdata_t *rdata, void *arg) {
 	isc_netaddr_t netaddr;
 
 	if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS)
@@ -3109,7 +3098,7 @@ static void
 setup_query_sortlist(ns_client_t *client) {
 	isc_netaddr_t netaddr;
 	dns_rdatasetorderfunc_t order = NULL;
-	const void *order_arg = NULL;
+	void *order_arg = NULL;
 
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 	switch (ns_sortlist_setup(client->view->sortlist,
@@ -3446,7 +3435,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 	/*
 	 * First we must find the right database.
 	 */
-	options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
+	options = 0;
 	if (dns_rdatatype_atparent(qtype) &&
 	    !dns_name_equal(client->query.qname, dns_rootname))
 		options |= DNS_GETDB_NOEXACT;
@@ -3876,8 +3865,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		 * the containing zone of an arbitrary name with a stub
 		 * resolver and not have it cached.
 		 */
-		if (qtype == dns_rdatatype_soa &&
-		    dns_zone_getzeronosoattl(zone))
+		if (qtype == dns_rdatatype_soa)
 			result = query_addsoa(client, db, version, ISC_TRUE);
 		else
 			result = query_addsoa(client, db, version, ISC_FALSE);
@@ -4001,8 +3989,6 @@ 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:
 		/*
@@ -4120,8 +4106,6 @@ 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:
 		/*