Correct a remote denial-of-service attack in named(8).

procfs_fpregs.c 1.11.2.4, procfs_regs.c 1.10.2.4,
    procfs_rlimit.c 1.5.2.1, procfs_status.c 1.20.2.5, uio.h 1.11.2.2,
    linprocfs_misc.c 1.3.2.9.
Correct several integer underflows/overflows in procfs and linprocfs.

Makefile.inc1

@@ -508,7 +508,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; cvs -q update -rRELENG_4 -P -d
+	cd ${.CURDIR}; cvs -q update -rRELENG_4_4 -P -d
 .endif
 
 #

UPDATING

@@ -1,13 +1,187 @@
-Updating Information for FreeBSD STABLE users
+Updating Information for FreeBSD STABLE users, 4.4 security branch
 
 This file is maintained and copyrighted by M. Warner Losh
 <[email protected]>.  Please send new entries directly to him.  See end
 of file for further details.  For commonly done items, please see the
-COMMON ITEMS: section later in the file.
+COMMON ITEMS: section later in the file.  A reverse chronology since
+4.0 was released is included, followed by the common items quick
+how-tos, followed by entries for versions of -current prior to 4.0
+Release.
 
-A reverse chronology since 4.0 was released is included, followed by
-the common items quick how-tos, followed by entries for versions of
--current prior to 4.0 Release.
+This is for the 4.4 release branch.  All entries since 4.4 are an
+itemized list of commits to this branch, numbered from the beginning.
+
+The security advisories related to various patches contain information
+on how to build/install a minimal set of binaries and start/stop a
+minimal number of processes, if possible, for that patch.  For those
+updates that don't have an advisory, or to be safe, you can do a full
+build and install as described in the COMMON ITEMS section.
+
+20031126:	p47	FreeBSD-SA-03:19.bind
+	Corrected remote denial-of-service vulnerability in named(8).
+
+20031003:	p46	FreeBSD-SA-03:17.procfs
+	Correct integer underflows/overflows in procfs(5) and linprocfs(5).
+
+20031002:	p45	FreeBSD-SA-03:16.filedesc
+	Correct a reference counting bug in readv(2).
+
+20030924:	p44	FreeBSD-SA-03:14.arp
+	Updated fix for arplookup bug.
+
+20030923:	p43	FreeBSD-SA-03:14.arp
+	Fix a bug in arplookup(), whereby a hostile party on a locally
+	attached network could exhaust kernel memory, and cause a system
+	panic, by sending a flood of spoofed ARP requests.
+
+20030917:	p42	FreeBSD-SA-03:13.sendmail
+	Fix another address parsing buffer overflow.
+
+20030916:	p41	FreeBSD-SA-03:12.openssh
+	Follow-up fixes for OpenSSH oversized packet buffer handling.
+
+20030916:	p40	FreeBSD-SA-03:12.openssh
+	OpenSSH oversized packet buffer handling corrected.
+
+20030810:	p39	FreeBSD-SA-03:10.iBCS2
+	iBCS2 system call translator for statfs leaked information.
+
+20030810:	p38	FreeBSD-SA-03:09.signal
+	Repair range-checking errors in signal handling.
+
+20030804:	p37	FreeBSD-SA-03:08.realpath
+	Correct a single byte buffer overflow in realpath(3).
+
+20030405:	p36	FreeBSD-SA-03:05.xdr
+	integer overflow errors in the Sun XDR library.
+
+20030329:	p35	FreeBSD-SA-03:07.sendmail
+	sendmail address parsing buffer overflow.
+
+20030304:	p34	FreeBSD-SA-03:01.cvs
+	Patch for cvs server vulnerabilities.
+
+20030303:	p33	FreeBSD-SA-03:04.sendmail
+	sendmail header parsing buffer overflow, ident parsing bug.
+
+20030107:	p32	FreeBSD-SA-02:44.filedesc
+	Correct a reference counting bug in fpathconf(2).
+
+20021122:	p31	FreeBSD-SA-02:42.resolv
+	Correct a resolver overrun.
+
+20021113:	p30	FreeBSD-SA-02:43.bind
+	Correct name server vulnerabilities.
+	
+20021026:	p29	FreeBSD-SA-02:41.smrsh
+	smrsh bypass bug.
+
+20021023:	p28	FreeBSD-SA-02:40.kadmind
+	Correct kadmind buffer overflow.
+
+20020911:	p27	FreeBSD-SA-02:39.libkvm
+	The kvm_openfiles/kvm_open functions now mark the returned file
+	descriptors close-on-exec in case set-user-ID/set-group-ID
+	applications are careless.
+
+20020813:	p26	FreeBSD-SA-02:38.signed-error
+	Bounds checking errors in accept(), getsockname(),
+	getpeername(), and a VESA ioctl() command were corrected.
+
+20020805:	p25	FreeBSD-SA-02:33.openssl
+	Correct a bug in the ASN.1 decoder which was introduced with
+	the recent OpenSSL update.
+
+20020805:	p24	FreeBSD-SA-02:37.kqueue
+	Registering an EVFILT_WRITE event on a pipe whose far end had
+	already been closed would cause a kernel panic.
+
+20020801:	p23	FreeBSD-SA-02:36.nfs
+	RPCs with zero-length payload would cause an infinite loop.
+
+20020801:	p22	FreeBSD-SA-02:34.rpc
+	The original fix applied to the XDR decoder was in error.
+
+20020731:	p21	FreeBSD-SA-02:35.ffs
+	A bounds checking error in FFS filesize limits was corrected.
+
+20020731:	p20	FreeBSD-SA-02:33.openssl
+	Upgrade to OpenSSL 0.9.6e.
+
+20020731:	p19	FreeBSD-SA-02:34.rpc
+	A bounds checking error in the XDR decoder was corrected.
+
+20020730:	p18	FreeBSD-SA-02:32.pppd
+	A race condition in pppd(8) was corrected.
+
+20020730:	p17	FreeBSD-SA-02:23.stdio.v1.2
+	A bug in the previous patch for the vulnerability described
+	in FreeBSD-SA-02:23.stdio was found and corrected.
+
+20020715:	p16
+	Upgrade to BIND 8.3.3
+
+20020712:	p15	FreeBSD-SA-02:29.tcpdump
+	A buffer overflow in tcpdump has been corrected.
+
+20020711:	p15	FreeBSD-SA-02:30.ktrace
+	Prevent users from tracing previously privileged processes.
+
+20020626:	p14	FreeBSD-SA-02:28.resolv
+	A fix for a buffer overflow in libc has been corrected.
+
+20020528:	p13	FreeBSD-SA-02:27.rc
+	Dangerous globbing in /etc/rc.
+
+20020515:	p12
+	The k5su utility installed as part of Kerberos 5 is no longer
+	Installed with the set-user-ID bit set by default.  Add
+	ENABLE_SUID_K5SU=yes to /etc/make.conf to have it installed
+	with the set-user-ID bit set.
+
+20020421:	p11	FreeBSD-SA-02:23.stdio
+	When exec'ing set[ug]id executables, the kernel now ensures that the
+	stdio file descriptors (0..2) are open.
+
+20020316:	p10	FreeBSD-SA-02:22.mmap
+	mmap/msync bug which can panic the kernel.
+	TCP broadcast connection bug.
+
+20020307:	p9	FreeBSD-SA-02:13.openssh
+	OpenSSH off-by-one bug.
+
+20020223:	p8	FreeBSD-SA-02:18.zlib
+	zlib inflate error handling.
+	bzip2 updated to fix insecure permissions during symlink dereferencing
+	and a race condition while creating new files.
+
+20020127:	p7
+	sdiff temp file handling.
+
+20020127:	p6
+	gzip temp file handling.
+	
+20020127:	p5
+	The standard-supfile should track the branch.  There won't be
+	a security advisory for this.
+
+20020123:	p4	FreeBSD-SA-02:08.exec
+	There's a small window in exec where one could debug a setuid
+	program and obtain elevated priviledges.  This was corrected.
+
+20020117:	p3	FreeBSD-SA-02:07.k5su
+	k5su fixes.
+
+20011221:	p2	FreeBSD-SA-02:02.pw
+	A bug was fixed wherein the pw(8) command created a short-lived
+	but world-readable copy of /etc/master.passwd.
+
+20011202:	p1	FreeBSD-SA-01:63.openssh
+	A security hole in OpenSSH involving `UseLogin yes' has been
+	patched.
+
+20010915:
+	FreeBSD 4.4-RELEASE.
 
 20010814:
 	The pci attachment for pcic device was merged from current.  You

contrib/bind/CHANGES

@@ -1,4 +1,529 @@
-	--- 8.2.4-REL released --- (Wed May  9 14:36:23 PDT 2001)
+1469.	[bug]		buffer length calculation for PX was wrong.
+
+1468.	[bug]		ns_name_ntol() could overwite a zero length buffer.
+
+1467.	[bug]		off by one bug in ns_makecannon().
+
+1466.	[bug]		large ENDS UDP buffer size could trigger a assertion.
+
+1465.	[bug]		possible NULL pointer dereference in db_sec.c
+
+1464.	[bug]      	the buffer used to construct the -ve record was not
+			big enough for all possible SOA records.  use pointer
+			arithmetic to calculate the remaining size in this
+			buffer.
+
+1463.	[bug]		use serial space arithmetic to determine if a SIG is
+			too old, in the future or has internally constistant
+			times.
+
+1462.	[bug]		write buffer overflow in make_rr().
+
+	--- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002)
+
+1301.	[func]		log attempts to exploit #1300.
+
+1300.	[bug]		Remote buffer overrun.
+
+1299.	[func]		Log to xfer-in when a named-xfer fails and one of
+			the masters returned REFUSED.
+
+1298.	[bug]		named could leak a OPT record when returning a
+			negative response.
+
+1297.	[func]		'ndc restart' will now attempt to preserve the
+			arguments named was started with.
+			Use 'ndc restart --' to clear the arguements.
+			Use 'ndc restart <new arguements>' to restart named
+			with a alternate set of arguements.
+
+1296.	[bug]		delay setting need_restart until the response to
+			ndc exec has been sent.
+			
+1295.	[func]		new ndc command 'args'.  returns the arguements that
+			named was started with %xx escaped.
+
+1294.	[bug]		#1272 broke linkage for those OS's using -lfl (flex).
+			Move -ll/-lfl to LIBL for all platforms.
+
+	--- 8.3.2-REL released --- (Mon Jun 17 20:24:32 PDT 2002)
+
+1293.	[doc]		update man pages for 'dig', 'dnsquery' and 'host'
+			to reflect IPv6 capabilities (nslookup and nsupdate
+			were already IPv4/IPv6 agnostic).
+
+1292.	[func]		host: the default lookups now also include AAAA
+			records.
+
+1291.	[func]		'dig -x <ip6>' now works.
+
+1290.	[bug]		'dig @server' fail to report the IPv6 address of the
+			server in error messages.
+
+1289.	[contrib]	normalize_zone now handles $TTL.
+
+1288.	[bug]		named: -t and -w could not be used together.
+
+1287.	[func]		report serial(s) in out going transfer operation.
+
+	--- 8.3.2-RC1 released --- (Thu May 30 23:06:11 PDT 2002)
+
+1286.	[func]		libbind: no longer attempts bit string labels for
+			IPv6 reverse resolution.  Try IP6.ARPA then IP6.INT
+			for nibble style resolution.
+
+1285.	[port]		linux: ss_family vs __ss_family in sockaddr_storage.
+
+1284.	[port]		freebsd: 5.0 uses gid_t rather that int for 
+			GETGROUPLIST_ARGS
+
+1283.	[port]		bsdi: 4.2 also has struct sockaddr_storage.
+
+1282.	[bug]		nslookup was using inet_ntoa() to print out a IPv6
+			address.
+
+1281.	[bug]		escape '(' and ')' when coverting to presentation
+			form.
+
+1280.	[func]		server { edns yes_or_no; } is now supported.
+
+1279.	[bug]		nslookup: partial coversion to similar style outputs
+			for both -type=aaaa and -type=a.
+
+1278.	[bug]		free() of non-malloced memory in nslookup.
+
+1277.	[port]		cast all instances of yytext in commands.l to (char*)
+			to silence compilers on OS's where lex declares it
+			as (unsigned char *).
+
+1276.	[port]		hpux 11.22: ansify GetAnswer in getinfo.c to
+			silence compiler.
+
+1275.	[bug]		bad declaration of si in tsig_key_from_addr().
+
+1274.	[port]		hpux 11.22: ansify hexstring() and display() in
+			addr.c to silence compiler.
+
+1273.	[bug]		const pointer conficts in res_debug.c.
+
+1272.	[port]		hpux 11.22: don't link against -ll unless required.
+
+1272.	[bug]		main_need_num was not last entry in enum.
+			main_need_tick nolonger required.
+
+1271.	[port]		hpux: treat all hpux systems as BIG_ENDIAN, don't
+			include <sys/mbuf.h>.
+			
+1270.	[port]		hpux 11.22 namespace clash DATASIZE -> BIND_DATASIZE.
+
+1269.	[port]		hpux 11.11 interface scaning.
+
+1268.	[port]		solaris: 64 bit binary compatability.
+
+1267.	[bug]		aix4: missing IN6_IS_ADDR_V4COMPAT macro.
+
+1266.	[bug]		If you are using TSIG #1261 introduced the potential
+			of a infinite loop.
+
+1265.	[bug]		nslookup failed on platforms that don't have BSD 43
+			style sockets.
+
+1264.	[bug]		LINK_INIT and UNLINK were not compatible with
+			C++, use LINK_INIT_TYPE and UNLINK_TYPE instead.
+
+	--- 8.3.2-T1B released --- (Tue May  7 18:49:58 PDT 2002)
+
+1263.	[bug]		gethostans() could get out of sync parsing the
+			response if there was a very long CNAME chain.
+
+1262.	[bug]		winnt: dumpdb and stats should now work reliably.
+
+1261.	[bug]		using a valid TSIG with a compressed ownername could
+			result a INSIST() failure.
+
+1260.	[func]		"notify explicit;" from BIND 9.
+
+1259.	[misc]		leave the verification of the OPT options to the
+			caller.
+
+1258.	[func]		accept SOA MNAME field as legitimate additional
+			data.
+
+1257.	[bug]		malformed response to query w/ tsig + edns.
+
+1256.	[port]		darwin: probe for IPv6 support.
+
+1255.	[bug]		xfers_running could become out of sync if a zone
+			was removed while it was being transfered.
+
+1254.	[func]		nsupdate can now update IPv6 servers.
+
+1253.	[func]		host now accepts IPv6 addresses.
+
+1253.	[bug]		reserve space for the signature when performing a
+			zone transfer.
+
+1252.	[func]		dnsquery now accepts IPv6 addresses.
+
+1251.	[bug]		win32: it was possible to call RegCloseKey() on a
+			invalid key.
+
+1250	[func]		nslookup now accepts IPv6 addresses.
+
+1249.	[func]		dig now accepts IPv6 addresses.
+
+1248.	[doc]		correct some typos in named.conf.5 and corresponding
+			html.
+
+1247.	[bug]		get_salen() IPv6 support was broken for OSs w/o sa_len.
+
+1246.	[support]	add highly dangerous compile time option
+			NXDOMAIN_ON_DENIAL.  it should not be used
+			except in testing.
+
+1245.	[bug]		if we don't have enough file descriptors to open
+			a socket attempt to close a idle tcp client.
+
+1244.	[port]		bsdi: 4.3 has struct sockaddr_storage.
+
+1243.	[bug]		SERVFAIL can have too many other causes to be used
+			say whether a server supports EDNS or not.
+
+1242.	[port]		64k answer buffers were causing stack space to be
+			exceeded for certian OS.  Use heap space instead.
+
+1241.	[bug]		getnameinfo() failed to lookup IPv4 mapped /
+			compatible addresses.
+
+1340.	[bug]		reference after free for included conf file name.
+
+1339.	[bug]		doaddinfo would not always attempt to fetch missing
+			glue when it should have.
+
+1338.	[bug]		an IPv6 only nameserver could generate spurious
+			sysquery errors.
+
+1337.	[port]		linux: IN6ADDR_LOOPBACK_INIT, IN6ADDR_ANY_INIT and
+			sockaddr_storage not declared by early kernels.
+
+1336.	[bug]		getaddrinfo() could call freeaddrinfo() with an
+			invalid pointer.
+
+1335.	[bug]		res_nupdate() failed to update the name servers
+			addresses before sending the update.
+
+1334.	[bug]		A6 is expected in the additional section.
+
+	--- 8.3.1-REL released --- (Thu Jan 31 21:28:59 PST 2002)
+
+1333.   [bug]           cached NXDOMAIN/NODATA responses were being ignored
+			when when fetching missing additional data.
+
+1332.	[func]		"allow-query" is now supported for forward zones.
+			#define FORWARD_ALLOWS in bin/named/named.h to enable.
+
+1331.	[bug]		rrsetadd() should explictly attach to the databuf
+			rather than inheriting the reference count.
+
+1330.	[bug]		potential reference after free.
+
+1329.	[port]		linux: ensure that CC is correctly propgated to
+			probe_ipv6.
+
+1328.	[port]		linux: res_init.c failed to compile on certian older
+			machines.
+
+1327.	[contrib]	add mysqlBind reference.
+
+1326.	[bug]		named-xfer could incorrectly report a fopen() failure
+			as a fdopen() failure.
+
+1325.	[bug]		if fdopen() failed empty files could be left behind.
+
+1324.	[bug]		certian bad delegations could result in a DNS storm.
+
+	--- 8.3.0-REL released --- (Fri Jan 11 04:00:00 PST 2002)
+
+1323.	[bug]		don't assume statp->_u._ext.ext is valid unless
+			RES_INIT is set when calling res_*init().
+
+1322.	[bug]		call res_ndestroy() if RES_INIT is set when
+			res_*init() is called.
+
+1321.	[cleanup]	YPKLUDGE in no longer default.
+
+1320.	[port]		winnt: namespace collision #undef the system's EV_ERR.
+
+1319.	[port]		winnt: make __res_nopt() visible externally.
+
+1318.	[port]		Tru64 UNIX V5.1 can return spurious EINVAL on
+			close() after connect() failure.
+
+1317.	[bug]		NULL used where zero was required.
+
+	--- 8.3.0-RC2 released --- (Wed Jan  2 17:14:23 PST 2002)
+
+1316.	[bug]		memory leak when a ixfr update or a re-applied update
+			was rejected.
+
+1315.	[bug]		the wrong options level check-names value was used
+			when merging ixfr updates.
+
+1314.	[bug]		corrupt update / ixfr updates should result in
+			merge errors being reported.
+
+1313.	[bug]		set current_serial in db_ixfr.c:ixfr_getdelta().
+
+1312.	[bug]		use serial space arithmetic when selecting deltas for
+			IXFR.
+
+1311.	[contrib]	mdnkit update to 2.2.3
+
+1310.	[bug]		TSIG signed IXFR's wern't correctly verified.
+
+1309.	[port]		winnt: re-order fclose/unlink so that the unlink
+			succeeds.
+
+1308.	[doc]		miscellaneous nroff fixes.
+
+1307.	[func]		preferred-glue can now be used to partially order
+			the additional section.
+
+1306.	[bug]		It was possible to trigger an INSIST failure with
+			certian EDNS responses.
+
+1305.	[bug]		named-xfer could return a false up-to-date status.
+
+1304.	[bug]		"named-xfer -x" didn't attempt to use the specified
+			address for all possible masters if earlier connects
+			failed. 
+
+1303.	[contrib]	nslint upgraded from 2.0.2 to 2.1a3 (by author).
+
+1302.	[bug]		res_nametotype() and res_nametoclass() were broken.
+
+1301.	[bug]		"ndc reload zone" without class was broken.
+
+1300.	[port]		Tru64 UNIX 5.1 does not like __align as a element name.
+
+1299.	[bug]		host failed to handle "." in search list correctly.
+
+1298.	[bug]		max-ixfr-log-size default was unreasonable.
+
+1297.	[bug]		read buffer overflows.
+
+1296.	[protocol]	NAPTR additional section processing.
+
+	--- 8.3.0-RC1 released --- (Wed Nov 21 20:41:32 PST 2001)
+
+1295.	[bug]		be more aggressive at dropping messages from certian
+			well known ports.
+
+1294.	[bug]		hint zones and root stub zones were not being removed
+			correctly.
+
+1293.	[port]		MPE/iX workaround recvfrom() not supporting larger
+			address buffers required for IPv6.
+
+1292.	[bug]		memory leak: free_flushset().
+
+1291.	[func]		accept and generate EDNS0 queries.
+
+1290.	[func]		allow initial notifies on startup to be suppressed.
+			[Kenneth Karoliussen, [email protected]]
+
+1289.	[func]		allow keys to be specified in the masters clause.
+
+1288.	[func]		named-xfer report if response was signed.
+
+1287.	[bug]		named-xfer could report false TSIG failures under
+			certian conditions.
+			
+1286.	[bug]		don't allow rtt estimates to drop to zero.
+
+1285.	[bug]		non-answering servers rtt estimates were not always
+			penalised.
+
+1284.	[bug]		struct __res_state was still broken after #1265.
+
+1283.	[port]		addition platform support for _r functions.
+
+1282.	[port]		pw->pw_class is platform dependant.
+
+1281.	[port]		namespace collision: dprintf -> res_dprintf,
+			ERR -> EV_ERR, OK -> EV_OK.
+
+1280.	[cleanup]	gai_strerror() re-written.
+
+1279.   [bug]           non-glue was not being reported on reload.
+
+1278.	[bug]		Remove the INSIST at the end if zone_maint().
+
+1277.	[func]		hostname.bind/txt/chaos now returns the name of
+			the machine hosting the nameserver.  This is useful
+			in diagnosing problems with anycast servers.
+
+1276.	[bug]		dns_ho.c:add_hostent() was not returning the amount
+			of memory consumed resulting in garbage address
+			being returned.  Alignment calculations were
+			wasting space.  We wern't suppressing duplicate
+			addresses.
+
+1275.	[port]		sunos: old sprintf.
+
+1274.	[port]		MPE/iX C.70
+
+1273.	[bug]		host was sorting multiple RRs into the wrong order
+			prior to verifying.
+
+	--- 8.3.0-T2A released --- (Thu Sep 27 18:15:00 PDT 2001)
+
+1272.	[bug]		"ndc trace 0" should behave like "ndc notrace".
+
+1271.	[func]		inet_{cidr,net}_{pton,ntop}() now have IPv6 support.
+
+1270.	[bug]		AXFR style IXFR responses were not handled properly,
+			transfer-format single-answer.
+
+1269.	[bug]		misc: more string format fixes, open va_end(),
+			call exit() with positive values, include <string.h>.
+
+1268.	[func]		Resolver, dig: "DNSSEC OK" (DO) support.
+
+1267.	[port]		HP e3000 MPE is big-endian.
+
+1266.	[func]		dig +[no]tr: use relative names when printing
+			out a zone transfer ([NO]TRuncate).
+
+1265.	[bug]		struct __res_state to large on 64 bit arch.
+
+1264.	[port]		winnt: pass the root zone as "." to named-xfer
+			rather than "".
+
+1263.	[port]		#1227 broke sunos.
+
+1262.	[func]		log type as well as class for denied queries.
+
+1261.	[bug]		get*by*() failed to check if res_init() had been
+			called.
+
+1260.	[func]		resolver option: no-tld-query.  disables trying
+			unqualified as a tld.  no_tld_query is also supported
+			for FreeBSD compatability.
+
+1259.	[func]		enable NOADDITIONAL code by default.
+
+1258.	[func]		treat class ANY as class IN for access control for
+			non-xfr queries.
+
+1257.	[func]		increase nameserver chaining distance from 1 to 3
+			(NS_MAX_DISTANCE).
+
+1256.	[bug]		increased loop avoidance with well known ports.
+
+1255.	[bug]		cached NXDOMAIN responses were being ignored when
+			selecting servers to query.
+			
+1254.	[support]	improved support for parallel make.
+
+1253.	[port]		winnt: support for change #1218
+
+1252.	[port]		winnt: the stat structure does not have st_blksize.
+
+1251.	[bug]		AXFR style IXFR responses were not handled properly.
+
+1250.	[doc]		document support-ixfr.
+
+1249.	[func]		add support gcc's format string checking.
+
+1248.	[bug]		string formats.
+
+1247.	[bug]		dig -t axfr attempted to use UDP not TCP.
+
+1246.	[doc]		miscellaneous nroff fixes.
+
+1245.	[port]		winnt: named-xfer failures.  improved recvfrom()
+			emulation.
+
+1244.	[port]		winnt: bug in tracking "file" file descriptors
+			extend "file" file descriptors support to 2048.
+
+1243.	[cleanup]	defining REPORT_ERRORS in lib/dst caused compile time
+			errors.
+
+1242.	[bug]		inet_pton() failed to reject octal input.
+
+1241.	[bug]		memory leaks: zone forwarder table, server key list,
+			global forwarder table, query tsig info, unused
+			channels, key names, xfr tsig info. 
+
+1240.	[bug]		restore message if ns_forw() fails.
+
+1239.	[bug]		call res_ndestroy() in net_data_destroy().
+
+1238.	[func]		named-bootconf now supports HP's "no-round-robin".
+
+1237.	[bug]		buffer overrun, access mode read.
+
+1236.	[bug]		ignore white space after address of nameserver.
+
+1235.	[port]		solaris 2.4: use ioctl(FIONBIO) rather than fcntl().
+
+	--- 8.3.0-T1A released --- (Wed Jun 20 19:05:01 PDT 2001)
+
+1234.	[bug]		memory leak with "use-id-pool no;".
+
+1233.	[func]		res_setservers(), res_getservers().
+
+1232.	[bug]		don't assume the forwarder has dropped bogus records.
+
+1231.	[bug]		always restart a query if we dropped records when
+			parsing.
+
+1230.	[func]		report the address the server learnt the record from
+			in lame server messages.
+
+1229.	[func]		opaque rdata support for unknown types.
+
+1228.	[protocol]	IXFR don't test for AA, don't check that the question
+			is returned.
+
+1227.	[port]		solaris: sys_nerr and sys_errlist do not exist when
+			compiling in 64 bit mode.
+
+1226.	[placeholder]
+
+1225.	[bug]		don't send cross class additional records.
+
+1224.	[bug]		use after realloc(), non portable pointer arithmetic in 
+			grmerge().
+
+1223.	[bug]		allow all KEY records in parent zone at bottom of zone
+			cut.
+
+1222.	[bug]		HMAC-MD5 key files are now mode 0600.
+
+1221.	[port]		aix: 4.3.3.0 (4.3.2.0?) and later have strndup().
+
+1220.	[port]		winnt: isc_movefile() and syslog() updated.
+
+1219.	[bug]		winnt: zone transfers could fail.
+
+1218.	[func]		add IPv6 transport support to the resolver from the
+			KAME project.  Includes initial bitstring support.
+
+1217.	[bug]		#1186 broke the command-line programs that relied on
+			the fact that HMAC-MD5 keys have keyid 0.
+
+1216.	[bug]		#1180 completely broke inet_nsap_addr(),
+			inet_nsap_ntoa() still didn't emit the leading 0x.
+
+1215.	[bug]		long UNIX domain control socket names were not being
+			printed in full.
+
+1214.	[bug]		getrgnam()/getgrgid() leaked memory.
+
+1213.	[bug]		#1199 introduced a reference after free bug.
 
 1212.	[bug]		some function declarations wern't protected by
 			__BEGIN_DECL/__END_DECL in resolv.h.
@@ -9,7 +534,8 @@
 
 1209.	[port]		winnt: issues.
 
-	--- 8.2.4-T2B released --- (Thu May  3 05:48:14 PDT 2001)
+1208.	[func]		close "dynamic" file channels when debug is set to
+			zero allowing them to be removed and re-opened.
 
 1207.	[contrib]	new h2n from author.
 
@@ -23,10 +549,21 @@
 
 1202.	[bug]		memory leak: dynamic update was leaking.
 
+1201.	[bug]		ISO/IEC 9945-1 versions of getpwuid_r(), getpwnam_r(),
+		 	getgrgid_r() and getgrnam_r() were not ISO/IEC 9945-1
+			compliant.
+
 1200.	[bug]		memory leak: when following CNAMES from of req_query().
 
 1199.	[bug]		memory leak: when defining keys.
 
+1198.	[func]		reference count all databuf activity.
+
+1197.	[func]		deallocate-on-exit yes; will call abort() if there
+			is still active memory.
+
+1196.	[func]		memactive(): report if there is still active memory.
+
 1195.	[bug]		memory leak: include in named.conf leaked file name.
 
 1194.	[port]		MPE/IX port updated by Mark Bixby of the

contrib/bind/INSTALL

@@ -203,6 +203,10 @@ Operating System Notes
 
 		Read src/port/next/README.FIRST before trying to build.
 
+	MPE/iX	IPv6 is *not* supported. src/port/mpe/recvfrom.c needs to
+		be re-written to support IPv6 if and when the OS supports
+		IPv6.
+
 	Certain older versions of FreeBSD, NetBSD and BSD/OS
 
 		These systems have a /bin/sh based on "ash", which doesn't

contrib/bind/Makefile

@@ -1,4 +1,4 @@
-## Copyright (c) 1996,1999 by Internet Software Consortium, Inc.
+## Copyright (c) 1996,1999 by Internet Software Consortium.
 ##
 ## Permission to use, copy, modify, and distribute this software for any
 ## purpose with or without fee is hereby granted, provided that the above
@@ -15,57 +15,10 @@
 
 # $Id: Makefile,v 8.52 2000/11/21 12:54:37 marka Exp $
 
-# This is just for making distributions.  For the real Makefile, cd src.
+TOP=
+SUBDIRS= include port lib bin
 
-all clean depend: FRC
-	@echo go to the ./src directory, you cannot make '"'$@'"' here.
-	@false
-
-tar: bind-doc.tar.gz bind-src.tar.gz bind-contrib.tar.gz
-
-pgp: bind-doc.tar.gz.asc bind-src.tar.gz.asc bind-contrib.tar.gz.asc
-
-bind-doc.tar.gz: Makefile
-	cd doc/bog; make clean file.psf file.lst
-	cd doc/man; make clean all
-	cd doc/man; make MANROFF="groff -t" OUT_EXT=psf clean all
-	tar cf - Makefile doc | gzip > bind-doc.tar.gz
-	cd doc/man; make clean
-	cd doc/man; make MANROFF="groff -t" OUT_EXT=psf clean
-
-bind-src.tar.gz: Makefile
-	cd src; make distclean
-	cd src/bin/nslookup; make commands.c
-	cd src/bin/named; make ns_parser.c
-	tar cf - Makefile src | gzip > bind-src.tar.gz
-
-bind-contrib.tar.gz: Makefile
-	tar cf - Makefile contrib | gzip > bind-contrib.tar.gz
-
-bind-doc.tar.gz.asc: bind-doc.tar.gz
-	rm -f bind-doc.tar.gz.asc
-	pgp -u [email protected] -sba bind-doc.tar.gz
-	chmod o+r bind-doc.tar.gz.asc
-
-bind-src.tar.gz.asc: bind-src.tar.gz
-	rm -f bind-src.tar.gz.asc
-	pgp -u [email protected] -sba bind-src.tar.gz
-	chmod o+r bind-src.tar.gz.asc
-
-bind-contrib.tar.gz.asc: bind-contrib.tar.gz
-	rm -f bind-contrib.tar.gz.asc
-	pgp -u [email protected] -sba bind-contrib.tar.gz
-	chmod o+r bind-contrib.tar.gz.asc
-
-noesw: src/Version src/lib/Makefile src/lib/dst/Makefile \
-	src/lib/cylink/. src/lib/dnssafe/.
-	perl -pi.BAK -e 's/$$/-NOESW/' src/Version
-	perl -pi.BAK -e 's/ cylink dnssafe//' src/lib/Makefile
-	perl -pi.BAK -e 's:-I../cylink::' src/lib/dst/Makefile
-	perl -pi.BAK -e 's:-I../dnssafe::' src/lib/dst/Makefile
-	perl -pi.BAK -e 's/-DCYLINK_DSS//' src/lib/dst/Makefile
-	perl -pi.BAK -e 's/-DDNSSAFE//' src/lib/dst/Makefile
-	rm -rf src/lib/cylink src/lib/dnssafe
+SH=sh
 
 default: all
 

contrib/bind/README

@@ -10,9 +10,31 @@ artifacts including BIND, INN, and DHCP.
 Note that BIND 8 is in "end-of-life", having been replaced by BIND 9.  See
 http://www.isc.org/ for more details.
 
+BIND 8.3.3 Highlights
+	Security Fix libbind. All applications linked against libbind
+	need to relinked.
+	'rndc restart' now preserves named's arguements
+
+BIND 8.3.2 Highlights
+	dig, nslookup, host and nsupdate have improved IPv6 support.
+
+BIND 8.3.1 Highlights
+	Critical bug fix to prevent DNS storms. If you have BIND 8.3.0 you
+	need to upgrade.
+
+BIND 8.3.0 Highlights
+	IPv6 transport support in resolver (from KAME).
+	Opaque rdata support.
+	EDNS0 support.
+	Glue ordering to help non-ENDS0 aware clients (servers) cope with
+	larger responses as a result of IPv6 by allowing A records to be added
+	first to the additional section.  IPv6 capable clients are expected to
+	use EDNS0 to allow larger responses to be sent.
+	Bug Fixes, includes BIND 8.2.5 changes.
+
 BIND 8.2.4 Highlights
 	NSAP processing was not RFC 1706 compliant. NOTE: OLD MASTER FILES
-	NEED TO BE CORRECTED (0x added to NSAP) AND CACHE FILES REMOVED.
+	NEED TO BE CORRECTED AND CACHE FILES REMOVED.
 	Fixes long-standing protocol incompatibility in DNSSEC support.
 	Avoids fwd'ing to root name servers if response will be rejected.
 	new port/cygwin contributed by [email protected].

contrib/bind/Version

@@ -1 +1 @@
-8.2.4-REL
+8.3.3-REL-p1

contrib/bind/bin/Makefile

@@ -13,7 +13,7 @@
 ## ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 ## SOFTWARE.
 
-# $Id: Makefile,v 8.30 2000/12/23 08:02:48 vixie Exp $
+# $Id: Makefile,v 8.31 2001/08/14 05:57:57 marka Exp $
 
 DESTDIR=
 CC= cc
@@ -64,10 +64,10 @@ CPPFLAGS= -I${PORTINCL} -I${INCL}
 SUBDIRS = addr nslookup dig dnsquery host named named-xfer ndc nsupdate \
 	mkservdb irpd dnskeygen named-bootconf
 
-all: ${SUBDIRS}
-
-${SUBDIRS}: FRC
-	@(cd $@; pwd; ${MAKE} ${MARGS}) || exit 1
+all: 
+	@for x in ${SUBDIRS}; do \
+		(cd $$x; pwd; ${MAKE} ${MARGS} $@) || exit 1; \
+	done
 
 install depend tags clean distclean::
 	@for x in ${SUBDIRS}; do \

contrib/bind/bin/addr/addr.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: addr.c,v 8.8 1999/10/13 16:38:55 vixie Exp $";
+static const char rcsid[] = "$Id: addr.c,v 8.9 2002/05/21 02:26:21 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -47,11 +47,7 @@ usage() {
 
 /* Warning: this scribbles on `dst' even if it's going to return `0'. */
 static int
-hexstring(src, dst, len)
-	const char *src;
-	u_char *dst;
-	int len;
-{
+hexstring(const char *src, u_char *dst, int len) {
 	static const char xdigits[] = "0123456789abcdef";
 	u_char *ptr = dst, *end = dst + len;
 	u_int val;
@@ -100,12 +96,7 @@ hexstring(src, dst, len)
 }
 
 static void
-display(input, af, addr, len)
-	const char *input;
-	int af;
-	const u_char *addr;
-	int len;
-{
+display(const char *input, int af, const u_char *addr, int len) {
 	static int before = 0;
 	char p[sizeof "xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255"];
 	int i;

contrib/bind/bin/dig/dig.c

@@ -1,5 +1,5 @@
 #ifndef lint
-static const char rcsid[] = "$Id: dig.c,v 8.46 2001/04/01 17:35:01 vixie Exp $";
+static const char rcsid[] = "$Id: dig.c,v 8.57 2002/06/18 02:26:49 marka Exp $";
 #endif
 
 /*
@@ -172,7 +172,6 @@ static const char rcsid[] = "$Id: dig.c,v 8.46 2001/04/01 17:35:01 vixie Exp $";
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <resolv.h>
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -181,6 +180,8 @@ static const char rcsid[] = "$Id: dig.c,v 8.46 2001/04/01 17:35:01 vixie Exp $";
 
 #include "port_after.h"
 
+#include <resolv.h>
+
 #include "../nslookup/res.h"
 
 /* Global. */
@@ -188,9 +189,15 @@ static const char rcsid[] = "$Id: dig.c,v 8.46 2001/04/01 17:35:01 vixie Exp $";
 #define VERSION 83
 #define VSTRING "8.3"
 
-#define PRF_DEF		0x2ff9
-#define PRF_MIN		0xA930
-#define PRF_ZONE        0x24f9
+#define PRF_DEF		(RES_PRF_STATS | RES_PRF_CMD | RES_PRF_QUES | \
+			 RES_PRF_ANS | RES_PRF_AUTH | RES_PRF_ADD | \
+			 RES_PRF_HEAD1 | RES_PRF_HEAD2 | RES_PRF_TTLID | \
+			 RES_PRF_HEADX | RES_PRF_REPLY | RES_PRF_TRUNC)
+#define PRF_MIN		(RES_PRF_QUES | RES_PRF_ANS | RES_PRF_HEAD1 | \
+			 RES_PRF_HEADX | RES_PRF_REPLY | RES_PRF_TRUNC)
+#define PRF_ZONE        (RES_PRF_STATS | RES_PRF_CMD | RES_PRF_QUES | \
+			 RES_PRF_ANS | RES_PRF_AUTH | RES_PRF_ADD | \
+			 RES_PRF_TTLID | RES_PRF_REPLY | RES_PRF_TRUNC)
 
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256
@@ -203,9 +210,10 @@ static int		eecode = 0;
 static FILE *		qfp;
 static char		*defsrv, *srvmsg;
 static char		defbuf[40] = "default -- ";
-static char		srvbuf[60];
+static char		srvbuf[1024];
 static char		myhostname[MAXHOSTNAMELEN];
 static struct sockaddr_in myaddress;
+static struct sockaddr_in6 myaddress6;
 static u_int32_t	ixfr_serial;
 
 /* stuff for nslookup modules */
@@ -219,7 +227,7 @@ int		queryType, queryClass;
 extern int	StringToClass(), StringToType();	/* subr.c */
 #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD)
 FILE		*yyin = NULL;
-void		yyrestart(FILE *f) { }
+void		yyrestart(FILE *f) { UNUSED(f); }
 #endif
 char		*pager = NULL;
 /* end of nslookup stuff */
@@ -237,13 +245,14 @@ static int		print_axfr(FILE *output, const u_char *msg,
 static struct timeval	difftv(struct timeval, struct timeval);
 static void		prnttime(struct timeval);
 static void		stackarg(char *, char **);
+static void		reverse6(char *, struct in6_addr *);
 
 /* Public. */
 
 int
 main(int argc, char **argv) {
-	struct hostent *hp;
 	short port = htons(NAMESERVER_PORT);
+	short lport;
 	/* Wierd stuff for SPARC alignment, hurts nothing else. */
 	union {
 		HEADER header_;
@@ -281,6 +290,8 @@ main(int argc, char **argv) {
 	int wait=0, delay;
 	int envset=0, envsave=0;
 	struct __res_state res_x, res_t;
+	int r;
+	struct in6_addr in6;
 
 	ns_tsig_key key;
 	char *keyfile = NULL, *keyname = NULL;
@@ -296,6 +307,14 @@ main(int argc, char **argv) {
 	myaddress.sin_family = AF_INET;
 	myaddress.sin_addr.s_addr = INADDR_ANY;
 	myaddress.sin_port = 0; /*INPORT_ANY*/;
+
+#ifdef HAVE_SA_LEN
+	myaddress6.sin6_len = sizeof(struct sockaddr_in6);
+#endif
+	myaddress6.sin6_family = AF_INET6;
+	myaddress6.sin6_addr = in6addr_any;
+	myaddress6.sin6_port = 0; /*INPORT_ANY*/;
+
 	defsrv = strcat(defbuf, inet_ntoa(res.nsaddr.sin_addr));
 	res_x = res;
 
@@ -448,13 +467,21 @@ main(int argc, char **argv) {
 						printf("; no arg for -t?\n");
 					else if ((tmp = atoi(*argv))
 					    || *argv[0]=='0') {
-						queryType = tmp;
-						qtypeSet++;
+						if (ns_t_xfr_p(tmp)) {
+							xfr = tmp;
+						} else {
+							queryType = tmp;
+							qtypeSet++;
+						}
 					} else if ((tmp = StringToType(*argv,
 								      0, NULL)
 						   ) != 0) {
-						queryType = tmp;
-						qtypeSet++;
+						if (ns_t_xfr_p(tmp)) {
+							xfr = tmp;
+						} else {
+							queryType = tmp;
+							qtypeSet++;
+						}
 					} else {
 						printf(
 						   "; invalid type specified\n"
@@ -470,6 +497,11 @@ main(int argc, char **argv) {
 						printf("; no arg for -x?\n");
 						break;
 					}
+					r = inet_pton(AF_INET6, addrc, &in6);
+					if (r > 0) {
+						reverse6(domain, &in6);
+						break;
+					}
 					addrend = addrc + strlen(addrc);
 					if (*addrend == '.')
 						*addrend = '\0';
@@ -484,7 +516,7 @@ main(int argc, char **argv) {
 					break;
 				case 'p':
 					if (argv[0][2] != '\0')
-						port = ntohs(atoi(argv[0]+2));
+						port = htons(atoi(argv[0]+2));
 					else if (*++argv == NULL)
 						printf("; no arg for -p?\n");
 					else
@@ -516,14 +548,19 @@ main(int argc, char **argv) {
 						a = *argv;
 					if ((p = strchr(a, ':')) != NULL) {
 						*p++ = '\0';
-						myaddress.sin_port =
-							ntohs(atoi(p));
-					}
-					if (!inet_aton(a,&myaddress.sin_addr)){
+						lport = htons(atoi(p));
+					} else
+						lport = htons(0);
+					if (inet_pton(AF_INET6, a,
+					      &myaddress6.sin6_addr) == 1) {
+					      myaddress6.sin6_port = lport;
+					} else if (!inet_aton(a,
+						   &myaddress.sin_addr)) {
 						fprintf(stderr,
 							";; bad -b addr\n");
 						exit(1);
-					}
+					} else
+						myaddress.sin_port = lport;
 				    }
 				    break;
 				case 'k':
@@ -735,82 +772,113 @@ main(int argc, char **argv) {
 		srvbuf[0] = 0;
 		srvmsg = defsrv;
 		if (srv != NULL) {
-			struct in_addr addr;
+			int nscount = 0;
+			union res_sockaddr_union u[MAXNS];
+			struct addrinfo *answer = NULL;
+			struct addrinfo *cur = NULL;
+			struct addrinfo hint;
 
-			if (inet_aton(srv, &addr)) {
-				res.nscount = 1;
-				res.nsaddr.sin_addr = addr;
-				srvmsg = strcat(srvbuf, srv);
-			} else {
-				res_t = res;
-				res_ninit(&res);
-				res.pfcode = 0;
-				res.options = RES_DEFAULT;
-				hp = gethostbyname(srv);
+			memset(u, 0, sizeof(u));
+			res_t = res;
+			res_ninit(&res);
+			res.pfcode = 0;
+			res.options = RES_DEFAULT;
+			memset(&hint, 0, sizeof(hint));
+			hint.ai_socktype = SOCK_DGRAM;
+			if (!getaddrinfo(srv, NULL, &hint, &answer)) {
 				res = res_t;
-				if (hp == NULL
-				    || hp->h_addr_list == NULL
-				    || *hp->h_addr_list == NULL) {
-					fflush(stdout);
-					fprintf(stderr,
+				cur = answer;
+				for (cur = answer;
+				     cur != NULL;
+				     cur = cur->ai_next) {
+					if (nscount == MAXNS)
+						break;
+					switch (cur->ai_addr->sa_family) {
+					case AF_INET6:
+						u[nscount].sin6 =
+					  *(struct sockaddr_in6*)cur->ai_addr;
+						u[nscount++].sin6.sin6_port =
+							port;
+						break;
+					case AF_INET:
+						u[nscount].sin =
+					   *(struct sockaddr_in*)cur->ai_addr;
+						u[nscount++].sin6.sin6_port =
+							port;
+						break;
+					}
+				}
+				if (nscount != 0) {
+					char buf[80];
+					res_setservers(&res, u, nscount);
+					srvmsg = strcat(srvbuf, srv);
+					strcat(srvbuf, "  ");
+					buf[0] = '\0';
+					switch (u[0].sin.sin_family) {
+					case AF_INET:
+						inet_ntop(AF_INET,
+							  &u[0].sin.sin_addr,
+							  buf, sizeof(buf));
+						break;
+					case AF_INET6:
+						inet_ntop(AF_INET6,
+							  &u[0].sin6.sin6_addr,
+							  buf, sizeof(buf));
+						break;
+					}
+					strcat(srvbuf, buf);
+				}
+				freeaddrinfo(answer);
+			} else {
+				res = res_t;
+				fflush(stdout);
+				fprintf(stderr,
 		"; Bad server: %s -- using default server and timer opts\n",
 						srv);
-					fflush(stderr);
-					srvmsg = defsrv;
-					srv = NULL;
-				} else {
-					u_int32_t **addr;
-
-					res.nscount = 0;
-					for (addr = (u_int32_t**)hp->h_addr_list;
-					     *addr && (res.nscount < MAXNS);
-					     addr++) {
-						res.nsaddr_list[
-							res.nscount++
-						].sin_addr.s_addr = **addr;
-					}
-
-					srvmsg = strcat(srvbuf,srv);
-					strcat(srvbuf, "  ");
-					strcat(srvmsg,
-					       inet_ntoa(res.nsaddr.sin_addr));
-				}
+				fflush(stderr);
+				srvmsg = defsrv;
+				srv = NULL;
 			}
 			printf("; (%d server%s found)\n",
 			       res.nscount, (res.nscount==1)?"":"s");
 			res.id += res.retry;
 		}
 
-		{
-			int i;
-
-			for (i = 0;  i < res.nscount;  i++) {
-				res.nsaddr_list[i].sin_family = AF_INET;
-				res.nsaddr_list[i].sin_port = port;
-			}
-			res.id += res.retry;
-		}
-
 		if (ns_t_xfr_p(xfr)) {
 			int i;
-
+			int nscount;
+			union res_sockaddr_union u[MAXNS];
+			nscount = res_getservers(&res, u, MAXNS);
 			for (i = 0; i < res.nscount; i++) {
 				int x;
 
 				if (keyfile)
 					x = printZone(xfr, domain,
-						      &res.nsaddr_list[i],
+						      &u[i].sin,
 						      &key);
 				else
 					x = printZone(xfr, domain,
-						      &res.nsaddr_list[i],
+						      &u[i].sin,
 						      NULL);
 				if (res.pfcode & RES_PRF_STATS) {
+					char buf[80];
 					exectime = time(NULL);
+					buf[0] = '\0';
+					switch (u[i].sin.sin_family) {
+					case AF_INET:
+						inet_ntop(AF_INET,
+							  &u[i].sin.sin_addr,
+							  buf, sizeof(buf));
+						break;
+					case AF_INET6:
+						inet_ntop(AF_INET6,
+							  &u[i].sin6.sin6_addr,
+							  buf, sizeof(buf));
+						break;
+					}
 					printf(";; FROM: %s to SERVER: %s\n",
 					       myhostname,
-					       inet_ntoa(res.nsaddr_list[i]
-							 .sin_addr));
+					       buf);
 					printf(";; WHEN: %s", ctime(&exectime));
 				}
 				if (!x)
@@ -832,6 +900,7 @@ main(int argc, char **argv) {
 		if (n < 0) {
 			fflush(stderr);
 			printf(";; res_nmkquery: buffer too small\n\n");
+			fflush(stdout);
 			continue;
 		}
 		if (queryType == T_IXFR) {
@@ -857,6 +926,13 @@ main(int argc, char **argv) {
 			bytes_out = n = cpp - packet;
 		};	
 
+#if defined(RES_USE_EDNS0) && defined(RES_USE_DNSSEC)
+		if (n > 0 &&
+		    (res.options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0)
+			bytes_out = n = res_nopt(&res, n, packet,
+						 sizeof(packet), 4096);
+#endif
+
 		eecode = 0;
 		if (res.pfcode & RES_PRF_HEAD1)
 			fp_resstat(&res, stdout);
@@ -954,14 +1030,15 @@ where:	server,\n\
 	d-opt	is of the form ``+keyword=value'' where keyword is one of:\n\
 		[no]debug [no]d2 [no]recurse retry=# time=# [no]ko [no]vc\n\
 		[no]defname [no]search domain=NAME [no]ignore [no]primary\n\
-		[no]aaonly [no]cmd [no]stats [no]Header [no]header\n\
+		[no]aaonly [no]cmd [no]stats [no]Header [no]header [no]trunc\n\
 		[no]ttlid [no]cl [no]qr [no]reply [no]ques [no]answer\n\
-		[no]author [no]addit pfdef pfmin pfset=# pfand=# pfor=#\n\
+		[no]author [no]addit [no]dnssec pfdef pfmin\n\
+		pfset=# pfand=# pfor=#\n\
 ", stderr);
 	fputs("\
 notes:	defname and search don't work; use fully-qualified names.\n\
 	this is DiG version " VSTRING "\n\
-	$Id: dig.c,v 8.46 2001/04/01 17:35:01 vixie Exp $\n\
+	$Id: dig.c,v 8.57 2002/06/18 02:26:49 marka Exp $\n\
 ", stderr);
 }
 
@@ -1000,6 +1077,10 @@ setopt(const char *string) {
 		res.options |= RES_DEFNAMES;
 	} else if (strncmp(option, "nodef", 5) == 0) {
 		res.options &= ~RES_DEFNAMES;
+	} else if (strncmp(option, "dn", 2) == 0) {	/* dnssec */
+		res.options |= RES_USE_DNSSEC;
+	} else if (strncmp(option, "nodn", 4) == 0) {
+		res.options &= ~RES_USE_DNSSEC;
 	} else if (strncmp(option, "sea", 3) == 0) {	/* search list */
 		res.options |= RES_DNSRCH;
 	} else if (strncmp(option, "nosea", 5) == 0) {
@@ -1075,6 +1156,10 @@ setopt(const char *string) {
 		res.pfcode |= RES_PRF_TTLID;
 	} else if (strncmp(option, "nott", 4) == 0) {  
 		res.pfcode &= ~RES_PRF_TTLID;
+	} else if (strncmp(option, "tr", 2) == 0) {  /* TTL & ID */
+		res.pfcode |= RES_PRF_TRUNC;
+	} else if (strncmp(option, "notr", 4) == 0) {  
+		res.pfcode &= ~RES_PRF_TRUNC;
 	} else if (strncmp(option, "he", 2) == 0) {  /* head flags stats */
 		res.pfcode |= RES_PRF_HEAD2;
 	} else if (strncmp(option, "nohe", 4) == 0) {  
@@ -1191,14 +1276,14 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 	static int answerLen = 0;
 
 	querybuf buf;
-	int msglen, amtToRead, numRead, result = 0, sockFD, len;
+	int msglen, amtToRead, numRead, result, sockFD, len;
 	int count, type, class, rlen, done, n;
-	int numAnswers = 0, numRecords = 0, soacnt = 0;
+	int numAnswers, numRecords, soacnt;
 	u_char *cp, tmp[NS_INT16SZ];
 	char dname[2][NS_MAXDNAME];
 	enum { NO_ERRORS, ERR_READING_LEN, ERR_READING_MSG, ERR_PRINTING }
-		error = NO_ERRORS;
-	pid_t zpid;
+		error;
+	pid_t zpid = -1;
 	u_char *newmsg;
 	int newmsglen;
 	ns_tcp_tsig_state tsig_state;
@@ -1291,24 +1376,56 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 		perror(";; socket");
 		return (e);
 	}
-	if (bind(sockFD, (struct sockaddr *)&myaddress, sizeof myaddress) < 0){
-		int e = errno;
+	
+	switch (sin->sin_family) {
+	case AF_INET:
+		if (bind(sockFD, (struct sockaddr *)&myaddress,
+			 sizeof myaddress) < 0){
+			int e = errno;
 
-		fprintf(stderr, ";; bind(%s:%u): %s\n",
-			inet_ntoa(myaddress.sin_addr),
-			ntohs(myaddress.sin_port),
-			strerror(e));
-		(void) close(sockFD);
-		sockFD = -1;
-		return (e);
-	}
-	if (connect(sockFD, (struct sockaddr *)sin, sizeof *sin) < 0) {
-		int e = errno;
+			fprintf(stderr, ";; bind(%s:%u): %s\n",
+				inet_ntoa(myaddress.sin_addr),
+				ntohs(myaddress.sin_port),
+				strerror(e));
+			(void) close(sockFD);
+			sockFD = -1;
+			return (e);
+		}
+		if (connect(sockFD, (const struct sockaddr *)sin,
+			    sizeof *sin) < 0) {
+			int e = errno;
 
-		perror(";; connect");
-		(void) close(sockFD);
-		sockFD = -1;
-		return (e);
+			perror(";; connect");
+			(void) close(sockFD);
+			sockFD = -1;
+			return (e);
+		}
+		break;
+	case AF_INET6:
+		if (bind(sockFD, (struct sockaddr *)&myaddress6,
+			 sizeof myaddress6) < 0){
+			int e = errno;
+			char buf[80];
+
+			fprintf(stderr, ";; bind(%s:%u): %s\n",
+				inet_ntop(AF_INET6, &myaddress6.sin6_addr,
+					  buf, sizeof(buf)),
+				ntohs(myaddress6.sin6_port),
+				strerror(e));
+			(void) close(sockFD);
+			sockFD = -1;
+			return (e);
+		}
+		if (connect(sockFD, (const struct sockaddr *)sin,
+			    sizeof(struct sockaddr_in6)) < 0) {
+			int e = errno;
+
+			perror(";; connect");
+			(void) close(sockFD);
+			sockFD = -1;
+			return (e);
+		}
+		break;
 	}
 
 	/*
@@ -1325,7 +1442,8 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 		(void) close(sockFD);
 		sockFD = -1;
 		return (e);
-	}
+	} else if (key)
+		free (newmsg);
 
 	/*
 	 * If we're compressing, push a gzip into the pipeline.
@@ -1336,8 +1454,6 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 
 		if (pipe(z) < 0) {
 			int e = errno;
-			if (key)
-				free (newmsg);
 
 			perror(";; pipe");
 			(void) close(sockFD);
@@ -1347,8 +1463,6 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 		zpid = vfork();
 		if (zpid < 0) {
 			int e = errno;
-			if (key)
-				free (newmsg);
 
 			perror(";; fork");
 			(void) close(sockFD);
@@ -1370,6 +1484,11 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 		(void) dup2(z[rd], sockFD);
 		(void) close(z[rd]);
 	}
+	result = 0;
+	numAnswers = 0;
+	numRecords = 0;
+	soacnt = 0;
+	error = NO_ERRORS;
 
 	dname[0][0] = '\0';
 	for (done = 0; !done; (void)NULL) {
@@ -1538,10 +1657,6 @@ printZone(ns_type xfr, const char *zone, const struct sockaddr_in *sin,
 		       WCOREDUMP(status) ? 't' : 'f');
 	}
 
-	/* XXX This should probably happen sooner than here */
-	if (key)
-		free (newmsg);
-
 	switch (error) {
 	case NO_ERRORS:
 		return (0);
@@ -1604,9 +1719,12 @@ print_axfr(FILE *file, const u_char *msg, size_t msglen) {
 			fprintf(file, "$ORIGIN %s.\n", origin);
 			if (strcmp(name, ".") == 0)
 				strcpy(origin, name);
-			strcpy(name_ctx, "@");
+			if (res.pfcode & RES_PRF_TRUNC)
+				strcpy(name_ctx, "@");
 		}
-		if (ns_sprintrr(&handle, &rr, name_ctx, origin,
+		if (ns_sprintrr(&handle, &rr,
+				(res.pfcode & RES_PRF_TRUNC) ? name_ctx : NULL,
+				(res.pfcode & RES_PRF_TRUNC) ? origin : NULL,
 				buf, sizeof buf) < 0) {
 			fprintf(file, ";; ns_sprintrr: %s\n", strerror(errno));
 			return (FORMERR);
@@ -1665,3 +1783,24 @@ stackarg(char *l, char **y) {
 		}
 	}
 }
+
+static void
+reverse6(char *domain, struct in6_addr *in6) {
+	sprintf(domain, "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa",
+		in6->s6_addr[15] & 0x0f, (in6->s6_addr[15] >> 4) & 0x0f,
+		in6->s6_addr[14] & 0x0f, (in6->s6_addr[14] >> 4) & 0x0f,
+		in6->s6_addr[13] & 0x0f, (in6->s6_addr[13] >> 4) & 0x0f,
+		in6->s6_addr[12] & 0x0f, (in6->s6_addr[12] >> 4) & 0x0f,
+		in6->s6_addr[11] & 0x0f, (in6->s6_addr[11] >> 4) & 0x0f,
+		in6->s6_addr[10] & 0x0f, (in6->s6_addr[10] >> 4) & 0x0f,
+		in6->s6_addr[9] & 0x0f, (in6->s6_addr[9] >> 4) & 0x0f,
+		in6->s6_addr[8] & 0x0f, (in6->s6_addr[8] >> 4) & 0x0f,
+		in6->s6_addr[7] & 0x0f, (in6->s6_addr[7] >> 4) & 0x0f,
+		in6->s6_addr[6] & 0x0f, (in6->s6_addr[6] >> 4) & 0x0f,
+		in6->s6_addr[5] & 0x0f, (in6->s6_addr[5] >> 4) & 0x0f,
+		in6->s6_addr[4] & 0x0f, (in6->s6_addr[4] >> 4) & 0x0f,
+		in6->s6_addr[6] & 0x0f, (in6->s6_addr[3] >> 4) & 0x0f,
+		in6->s6_addr[2] & 0x0f, (in6->s6_addr[2] >> 4) & 0x0f,
+		in6->s6_addr[1] & 0x0f, (in6->s6_addr[1] >> 4) & 0x0f,
+		in6->s6_addr[0] & 0x0f, (in6->s6_addr[0] >> 4) & 0x0f);
+}

contrib/bind/bin/dnskeygen/dnskeygen.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: dnskeygen.c,v 1.11.2.1 2001/04/26 02:56:06 marka Exp $";
+static const char rcsid[] = "$Id: dnskeygen.c,v 1.14 2001/09/25 04:50:14 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -37,7 +37,7 @@ static const char rcsid[] = "$Id: dnskeygen.c,v 1.11.2.1 2001/04/26 02:56:06 mar
 #define PATH_SEP '/'
 #endif
 
-static void usage(char *str, int full);
+static void usage(const char *str, int full);
 
 static short dsa_sizes[] = {512, 576, 640, 704, 768, 832, 896, 960, 1024, 0};
 static char *prog;
@@ -274,9 +274,10 @@ main(int argc, char **argv) {
 }
 
 static void
-usage(char *str, int flag){
+usage(const char *str, int flag) {
 	int i;
-	printf ("\nNo key generated\n");
+
+	printf("\nNo key generated\n");
 	if (*str != '\0')
 		printf("Usage:%s: %s\n",prog, str);
 	printf("Usage:%s -{DHR} <size> [-F] -{zhu} [-ac]  [-p <no>]"
@@ -316,7 +317,5 @@ usage(char *str, int flag){
 		printf("\n");
 	}
 
-	exit (-3);
+	exit (3);
 }
-
-

contrib/bind/bin/dnsquery/dnsquery.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: dnsquery.c,v 8.15 2000/12/23 08:14:32 vixie Exp $";
+static const char rcsid[] = "$Id: dnsquery.c,v 8.19 2002/04/12 03:03:48 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -30,7 +30,6 @@ static const char rcsid[] = "$Id: dnsquery.c,v 8.15 2000/12/23 08:14:32 vixie Ex
 
 #include <errno.h>
 #include <netdb.h>
-#include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,21 +37,54 @@ static const char rcsid[] = "$Id: dnsquery.c,v 8.15 2000/12/23 08:14:32 vixie Ex
 
 #include "port_after.h"
 
+#include <resolv.h>
+
 extern int errno;
 extern int h_errno;
 extern char *h_errlist[];
 
 struct __res_state res;
 
+static int
+newserver(char *srv, union res_sockaddr_union *u, int ns, int max) {
+	struct addrinfo *answer = NULL;
+	struct addrinfo *cur = NULL;
+	struct addrinfo hint;
+	short port = htons(NAMESERVER_PORT);
+
+	memset(&hint, 0, sizeof(hint));
+	hint.ai_socktype = SOCK_DGRAM;
+	if (!getaddrinfo(srv, NULL, &hint, &answer)) {
+		for (cur = answer; cur != NULL; cur = cur->ai_next) {
+			if (ns >= max)
+				break;
+			switch (cur->ai_addr->sa_family) {
+			case AF_INET6:
+				u[ns].sin6 =
+					 *(struct sockaddr_in6*)cur->ai_addr;
+				u[ns++].sin6.sin6_port = port;
+				break;
+			case AF_INET:
+				u[ns].sin = *(struct sockaddr_in*)cur->ai_addr;
+				u[ns++].sin6.sin6_port = port;
+				break;
+			}
+		}
+		freeaddrinfo(answer);
+	} else {
+		fprintf(stderr, "Bad nameserver (%s)\n", srv);
+		exit(1);
+	}
+	return (ns);
+}
+
 int
 main(int argc, char *argv[]) {
 	char name[MAXDNAME];
 	u_char answer[8*1024];
-	int c, n, i = 0;
-	u_int32_t ul;
+	int c, n;
 	int nameservers = 0, class, type, len;
-	struct in_addr q_nsaddr[MAXNS];
-	struct hostent *q_nsname;
+	union res_sockaddr_union q_nsaddr[MAXNS];
 	extern int optind, opterr;
 	extern char *optarg;
 	int stream = 0, debug = 0;
@@ -66,7 +98,7 @@ main(int argc, char *argv[]) {
 	/* if no args, exit */
 	if (argc == 1) {
 		fprintf(stderr, "Usage:  %s [-h] host [-n ns] [-t type] [-c class] [-r retry] [-p period] [-s] [-v] [-d] [-a]\n", argv[0]);
-		exit(-1);
+		exit(1);
 	}
 
 	/* handle args */
@@ -82,7 +114,7 @@ main(int argc, char *argv[]) {
 		case 'h' :	if (strlen(optarg) >= sizeof(name)) {
 					fprintf(stderr,
 						"Domain name too long (%s)\n", optarg);
-					exit(-1);
+					exit(1);
 				} else
 					strcpy(name, optarg);
 				break;
@@ -96,7 +128,7 @@ main(int argc, char *argv[]) {
 					class = proto_class;
 				else {
 				    fprintf(stderr, "Bad class (%s)\n", optarg);
-					exit(-1);
+					exit(1);
 				}
 			    }
 				break;
@@ -110,7 +142,7 @@ main(int argc, char *argv[]) {
 					type = proto_type;
 				else {
 				    fprintf(stderr, "Bad type (%s)\n", optarg);
-					exit(-1);
+					exit(1);
 				}
 			    }
 				break;
@@ -135,37 +167,22 @@ main(int argc, char *argv[]) {
 						fprintf(stderr,
 							"res_ninit() failed\n"
 							);
-						exit(-1);
+						exit(1);
 				}
-				if (nameservers >= MAXNS) break;
-				(void) inet_aton(optarg,
-						 &q_nsaddr[nameservers]);
-				if (!inet_aton(optarg, (struct in_addr *)&ul)){
-					q_nsname = gethostbyname(optarg);
-					if (q_nsname == 0) {
-						fprintf(stderr,
-						       "Bad nameserver (%s)\n",
-							optarg);
-						exit(-1);
-					}
-					memcpy(&q_nsaddr[nameservers],
-					       q_nsname->h_addr, INADDRSZ);
-				}
-				else
-					q_nsaddr[nameservers].s_addr = ul;
-				nameservers++;
+				nameservers = newserver(optarg, q_nsaddr,
+							nameservers, MAXNS);
 				break;
 
 		default : 	fprintf(stderr, 
 				"\tUsage:  %s [-n ns] [-h host] [-t type] [-c class] [-r retry] [-p period] [-s] [-v] [-d] [-a]\n", argv[0]);
-				exit(-1);
+				exit(1);
 		}
 	}
 	if (optind < argc) {
 		if (strlen(argv[optind]) >= sizeof(name)) {
 			fprintf(stderr,
 				"Domain name too long (%s)\n", argv[optind]);
-			exit(-1);
+			exit(1);
 		} else {
 			strcpy(name, argv[optind]);
 		}
@@ -176,7 +193,7 @@ main(int argc, char *argv[]) {
 	if (!(res.options & RES_INIT))
 		if (res_ninit(&res) == -1) {
 			fprintf(stderr, "res_ninit() failed\n");
-			exit(-1);
+			exit(1);
 		}
 
 	/* 
@@ -189,14 +206,8 @@ main(int argc, char *argv[]) {
 	 	res.options |= RES_USEVC;
 
 	/* if the -n flag was used, add them to the resolver's list */
-	if (nameservers != 0) {
-		res.nscount = nameservers;
-		for (i = nameservers - 1; i >= 0; i--) {
-			res.nsaddr_list[i].sin_addr.s_addr = q_nsaddr[i].s_addr;
-			res.nsaddr_list[i].sin_family = AF_INET;
-			res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-	}
+	if (nameservers != 0)
+		res_setservers(&res, q_nsaddr, nameservers);
 
 	/*
 	 * if the -h arg is fully-qualified, use res_query() since
@@ -208,13 +219,13 @@ main(int argc, char *argv[]) {
 		if (n < 0) {
 			fprintf(stderr, "Query failed (h_errno = %d) : %s\n", 
 				h_errno, h_errlist[h_errno]);
-			exit(-1);
+			exit(1);
 		}
 	} else if ((n = res_nsearch(&res, name, class, type,
 				    answer, len)) < 0) {
 		fprintf(stderr, "Query failed (h_errno = %d) : %s\n", 
 			h_errno, h_errlist[h_errno]);
-		exit(-1);
+		exit(1);
 	}
 	res_pquery(&res, answer, n, stdout);
 	exit(0);

contrib/bind/bin/host/host.c

@@ -1,5 +1,5 @@
 #ifndef lint
-static const char rcsid[] = "$Id: host.c,v 8.43.2.2 2001/08/09 14:04:45 marka Exp $";
+static const char rcsid[] = "$Id: host.c,v 8.53 2002/06/18 02:34:02 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -100,7 +100,6 @@ static const char copyright[] =
 
 #include <ctype.h>
 #include <netdb.h>
-#include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -113,13 +112,15 @@ static const char copyright[] =
 
 #include "port_after.h"
 
+#include <resolv.h>
+
 /* Global. */
 
 #ifndef PATH_SEP
 #define PATH_SEP '/'
 #endif
 #define SIG_RDATA_BY_NAME	18
-#define NS_HEADERDATA_SIZE 10
+#define NS_HEADERDATA_SIZE 10	/* type + class + ttl + rdlen */
 
 #define NUMNS		8
 #define NUMNSADDR	16
@@ -185,9 +186,8 @@ static char		getdomain[NS_MAXDNAME];
 
 static int		parsetype(const char *s);
 static int		parseclass(const char *s);
-static void		printanswer(const struct hostent *hp);
 static void		hperror(int errnum);
-static int		addrinfo(struct in_addr addr);
+static int		addrinfo(struct sockaddr_storage *addr);
 static int		gethostinfo(char *name);
 static int		getdomaininfo(const char *name, const char *domain);
 static int		getinfo(const char *name, const char *domain,
@@ -225,12 +225,16 @@ Usage: %s [-adlrwv] [-t querytype] [-c class] host [server]\n\
 
 int
 main(int argc, char **argv) {
-	struct in_addr addr;
+	struct sockaddr_storage addr;
 	struct hostent *hp;
 	char *s;
 	int waitmode = 0;
 	int ncnames, ch;
 	int nkeychains;
+	struct addrinfo *answer = NULL;
+	struct addrinfo *cur = NULL;
+	struct addrinfo hint;
+	int ip = 0;
 
 	dst_init();
 
@@ -292,33 +296,93 @@ main(int argc, char **argv) {
 	if (argc > 1)
 		usage("extra undefined arguments");
 	if (argc == 1) {
+		union res_sockaddr_union u[MAXNS];
+		int nscount;
+
 		s = *argv++;
 		argc--;
 		server_specified++;
+		memset(&hint, 0, sizeof(hint));
+		hint.ai_flags = AI_CANONNAME;
+		hint.ai_family = PF_UNSPEC;
+		hint.ai_socktype = SOCK_DGRAM;
 		
-		if (!inet_aton(s, &addr)) {
-			hp = gethostbyname(s);
-			if (hp == NULL) {
-				fprintf(stderr,
-					"Error in looking up server name:\n");
-				hperror(res.res_h_errno);
-				exit(1);
+		if (!getaddrinfo(s, NULL, &hint, &answer)) {
+			nscount = 0;
+			if (answer->ai_canonname != NULL) {
+				printf("Using domain server:\n");
+				printf("Name: %s\n", answer->ai_canonname);
+				printf("Addresses:");
+			} else
+				printf("Using domain server");
+			
+			for (cur = answer; cur != NULL; cur = cur->ai_next) {
+				char buf[80];
+				struct sockaddr_in6 *sin6;
+				struct sockaddr_in *sin;
+				
+				switch (cur->ai_addr->sa_family) {
+				case AF_INET6:
+					sin6 = 
+					   (struct sockaddr_in6 *)cur->ai_addr;
+					inet_ntop(cur->ai_addr->sa_family,
+					          &sin6->sin6_addr,
+						  buf, sizeof(buf));
+					printf(" %s", buf);
+					if (nscount >= MAXNS)
+						break;
+					u[nscount].sin6 = *sin6;
+					u[nscount++].sin6.sin6_port =
+						htons(NAMESERVER_PORT);
+					break;
+				case AF_INET:
+					sin =
+					     (struct sockaddr_in*)cur->ai_addr;
+					inet_ntop(cur->ai_addr->sa_family,
+					          &sin->sin_addr,
+						  buf, sizeof(buf));
+					printf(" %s", buf);
+					if (nscount >= MAXNS)
+						break;
+					u[nscount].sin = *sin;
+					u[nscount++].sin6.sin6_port =
+						htons(NAMESERVER_PORT);
+					break;
+				}
 			}
-			memcpy(&res.nsaddr.sin_addr, hp->h_addr, NS_INADDRSZ);
-			printf("Using domain server:\n");
-			printanswer(hp);
+			if (nscount != 0) {
+				res_setservers(&res, u, nscount);
+			}
+			if (answer->ai_canonname != NULL)
+				printf("\n\n");
+			else
+				printf(":\n\n");
+			freeaddrinfo(answer);
 		} else {
-			res.nsaddr.sin_family = AF_INET;
-			res.nsaddr.sin_addr = addr;
-			res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-			printf("Using domain server %s:\n",
-			       inet_ntoa(res.nsaddr.sin_addr));
+			fprintf(stderr, "Error in looking up server name:\n");
+			exit(1);
 		}
-		res.nscount = 1;
 		res.retry = 2;
 	}
-	if (strcmp(getdomain, ".") == 0 || !inet_aton(getdomain, &addr))
-		addr.s_addr = INADDR_NONE;
+	memset(&hint, 0, sizeof(hint));
+	hint.ai_flags = AI_NUMERICHOST;
+	hint.ai_socktype = SOCK_DGRAM;
+	if(!getaddrinfo(getdomain, NULL, &hint, &answer)) { 
+		memset(&addr, 0, sizeof(addr));
+		switch (answer->ai_family) {
+		case AF_INET:
+			memcpy(&addr, answer->ai_addr,
+			       sizeof(struct sockaddr_in));
+			ip = 1;
+			break;
+		case AF_INET6:
+			memcpy(&addr, answer->ai_addr,
+			       sizeof(struct sockaddr_in6));
+			ip = 1;
+			break;
+		}
+		freeaddrinfo(answer);
+	} 
 	hp = NULL;
 	res.res_h_errno = TRY_AGAIN;
 /*
@@ -330,7 +394,7 @@ main(int argc, char **argv) {
 		exit(ListHosts(getdomain, querytype ? querytype : ns_t_a));
 	ncnames = 5; nkeychains = 18;
 	while (hp == NULL && res.res_h_errno == TRY_AGAIN) {
-		if (addr.s_addr == INADDR_NONE) {
+		if (!ip) {
 			cname = NULL;
 			hp = (struct hostent *)gethostinfo(getdomain);
 			getdomain[0] = 0; /* clear this query */
@@ -354,7 +418,7 @@ main(int argc, char **argv) {
 					printf ("%s for %s not found, last verified key %s\n",
 						chase_step & SD_SIG ? "Key" : "Signature",
 						chase_step & SD_SIG ? chase_signer : chase_domain, 
-						chase_lastgoodkey ? chase_lastgoodkey : "None");
+						chase_lastgoodkey[0] ? chase_lastgoodkey : "None");
 				}
 			}
 			if (!getdomain[0] && cname) {
@@ -378,7 +442,7 @@ main(int argc, char **argv) {
 				continue;
 			}
 		} else {
-			if (addrinfo(addr) == 0)
+			if (addrinfo(&addr) == 0)
 				hp = NULL;
 			else
 				hp = (struct hostent *)1;	/* XXX */
@@ -427,21 +491,6 @@ parseclass(const char *s) {
 	/*NOTREACHED*/
 }
 
-static void
-printanswer(const struct hostent *hp) {
-	struct in_addr **hptr;
-	char **cp;
-
-	printf("Name: %s\n", hp->h_name);
-	printf("Address:");
-	for (hptr = (struct in_addr **)hp->h_addr_list; *hptr; hptr++)
-		printf(" %s", inet_ntoa(**hptr));
-	printf("\nAliases:");
-	for (cp = hp->h_aliases; cp && *cp && **cp; cp++)
-		printf(" %s", *cp);
-	printf("\n\n");
-}
-
 static void
 hperror(int errnum) {
 	switch(errnum) {
@@ -525,15 +574,50 @@ hperror(int errnum) {
 }
 
 static int
-addrinfo(struct in_addr addr) {
-	u_int32_t ha = ntohl(addr.s_addr);
+addrinfo(struct sockaddr_storage *addr) {
 	char name[NS_MAXDNAME];
+	unsigned char *p;
+	struct in6_addr *addr6;
 
-	sprintf(name, "%u.%u.%u.%u.IN-ADDR.ARPA.",
-		(ha) & 0xff,
-		(ha >> 8) & 0xff,
-		(ha >> 16) & 0xff,
-		(ha >> 24) & 0xff);
+	switch(addr->ss_family) {
+	case AF_INET:
+		p = (unsigned char*)&((struct sockaddr_in *)addr)->sin_addr;
+	mapped:
+		sprintf(name, "%u.%u.%u.%u.IN-ADDR.ARPA.",
+			p[3], p[2], p[1], p[0]);
+		break;
+	case AF_INET6:
+		addr6 = &((struct sockaddr_in6 *)addr)->sin6_addr;
+		p = (unsigned char *)addr6;
+		if (IN6_IS_ADDR_V4MAPPED(addr6) ||
+		    IN6_IS_ADDR_V4COMPAT(addr6)) {
+			p += 12;
+			goto mapped;
+		}
+		sprintf(name,
+			"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+			"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+			"IP6.ARPA",
+			p[15] & 0xf, (p[15] >> 4) & 0xf,
+			p[14] & 0xf, (p[14] >> 4) & 0xf,
+			p[13] & 0xf, (p[13] >> 4) & 0xf,
+			p[12] & 0xf, (p[12] >> 4) & 0xf,
+			p[11] & 0xf, (p[11] >> 4) & 0xf,
+			p[10] & 0xf, (p[10] >> 4) & 0xf,
+			p[9] & 0xf, (p[9] >> 4) & 0xf,
+			p[8] & 0xf, (p[8] >> 4) & 0xf,
+			p[7] & 0xf, (p[7] >> 4) & 0xf,
+			p[6] & 0xf, (p[6] >> 4) & 0xf,
+			p[5] & 0xf, (p[5] >> 4) & 0xf,
+			p[4] & 0xf, (p[4] >> 4) & 0xf,
+			p[3] & 0xf, (p[3] >> 4) & 0xf,
+			p[2] & 0xf, (p[2] >> 4) & 0xf,
+			p[1] & 0xf, (p[1] >> 4) & 0xf,
+			p[0] & 0xf, (p[0] >> 4) & 0xf);
+		break;
+	default:
+		abort();
+	}
 	return (getinfo(name, NULL, ns_t_ptr));
 }
 
@@ -591,7 +675,7 @@ gethostinfo(char *name) {
 
 static int
 getdomaininfo(const char *name, const char *domain) {
-	int val1, val2;
+	int val1, val2, val3;
 
 	if (querytype)
 		return (getinfo(name, domain, gettype=querytype));
@@ -599,8 +683,9 @@ getdomaininfo(const char *name, const char *domain) {
 		val1 = getinfo(name, domain, gettype=ns_t_a);
 		if (cname || verbose)
 			return (val1);
-		val2 = getinfo(name, domain, gettype=ns_t_mx);
-		return (val1 || val2);
+		val2 = getinfo(name, domain, gettype=ns_t_aaaa);
+		val3 = getinfo(name, domain, gettype=ns_t_mx);
+		return (val1 || val2 || val3);
 	}
 }
 
@@ -611,7 +696,8 @@ getinfo(const char *name, const char *domain, int type) {
 	int n;
 	char host[NS_MAXDNAME];
 
-	if (domain == NULL)
+	if (domain == NULL ||
+	    (domain[0] == '.' && domain[1] == '\0'))
 		sprintf(host, "%.*s", NS_MAXDNAME, name);
 	else
 		sprintf(host, "%.*s.%.*s",
@@ -647,7 +733,7 @@ printinfo(const querybuf *answer, const u_char *eom, int filter, int isls,
 	/*
 	 * Find first satisfactory answer.
 	 */
-	hp = (HEADER *) answer;
+	hp = (const HEADER *) answer;
 	ancount = ntohs(hp->ancount);
 	qdcount = ntohs(hp->qdcount);
 	nscount = ntohs(hp->nscount);
@@ -725,12 +811,12 @@ printinfo(const querybuf *answer, const u_char *eom, int filter, int isls,
 	if (nscount) {
 		printf("For authoritative answers, see:\n");
 		while (--nscount >= 0 && cp && cp < eom)
-			cp = (u_char *)pr_rr(cp, answer->qb2, stdout, filter);
+			cp = pr_rr(cp, answer->qb2, stdout, filter);
 	}
 	if (arcount) {
 		printf("Additional information:\n");
 		while (--arcount >= 0 && cp && cp < eom)
-			cp = (u_char *)pr_rr(cp, answer->qb2, stdout, filter);
+			cp = pr_rr(cp, answer->qb2, stdout, filter);
 	}
 
 	/* restore sigchase value */
@@ -740,7 +826,8 @@ printinfo(const querybuf *answer, const u_char *eom, int filter, int isls,
 	return (1);
 }
 
-void print_hex_field (u_int8_t field[], int length, int width, char *pref)
+static void print_hex_field (u_int8_t field[], int length, int width,
+			     const char *pref)
 {
 	/* Prints an arbitrary bit field, from one address for some number of
 		bytes.  Output is formatted via the width, and includes the raw
@@ -772,7 +859,7 @@ void print_hex_field (u_int8_t field[], int length, int width, char *pref)
 	} while (start < length);
 }
 
-void memswap (void *s1, void *s2, size_t n)
+static void memswap (void *s1, void *s2, size_t n)
 {
 	void *tmp;
 
@@ -789,23 +876,6 @@ void memswap (void *s1, void *s2, size_t n)
 	free (tmp);
 }
 
-void print_hex (u_int8_t field[], int length)
-{
-	/* Prints the hex values of a field...not as pretty as the print_hex_field.
-	*/
-	int		i, start, stop;
-
-	start=0;
-	do
-	{
-		stop=length;
- 		for (i = start; i < stop; i++)
-			printf ("%02x ", (u_char) field[i]);
-		start = stop;
-		if (start < length) printf ("\n");
-	} while (start < length);
-}
-
 /*
  * Print resource record fields in human readable form.
  */
@@ -826,7 +896,8 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 	u_char canonrr[MY_PACKETSZ];
 	size_t canonrr_len = 0;
 
-	if ((cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name))) == NULL)
+	cp = pr_cdname(cp, msg, name, sizeof(name));
+	if (cp == NULL)
 		return (NULL);			/* compression error */
 	strcpy(thisdomain, name);
 
@@ -895,7 +966,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		const u_char *startrdata = cp;
 		u_char cdname[NS_MAXCDNAME];
 
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof name);
+		cp = pr_cdname(cp, msg, name, sizeof name);
 		if (doprint)
 			fprintf(file, "%c%s", punc, name);
 
@@ -944,7 +1015,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		const u_char *startname = cp;
 		u_char cdname[NS_MAXCDNAME];
 
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof name);
+		cp = pr_cdname(cp, msg, name, sizeof name);
 		if (doprint)
 			fprintf(file, "\t%s", name);
 
@@ -961,7 +1032,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		}
 
 		startname = cp;
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof name);
+		cp = pr_cdname(cp, msg, name, sizeof name);
 		if (doprint)
 			fprintf(file, " %s", name);
 
@@ -1020,7 +1091,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 				fprintf(file," ");
 		}
 		cp += sizeof(u_short);
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name));
+		cp = pr_cdname(cp, msg, name, sizeof(name));
 		if (doprint)
 			fprintf(file, "%s", name);
 
@@ -1056,7 +1127,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		if (doprint)
 			fprintf(file," %d", ns_get16(cp));
 		cp += sizeof(u_short);
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name));
+		cp = pr_cdname(cp, msg, name, sizeof(name));
 		if (doprint)
 			fprintf(file, " %s", name);
 		break;
@@ -1098,14 +1169,14 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		}
 		cp += n;
 		/* replacement  */
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name));
+		cp = pr_cdname(cp, msg, name, sizeof(name));
 		if (doprint)
 			fprintf(file, "%s", name);
 		break;
 
 	case ns_t_minfo:
 	case ns_t_rp:
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof name);
+		cp = pr_cdname(cp, msg, name, sizeof name);
 		if (doprint) {
 			if (type == ns_t_rp) {
 				char *p;
@@ -1116,7 +1187,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 			}
 			fprintf(file, "%c%s", punc, name);
 		}
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name));
+		cp = pr_cdname(cp, msg, name, sizeof(name));
 		if (doprint)
 			fprintf(file, " %s", name);
 		break;
@@ -1201,7 +1272,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 		u_char cdname[NS_MAXCDNAME];
 		size_t bitmaplen;
 
-		cp = (u_char *) pr_cdname(cp, msg, name, sizeof name);
+		cp = pr_cdname(cp, msg, name, sizeof name);
 		if (doprint)
 			fprintf(file, "%c%s", punc, name);
 		bitmaplen = dlen - (cp - startrdata);
@@ -1265,7 +1336,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 			fprintf(file, " %d", ns_get16(cp));
 		cp += sizeof(u_short);
 		/* signer's name */
-		cp = (u_char *)pr_cdname(cp, msg, name, sizeof(name));
+		cp = pr_cdname(cp, msg, name, sizeof(name));
 		if (doprint && verbose)
 			fprintf(file, " %s", name);
 		else if (doprint && !verbose)
@@ -1299,7 +1370,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 					       SIG_RDATA_BY_NAME);
 					memcpy(chase_sigrdata + SIG_RDATA_BY_NAME,
 					       cdname, n);
-					chase_sigrdata_len += SIG_RDATA_BY_NAME + n;
+					chase_sigrdata_len = SIG_RDATA_BY_NAME + n;
 					memcpy(chase_signature, cp, len);
 					chase_signature_len = len;
 
@@ -1376,10 +1447,14 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 			/* sort rr's (qsort() is too slow) */
 			
 			for (i = 0; i < NUMRR && chase_rr[i].len; i++)
-				for (j = i + 1; i < NUMRR && chase_rr[j].len; j++)
-					if (memcmp(chase_rr[i].data, chase_rr[j].data, MY_PACKETSZ) > 0)
-						memswap(&chase_rr[i], &chase_rr[j], sizeof(rrstruct));
-			
+				for (j = i + 1; j < NUMRR && chase_rr[j].len;
+				     j++)
+					if (memcmp(chase_rr[i].data,
+						   chase_rr[j].data,
+						   MY_PACKETSZ) < 0)
+						memswap(&chase_rr[i],
+						        &chase_rr[j],
+							sizeof(rrstruct));
 			/* append rr's to sigrdata */
 
 			for (i = 0; i < NUMRR && chase_rr[i].len; i++)
@@ -1392,6 +1467,7 @@ pr_rr(const u_char *cp, const u_char *msg, FILE *file, int filter) {
 			/* print rr-data and signature */
 
 			if (verbose) {
+				fprintf(file, "\n");
 				print_hex_field(chase_sigrdata,
 						chase_sigrdata_len,
 						21,"DATA: ");
@@ -1507,6 +1583,7 @@ static const char *
 pr_type(int type) {
 	if (!verbose) switch (type) {
 	case ns_t_a:
+	case ns_t_aaaa:
 		return ("has address");
 	case ns_t_cname:
 		return ("is a nickname for");
@@ -1561,12 +1638,44 @@ pr_cdname(const u_char *cp, const u_char *msg, char *name, int namelen) {
 	return (cp + n);
 }
 
+static void
+add(union res_sockaddr_union *u, int type, void *p) {
+	memset(u, 0, sizeof(*u));
+	switch (type) {
+	case ns_t_a:
+		memcpy(&u->sin.sin_addr, p, NS_INADDRSZ);
+		u->sin.sin_family = AF_INET;
+		u->sin.sin_port = htons(NAMESERVER_PORT);
+#ifdef HAVE_SA_LEN
+		u->sin.sin_len = sizeof(u->sin);
+#endif
+		break;
+
+	case ns_t_aaaa:
+		memcpy(&u->sin6.sin6_addr, p, 16);
+		u->sin6.sin6_family = AF_INET6;
+		u->sin6.sin6_port = htons(NAMESERVER_PORT);
+#ifdef HAVE_SA_LEN
+		u->sin6.sin6_len = sizeof(u->sin6);
+#endif
+		break;
+	}
+}
+
+static int
+salen(union res_sockaddr_union *u) {
+	switch (u->sin.sin_family) {
+	case AF_INET6: return (sizeof(u->sin6));
+	case AF_INET: return (sizeof(u->sin));
+	}
+	return (0);
+}
+
 static int
 ListHosts(char *namePtr, int queryType) {
 	querybuf buf, answer;
 	struct sockaddr_in sin;
 	const HEADER *headerPtr;
-	const struct hostent *hp;
 	enum { NO_ERRORS, ERR_READING_LEN, ERR_READING_MSG, ERR_PRINTING }
 		error = NO_ERRORS;
 
@@ -1579,7 +1688,7 @@ ListHosts(char *namePtr, int queryType) {
 	/* Names and addresses of name servers to try. */
 	char nsname[NUMNS][NS_MAXDNAME];
 	int nshaveaddr[NUMNS];
-	struct in_addr nsipaddr[NUMNSADDR];
+	union res_sockaddr_union nsipaddr[NUMNSADDR];
 	int numns, numnsaddr, thisns;
 	int qdcount, ancount;
 
@@ -1591,10 +1700,9 @@ ListHosts(char *namePtr, int queryType) {
 	if (namePtr[i-1] == '.')
 		namePtr[i-1] = 0;
 
-	if (server_specified) {
-		memcpy(&nsipaddr[0], &res.nsaddr.sin_addr, NS_INADDRSZ);
-		numnsaddr = 1;
-	} else {
+	if (server_specified)
+		numnsaddr = res_getservers(&res, nsipaddr, NUMNSADDR);
+	else {
 		/*
 		 * First we have to find out where to look.  This needs a NS
 		 * query, possibly followed by looking up addresses for some
@@ -1712,20 +1820,17 @@ ListHosts(char *namePtr, int queryType) {
 						}
 					}
 				}
-			} else if (type == ns_t_a) {
-				if (numnsaddr < NUMNSADDR)
-					for (i = 0; i < numns; i++) {
-						if (ns_samename(nsname[i],
+			} else if ((type == ns_t_a || type == ns_t_aaaa) &&
+				   numnsaddr < NUMNSADDR) {
+				for (i = 0; i < numns; i++) {
+					if (ns_samename(nsname[i],
 							       (char *)domain)
-						    == 1) {
-							nshaveaddr[i]++;
-							memcpy(
-							  &nsipaddr[numnsaddr],
-							  cp, NS_INADDRSZ);
-							numnsaddr++;
-							break;
-						}
-					}
+					    != 1)
+						continue;
+					nshaveaddr[i]++;
+					add(&nsipaddr[numnsaddr++], type, cp);
+					break;
+				}
 			}
 			cp += dlen;
 		}
@@ -1737,28 +1842,50 @@ ListHosts(char *namePtr, int queryType) {
 		 */
 
 		for (i = 0; i < numns; i++) {
-			if (nshaveaddr[i] == 0) {
-				struct in_addr **hptr;
-				int numaddrs = 0;
+			struct addrinfo *answer = NULL;
+			struct addrinfo *cur = NULL;
+			struct addrinfo hint;
 
-				hp = gethostbyname(nsname[i]);
-				if (hp) {
-					for (hptr = (struct in_addr **)
-					     	hp->h_addr_list;
-					     *hptr != NULL;
-					     hptr++)
-						if (numnsaddr < NUMNSADDR) {
-							memcpy(
-							  &nsipaddr[numnsaddr],
-							  *hptr, NS_INADDRSZ);
-							numnsaddr++;
-							numaddrs++;
-						}
+			memset(&hint, 0, sizeof(hint));
+			hint.ai_family = PF_UNSPEC;
+			hint.ai_socktype = SOCK_STREAM;
+
+			if (nshaveaddr[i] == 0 &&
+			    !getaddrinfo(nsname[i], NULL, &hint, &answer)) {
+				int numaddrs = 0;
+				for (cur = answer;
+				     cur != NULL;
+				     cur = cur->ai_next) {
+					union res_sockaddr_union *u;
+
+					if (numnsaddr >= NUMNSADDR)
+						break;
+
+					u = &nsipaddr[numnsaddr];
+					switch (cur->ai_addr->sa_family) {
+					case AF_INET6:
+						u->sin6 =
+					   *(struct sockaddr_in6 *)cur->ai_addr;
+						u->sin6.sin6_port =
+							htons(NAMESERVER_PORT);
+						numnsaddr++;
+						numaddrs++;
+						break;
+					case AF_INET:
+						u->sin =
+					    *(struct sockaddr_in*)cur->ai_addr;
+						u->sin6.sin6_port =
+							htons(NAMESERVER_PORT);
+						numnsaddr++;
+						numaddrs++;
+						break;
+					}
 				}
 				if (res.options & RES_DEBUG || verbose)
 					printf(
 				  "Found %d addresses for %s by extra query\n",
 					       numaddrs, nsname[i]);
+				freeaddrinfo(answer);
 			} else if (res.options & RES_DEBUG || verbose)
 				printf("Found %d addresses for %s\n",
 				       nshaveaddr[i], nsname[i]);
@@ -1795,14 +1922,31 @@ ListHosts(char *namePtr, int queryType) {
 	 */
 
 	for ((void)NULL; thisns < numnsaddr; thisns++) {
-		if ((sockFD = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+		if ((sockFD = socket(nsipaddr[thisns].sin.sin_family,
+				     SOCK_STREAM, 0)) < 0) {
+			if (errno == EPROTONOSUPPORT)
+				continue;
 			perror("ListHosts");
 			return (ERROR);
 		}
-		memcpy(&sin.sin_addr, &nsipaddr[thisns], NS_INADDRSZ);
-		if (res.options & RES_DEBUG || verbose)
-			printf("Trying %s\n", inet_ntoa(sin.sin_addr));
-		if (connect(sockFD, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
+		if (res.options & RES_DEBUG || verbose) {
+			char buf[80];
+			switch (nsipaddr[thisns].sin.sin_family) {
+			case AF_INET:
+				inet_ntop(nsipaddr[thisns].sin.sin_family,
+					  &nsipaddr[thisns].sin.sin_addr,
+					  buf, sizeof(buf));
+				break;
+			case AF_INET6:
+				inet_ntop(nsipaddr[thisns].sin6.sin6_family,
+					  &nsipaddr[thisns].sin6.sin6_addr,
+					  buf, sizeof(buf));
+				break;
+			}
+			printf("Trying %s\n", buf);
+		}
+		if (connect(sockFD, (struct sockaddr *)&nsipaddr[thisns],
+		            salen(&nsipaddr[thisns])) >= 0)
 			break;
 		if (verbose)
 			perror("Connection failed, trying next server");

contrib/bind/bin/mkservdb/mkservdb.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: mkservdb.c,v 1.9 2001/01/26 06:54:11 vixie Exp $";
+static const char rcsid[] = "$Id: mkservdb.c,v 1.10 2001/06/18 14:42:46 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -69,9 +69,9 @@ main(int argc, char **argv) {
 	DB *db;
 	DBT key;
 	DBT data;
-	char *filename = _PATH_SERVICES;
-	char *tmpdatabase = _PATH_SERVICES_DB_TMP;
-	char *database = _PATH_SERVICES_DB;
+	const char *filename = _PATH_SERVICES;
+	const char *tmpdatabase = _PATH_SERVICES_DB_TMP;
+	const char *database = _PATH_SERVICES_DB;
 	char dbuf[1024];
 	char kbuf[512];
 	u_short *ports;
@@ -152,7 +152,7 @@ main(int argc, char **argv) {
 		if (sv->s_aliases != NULL)
 			for (n = 0; sv->s_aliases[n] != NULL; n++)
 				if ((p + strlen(sv->s_aliases[n]) + 1) - dbuf
-				    <= sizeof dbuf) {
+				    <= (int)sizeof dbuf) {
 					strcpy(p, sv->s_aliases[n]);
 					p += strlen(p) + 1;
 				}

contrib/bind/bin/named-bootconf/named-bootconf.sh

@@ -143,6 +143,11 @@ while read CMD ARGS; do
 			no-recursion )
 				echo "	recursion no;" >>$OPTIONFILE
 				;;
+			no-round-robin ) # HP extention
+				echo "	rrset-order {" >>$OPTIONFILE
+				echo "		class ANY type ANY name \"*\" order fixed;" >>$OPTIONFILE
+				echo "	};" >>$OPTIONFILE
+				;;
 			esac
 		done
 		rm -f $COMMENTFILE

contrib/bind/bin/named-bootconf/test.boot

@@ -0,0 +1,30 @@
+directory /var/named
+forwarders 1.2.3.4 1.2.3.5
+limit datasize 10000000
+limit files 1000
+limit transfers-in 100
+limit transfers-per-ns 20
+; no-round-robin in HP specific
+options no-round-robin fake-iquery forward-only no-fetch-glue no-recursion
+slave
+tcplist 10.0.0.1
+xfrnets 10.0.0.2
+cache .	rootservers
+primary example.net example.net.db
+secondary example.com 127.0.0.1 example.com.db
+stub example.org 127.0.0.1 example.org.db
+primary/IN example.net example.net.db
+secondary/IN example.com 127.0.0.1 example.com.db
+stub/IN example.org 127.0.0.1 example.org.db
+secondary/IN example.com 127.0.0.1
+stub/IN example.org 127.0.0.1
+primary/CHAOS example.net example.net.db
+secondary/CHAOS example.com 127.0.0.1 example.com.db
+stub/CHAOS example.org 127.0.0.1 example.org.db
+secondary/CHAOS example.com 127.0.0.1
+stub/CHAOS example.org 127.0.0.1
+primary/HS example.net example.net.db
+secondary/HS example.com 127.0.0.1 example.com.db
+stub/HS example.org 127.0.0.1 example.org.db
+secondary/HS example.com 127.0.0.1
+stub/HS example.org 127.0.0.1

contrib/bind/bin/named/db_defs.h

@@ -1,6 +1,6 @@
 /*
  *	from db.h	4.16 (Berkeley) 6/1/90
- *	$Id: db_defs.h,v 8.41 2001/02/08 02:05:50 marka Exp $
+ *	$Id: db_defs.h,v 8.47 2002/05/18 01:02:53 marka Exp $
  */
 
 /*
@@ -78,7 +78,7 @@
  */
 
 	/* max length of data in RR data field */
-#define MAXDATA		(2*MAXDNAME + 5*INT32SZ)
+#define MAXDATA		(3*MAXDNAME + 5*INT32SZ)
 
 	/* max length of data in a TXT RR segment */
 #define MAXCHARSTRING 255
@@ -111,7 +111,14 @@
  * indicate what the union is being used for.  This should require less
  * memory than making d_addr a union of struct in6_addr and struct in_addr.
  */
+#ifdef CHECK_MAGIC
+#define DATABUF_MAGIC (('D'<<24)|('A'<<16)|('T'<<8)|'A')
+#endif
+
 struct databuf {
+#ifdef CHECK_MAGIC
+	u_int32_t	d_magic;	/* magic number */
+#endif
 	struct databuf	*d_next;	/* linked list */
 	struct in_addr	d_addr;		/* NS from whence this came */
 	u_int32_t	d_ttl;		/* time to live */
@@ -130,6 +137,7 @@ struct databuf {
 	unsigned	d_clev :6;
 	unsigned	d_rcode :4;	/* rcode for negative caching */
 	unsigned	d_mark :3;	/* place to mark data */
+	unsigned	d_noedns :1;	/* this server does not support edns */
 	int16_t		d_type;		/* type number */
 	int16_t		d_size;		/* size of data area */
 	u_int32_t	d_rcnt;
@@ -139,7 +147,7 @@ struct databuf {
 	u_int16_t	d_nstime;	/* NS response time, milliseconds */
 	u_char		d_data[sizeof(void*)]; /* dynamic (padded) */
 };
-#define DATASIZE(n) (sizeof(struct databuf) - sizeof(void*) + n)
+#define BIND_DATASIZE(n) (sizeof(struct databuf) - sizeof(void*) + n)
 
 #ifdef HITCOUNTS
 extern u_int32_t	db_total_hits;
@@ -184,11 +192,14 @@ struct namebuf {
 	struct databuf	*n_data;	/* data records */
 	struct namebuf	*n_parent;	/* parent domain */
 	struct hashbuf	*n_hash;	/* hash table for children */
-	char		_n_name[sizeof(void*)];	/* Counted str (dynamic). */
+	union {
+		char		_n_name[sizeof(void*)];
+		unsigned char	_n_len[sizeof(void*)];
+	} _n;				/* Counted str (dynamic). */
 };
 #define	NAMESIZE(n)	(sizeof(struct namebuf) - sizeof(void*) + 1 + n + 1)
-#define	NAMELEN(nb)	(((u_char *)((nb)._n_name))[0])
-#define	NAME(nb)	((nb)._n_name + 1)
+#define	NAMELEN(nb)	((((nb)._n._n_len))[0])
+#define	NAME(nb)	((nb)._n._n_name + 1)
 
 struct hashbuf {
 	int		h_size;		/* size of hash table */
@@ -211,6 +222,7 @@ struct tsig_record {
 	u_int8_t	sig[TSIG_SIG_SIZE];
 	struct dst_key	*key;
 	int		siglen;
+	int		tsig_size;
 };
 
 struct sig_record {
@@ -227,7 +239,7 @@ struct dnode {
 	struct databuf	*dp;
 	struct dnode	*dn_next;
 	int		line;
-	char		*file;
+	const char	*file;
 };
 
 typedef struct dnode * dlist;
@@ -280,6 +292,7 @@ struct db_rrset {
 #endif
 #define CNAMEANDOTHER	(-12)
 #define DNSSECFAIL	(-13)	/* db_set_update */
+#define NONGLUE		(-14)
 
 /*
  * getnum() options

contrib/bind/bin/named/db_dump.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_dump.c	4.33 (Berkeley) 3/3/91";
-static const char rcsid[] = "$Id: db_dump.c,v 8.49 2001/02/06 06:42:19 marka Exp $";
+static const char rcsid[] = "$Id: db_dump.c,v 8.51 2001/06/18 14:42:49 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -120,6 +120,7 @@ static const char rcsid[] = "$Id: db_dump.c,v 8.49 2001/02/06 06:42:19 marka Exp
 
 #include <isc/eventlib.h>
 #include <isc/logging.h>
+#include <isc/misc.h>
 
 #include "port_after.h"
 
@@ -177,7 +178,8 @@ zt_dump(FILE *fp) {
 
 	fprintf(fp, ";; ++zone table++\n");
 	for (zp = &zones[0]; zp < &zones[nzones]; zp++) {
-		char *pre, buf[64];
+		const char *pre;
+		char buf[64];
 		u_int cnt;
 
 		if (!zp->z_origin)
@@ -230,7 +232,7 @@ fwd_dump(FILE *fp) {
 }
 
 int
-db_dump(struct hashbuf *htp, FILE *fp, int zone, char *origin) {
+db_dump(struct hashbuf *htp, FILE *fp, int zone, const char *origin) {
 	struct databuf *dp = NULL;
 	struct namebuf *np;
 	struct namebuf **npp, **nppend;
@@ -621,9 +623,14 @@ db_dump(struct hashbuf *htp, FILE *fp, int zone, char *origin) {
 				break;
 
 			default:
-				fprintf(fp, "%s?d_type=%d?",
-					sep, dp->d_type);
-				sep = " ";
+				fprintf(fp, "\\# %u", dp->d_size);
+				if (dp->d_size != 0) {
+					fputs(" ( ", fp);
+					isc_puthexstring(fp, dp->d_data,
+							 dp->d_size, 40, 48,
+							 "\n\t\t\t\t");
+					fputs(" ) ", fp);
+				}
 			}
 			if (dp->d_cred < DB_C_ZONE) {
 				fprintf(fp, "%sCr=%s",

contrib/bind/bin/named/db_func.h

@@ -90,7 +90,7 @@
 
 /* db_proc.h - prototypes for functions in db_*.c
  *
- * $Id: db_func.h,v 8.44 2000/12/02 23:28:33 vixie Exp $
+ * $Id: db_func.h,v 8.46 2001/06/18 14:42:51 marka Exp $
  */
 
 /* ++from db_update.c++ */
@@ -113,7 +113,7 @@ struct hashbuf *	savehash(struct hashbuf *);
 /* --from db_save.c-- */
 
 /* ++from db_dump.c++ */
-int			db_dump(struct hashbuf *, FILE *, int, char *),
+int			db_dump(struct hashbuf *, FILE *, int, const char *),
 			zt_dump(FILE *);
 void			doadump(void);
 /* --from db_dump.c-- */
@@ -142,7 +142,7 @@ int			parse_sec_rdata(char *inp, int inp_len, int inp_full,
 					char *domain,  u_int32_t ttl, 
 					int type, enum context context,
 					enum transport transport,
-					char **errmsg);
+					const char **errmsg);
 /* --from db_load.c-- */
 
 /* ++from db_glue.c++ */
@@ -165,7 +165,7 @@ struct namebuf *	rm_name(struct namebuf *,
 				struct namebuf **,
 				struct namebuf *);
 void			rm_hash(struct hashbuf *);
-void			db_freedata(struct databuf *);
+void			db_detach(struct databuf **);
 void			db_lame_add(char *zone, char *server, time_t when);
 time_t			db_lame_find(char *zone, struct databuf *dp);
 void			db_lame_clean(void);
@@ -203,7 +203,7 @@ int			db_set_update(char *name, struct databuf *dp,
 /* --from db_sec.c-- */
 
 /* ++from db_tsig.c++ */
-char *			tsig_alg_name(int value);
+const char *		tsig_alg_name(int value);
 int			tsig_alg_value(char *name);
 struct dst_key *	tsig_key_from_addr(struct in_addr addr);
 struct tsig_record *	new_tsig(struct dst_key *key, u_char *sig, int siglen);

contrib/bind/bin/named/db_glue.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_glue.c	4.4 (Berkeley) 6/1/90";
-static const char rcsid[] = "$Id: db_glue.c,v 8.42 2000/12/23 08:14:35 vixie Exp $";
+static const char rcsid[] = "$Id: db_glue.c,v 8.47 2002/05/18 01:02:54 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -145,8 +145,8 @@ destroyservicelist() {
 
 	for (slp = servicelist; slp != NULL; slp = slp_next) {
 		slp_next = slp->next;
-		freestr(slp->name);
-		freestr(slp->proto);
+		slp->name = freestr(slp->name);
+		slp->proto = freestr(slp->proto);
 		memput(slp, sizeof *slp);
 	}
 	servicelist = NULL;
@@ -183,7 +183,7 @@ destroyprotolist() {
 
 	for (plp = protolist; plp != NULL; plp = plp_next) {
 		plp_next = plp->next;
-		freestr(plp->name);
+		plp->name = freestr(plp->name);
 		memput(plp, sizeof *plp);
 	}
 	protolist = NULL;
@@ -354,31 +354,7 @@ rm_datum(struct databuf *dp, struct namebuf *np, struct databuf *pdp,
 	} else
 		dp->d_next = NULL;
 	dp->d_flags &= ~DB_F_ACTIVE;
-	DRCNTDEC(dp);
-	if (dp->d_rcnt) {
-#ifdef DEBUG
-		int32_t ii;
-#endif
-
-		switch(dp->d_type) {
-		case T_NS:
-			ns_debug(ns_log_db, 3, "rm_datum: %s rcnt = %d",
-				 dp->d_data, dp->d_rcnt);
-			break;
-#ifdef DEBUG
-		case T_A:
-			memcpy(&ii, dp->d_data, sizeof ii);
-			ns_debug(ns_log_db, 3,
-				 "rm_datum: %08.8X rcnt = %d",
-				 ii, dp->d_rcnt);
-			break;
-#endif
-		default:
-			ns_debug(ns_log_db, 3,
-				 "rm_datum: rcnt = %d", dp->d_rcnt);
-		}
-	} else
-		db_freedata(dp);
+	db_detach(&dp);
 	return (ndp);
 }
 
@@ -393,10 +369,10 @@ rm_name(struct namebuf *np, struct namebuf **pp, struct namebuf *pnp) {
 	const char *msg;
 
 	/* verify */
-	if ( (np->n_data && (msg = "data"))
-	  || (np->n_hash && (msg = "hash"))
+	if ( (np->n_data != NULL && (msg = "data") != NULL)
+	  || (np->n_hash != NULL && (msg = "hash") != NULL)
 	    ) {
-		ns_panic(ns_log_db, 1, "rm_name(%#x(%s)): non-nil %s pointer",
+		ns_panic(ns_log_db, 1, "rm_name(%p(%s)): non-nil %s pointer",
 			 np, NAME(*np), msg);
 	}
 
@@ -463,9 +439,9 @@ nhash(const char *name) {
 	return (hval);
 }
 
-void
+static void
 db_freedata(struct databuf *dp) {
-	int bytes = DATASIZE(dp->d_size);
+	int bytes = BIND_DATASIZE(dp->d_size);
 
 	if (dp->d_rcnt != 0)
 		panic("db_freedata: d_rcnt != 0", NULL);
@@ -476,9 +452,28 @@ db_freedata(struct databuf *dp) {
 	if (dp->d_next != NULL)
 		panic("db_free: d_next != NULL", NULL);
 	dp->d_flags |= DB_F_FREE;
+#ifdef CHECK_MAGIC
+	dp->d_magic = 0;
+#endif
 	memput(dp, bytes);
 }
 
+void
+db_detach(struct databuf **dpp) {
+	struct databuf *dp;
+
+	INSIST(dpp != NULL && *dpp != NULL);
+	dp = *dpp;
+#ifdef CHECK_MAGIC
+	INSIST(dp->d_magic == DATABUF_MAGIC);
+#endif
+
+	DRCNTDEC(dp);
+	if (dp->d_rcnt == 0)
+		db_freedata(dp);
+	*dpp = NULL;
+}
+
 struct lame_hash {
 	struct lame_hash	*next;
 	char			*zone;
@@ -550,9 +545,9 @@ db_lame_add(char *zone, char *server, time_t when) {
 	this->zone = savestr(zone, 0);
 	if (this->server == NULL || this->zone == NULL) {
 		if (this->server != NULL)
-			freestr(this->server);
+			this->server = freestr(this->server);
 		if (this->zone != NULL)
-			freestr(this->zone);
+			this->zone = freestr(this->zone);
 		memput(this, sizeof *this);
 		return;
 	}
@@ -602,8 +597,8 @@ db_lame_clean(void) {
 		this = lame_hash[i];
 		while (this != NULL) {
 			if (this->when < tt.tv_sec) {
-				freestr(this->zone);
-				freestr(this->server);
+				this->zone = freestr(this->zone);
+				this->server = freestr(this->server);
 				if (last != NULL) {
 					last->next = this->next;
 					memput(this, sizeof *this);
@@ -635,8 +630,8 @@ db_lame_destroy(void) {
 		while (this != NULL) {
 			last = this;
 			this = this->next;
-			freestr(last->zone);
-			freestr(last->server);
+			last->zone = freestr(last->zone);
+			last->server = freestr(last->server);
 			memput(last, sizeof *this);
 		}
 	}

contrib/bind/bin/named/db_ixfr.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static char     rcsid[] = "$Id: db_ixfr.c,v 8.23.2.2 2001/05/03 03:53:18 marka Exp $";
+static char     rcsid[] = "$Id: db_ixfr.c,v 8.31 2002/01/02 04:47:10 marka Exp $";
 #endif
 
 /*
@@ -52,6 +52,7 @@ static char     rcsid[] = "$Id: db_ixfr.c,v 8.23.2.2 2001/05/03 03:53:18 marka E
 #include <isc/eventlib.h>
 #include <isc/logging.h>
 #include <isc/memcluster.h>
+#include <isc/misc.h>
 
 #include "port_after.h"
 
@@ -108,25 +109,29 @@ ixfr_get_change_list(struct zoneinfo *zp,
 		case DBIXFR_ERROR:
 			ns_warning(ns_log_db, "Logical error in %s: unlinking", 
 				   zp->z_ixfr_base);
+			if (fp != NULL) {
+				(void) my_fclose(fp);
+				fp = NULL;
+			}
 			unlink(zp->z_ixfr_base);
 			goto cleanup;
 
 		case DBIXFR_FOUND_RR:
-				ns_debug(ns_log_default, 4, "ixfr_getdelta DBIXFR_FOUND_RR (%s)",
-					zp->z_origin);
+			ns_debug(ns_log_default, 4,
+				 "ixfr_getdelta DBIXFR_FOUND_RR (%s)",
+				 zp->z_origin);
 			if (EMPTY(*dlhead)) {
 				/* skip updates prior to the one we want */
 				uprec = HEAD(dl->d_changes);
 				INSIST(uprec != NULL);
-				if ((uprec->r_zone < from_serial) || 	
-					(uprec->r_zone > to_serial))  
+				if (SEQ_LT(uprec->r_zone, from_serial) || 	
+				    SEQ_GT(uprec->r_zone, to_serial))  
 				{
 					while ((uprec = HEAD(dl->d_changes)) != NULL) {
 						UNLINK(dl->d_changes, uprec, r_link);
 
 						if (uprec->r_dp != NULL)
-							db_freedata(uprec->r_dp);
-						uprec->r_dp = NULL;
+						      db_detach(&uprec->r_dp);
 						res_freeupdrec(uprec);
 					}
 					memput(dl, sizeof *dl);
@@ -174,7 +179,7 @@ ixfr_get_change_list(struct zoneinfo *zp,
 			UNLINK(dl->d_changes, uprec, r_link);
 
 			if (uprec->r_dp != NULL)
-				db_freedata(uprec->r_dp);
+				db_detach(&uprec->r_dp);
 			uprec->r_dp = NULL;
 			res_freeupdrec(uprec);
 		}
@@ -373,8 +378,9 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 	char            data[MAXDATA], dnbuf[MAXDNAME], sclass[3];
 	char           *dname, *cp, *cp1;
 	char            buf[MAXDATA];
-	u_int32_t       serial, ttl;
-	u_int32_t	current_serial;
+	long unsigned	lutmp;
+	u_int32_t       serial = 0, ttl;
+	u_int32_t	current_serial = 0;
 	int             nonempty_lineno = -1, prev_pktdone = 0, cont = 0,
 			inside_next = 0;
 	int             id;
@@ -384,7 +390,6 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 	enum transport  transport;
 	struct map     *mp;
 	int             zonelist[MAXDNAME];
-	struct databuf *dp;
 	struct in_addr  ina;
 	int             datasize;
 	ns_updrec *	rrecp;
@@ -395,7 +400,19 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 	err = 0;
 	transport = primary_trans;
 	lineno = 1;
+	zonenum = 0;
+
+	/*
+	 * Look for serial if "first" call othewise use new_serial to
+	 * for current_serial.
+	 */
+	if (*old_serial == *new_serial && *old_serial == 0)
+		current_serial = 0;
+	else
+		current_serial = *new_serial;
+
 	for (;;) {
+		dname = NULL;
 		if (!getword(buf, sizeof buf, fp, 0)) {
 			if (lineno == (nonempty_lineno + 1) && !(feof(fp))) {
 				/*
@@ -475,13 +492,15 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 		class = zp->z_class;
 		n = 0;
 		data[0] = '\0';
+		opcode = -1;
 		switch (section) {
 		case S_ZONE:
 			cp = fgets(buf, sizeof buf, fp);
 			if (!cp)
 				*buf = '\0';
 			n = sscanf(cp, "origin %s class %s serial %lu",
-				   origin, sclass, &serial);
+				   origin, sclass, &lutmp);
+			serial = lutmp;
 			if (current_serial == 0)
 				current_serial = serial;
 			else if (current_serial != serial) {
@@ -501,8 +520,7 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 
 				dname = origin;
 				type = T_SOA;
-				class = sym_ston(__p_class_syms, sclass,
-						 &success);
+				class = res_nametoclass(sclass, &success);
 				if (!success) {
 					err++;
 					break;
@@ -522,7 +540,6 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 				err++;
 				break;
 			}
-			opcode = -1;
 			if (buf[0] == '{') {
 				n = strlen(buf);
 				for (i = 0; (u_int32_t) i < n; i++)
@@ -567,8 +584,7 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 				int             success;
 				int             maybe_class;
 
-				maybe_class = sym_ston(__p_class_syms,
-						       buf, &success);
+				maybe_class = res_nametoclass(buf, &success);
 				if (success) {
 					class = maybe_class;
 					(void) getword(buf, sizeof buf, fp, 1);
@@ -579,8 +595,7 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 				int             success;
 				int             maybe_type;
 
-				maybe_type = sym_ston(__p_type_syms,
-						      buf, &success);
+				maybe_type = res_nametotype(buf, &success);
 
 				if (success) {
 					type = maybe_type;
@@ -817,7 +832,7 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 			case ns_t_nxt:
 			case ns_t_key:
 			case ns_t_cert:{
-				char *errmsg = NULL;
+				const char *errmsg = NULL;
 
 				n  = parse_sec_rdata(buf, sizeof(buf), 1,
 						     (u_char *) data,
@@ -833,7 +848,38 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 				break;
 			}
 			default:
-				err++;
+				if (strcmp(buf, "\\#") != 0) {
+					err++;
+					break;
+				}
+                                if (!getword(buf, sizeof buf, fp, 0) ||
+                                     !isdigit((unsigned char)buf[0])) {
+					err++;
+					break;
+				}
+                                n = strtoul(buf, &cp, 10);
+                                if (n > 0xffff || *cp != '\0') {
+					err++;
+					break;
+				}
+                                multiline = 0;
+                                i = isc_gethexstring((u_char *)data,
+						     sizeof(data), n, fp,
+						     &multiline);
+                                if (i == -1) {
+					err++;
+					break;
+				}
+                                if (multiline) {
+					c = getnonblank(fp, zp->z_updatelog, 1);
+					if (c != ')') {
+						ungetc(c, fp);
+						err++;
+						break;
+					}
+                                        multiline = 0;
+                                }
+				endline(fp);
 			}
 			if (section == S_PREREQ) {
 				ttl = 0;
@@ -880,6 +926,7 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 		}
 		rrecp = res_mkupdrec(section, dname, class, type, ttl);
 		if (section != S_ZONE) {
+			struct databuf *dp;
 			dp = savedata(class, type, ttl, (u_char *) data, n);
 			dp->d_zone = zonenum;
 			dp->d_cred = DB_C_ZONE;
@@ -904,13 +951,13 @@ ixfr_getdelta(struct zoneinfo *zp, FILE *fp, const char *filename, char *origin,
 				      opcode == ADD) ||
 				     (opcode == DELETE &&
 				      arp->r_opcode == ADD)) &&
-				     arp->r_dp->d_type == dp->d_type &&
-				     arp->r_dp->d_class == dp->d_class &&
-				     arp->r_dp->d_ttl == dp->d_ttl &&
+				     arp->r_dp->d_type == rrecp->r_dp->d_type &&
+				     arp->r_dp->d_class == rrecp->r_dp->d_class &&
+				     arp->r_dp->d_ttl == rrecp->r_dp->d_ttl &&
 				     ns_samename(arp->r_dname, dname) == 1 &&
-				     db_cmp(arp->r_dp, dp) == 0) {
-					db_freedata(dp);
-					db_freedata(arp->r_dp);
+				     db_cmp(arp->r_dp, rrecp->r_dp) == 0) {
+					db_detach(&rrecp->r_dp);
+					db_detach(&arp->r_dp);
 					UNLINK(*listuprec, arp, r_link);
 					res_freeupdrec(arp);
 					res_freeupdrec(rrecp);

contrib/bind/bin/named/db_load.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
-static const char rcsid[] = "$Id: db_load.c,v 8.113.2.1 2001/05/03 03:26:48 marka Exp $";
+static const char rcsid[] = "$Id: db_load.c,v 8.121 2001/11/12 21:22:22 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -130,6 +130,7 @@ static const char rcsid[] = "$Id: db_load.c,v 8.113.2.1 2001/05/03 03:26:48 mark
 #include <isc/eventlib.h>
 #include <isc/logging.h>
 #include <isc/memcluster.h>
+#include <isc/misc.h>
 
 #include "port_after.h"
 
@@ -149,15 +150,16 @@ static int		get_nxt_types(u_char *, FILE *, const char *);
 
 static int		parse_sig_rr(char *, int, u_char *, int, FILE *,  
 				     struct zoneinfo *, char *, u_int32_t ,
-				     enum context , enum transport , char **);
+				     enum context, enum transport,
+				     const char **);
 static int		parse_key_rr(char *, int, u_char *, int, FILE *, 
-				     struct zoneinfo *, char *, enum context, 
-				     enum transport, char **);
+				     const char **);
 
-static int		parse_cert_rr(char *, int, u_char *, int, FILE *, char **);
-static int		parse_nxt_rr(char *, int, u_char *, int, FILE *,
+static int		parse_cert_rr(char *, int, u_char *, int, FILE *,
+				      const char **);
+static int		parse_nxt_rr(char *, u_char *, int, FILE *,
 				     struct zoneinfo *, char *, enum context,
-				     enum transport, char **);
+				     enum transport, const char **);
 
 
 static int		wordtouint32_error = 0;
@@ -237,7 +239,7 @@ db_load(const char *filename, const char *in_origin,
 	char buf[MAXDATA];
 	char genlhs[MAXDNAME], genrhs[MAXDNAME];
 	u_char data[MAXDATA];
-	int data_size = sizeof(data);
+	unsigned int data_size = sizeof(data);
 	int c, someclass, class, type, dbflags, dataflags, multiline = 0;
 	int slineno, i, errs, didinclude, ininclude, escape, success;
 	u_int32_t ttl, n, serial;
@@ -404,7 +406,7 @@ db_load(const char *filename, const char *in_origin,
 				ERRTOZ("$GENERATE missing LHS");
 			if (!getword(buf, sizeof(buf), fp, 0))
 				ERRTOZ("GENERATE missing TYPE");
-			type = sym_ston(__p_type_syms, buf, &success);
+			type = res_nametotype(buf, &success);
 			if (success == 0 || type == ns_t_any) {
 				ns_info(ns_log_load,
 					"%s: Line %d: $GENERATE unknown type: %s.",
@@ -509,9 +511,10 @@ db_load(const char *filename, const char *in_origin,
 						  empty_from, &rrcount, lineno,
 						  filename);
 				if (c != OK) {
-					if (c == CNAMEANDOTHER)
+					if (c == CNAMEANDOTHER || c == NONGLUE)
 						errs++;
 				}
+				db_detach(&dp);
 			}
 			endline(fp);
 			continue;
@@ -578,7 +581,7 @@ db_load(const char *filename, const char *in_origin,
 			}
 
 			/* Parse class (IN, etc) */
-			someclass = sym_ston(__p_class_syms, buf, &success);
+			someclass = res_nametoclass(buf, &success);
 			if (success && someclass != zp->z_class) {
 				ns_info(ns_log_load,
 					"%s: Line %d: wrong class: %s.",
@@ -593,7 +596,7 @@ db_load(const char *filename, const char *in_origin,
 			}
 
 			/* Parse RR type (A, MX, etc) */
-			type = sym_ston(__p_type_syms, buf, &success);
+			type = res_nametotype(buf, &success);
 			if (success == 0 || type == ns_t_any) {
 				ns_info(ns_log_load,
 					"%s: Line %d: Unknown type: %s.",
@@ -635,8 +638,52 @@ db_load(const char *filename, const char *in_origin,
 			case ns_t_ptr:
 				escape = 1;
 				break;
-			default:
+			case ns_t_a:
+			case ns_t_md:
+			case ns_t_mf:
+			case ns_t_null:
+			case ns_t_hinfo:
+			case ns_t_mx:
+			case ns_t_txt:
+			case ns_t_afsdb:
+			case ns_t_x25:
+			case ns_t_isdn:
+			case ns_t_rt:
+			case ns_t_nsap:
+			case ns_t_nsap_ptr:
+			case ns_t_px:
+			case ns_t_gpos:
+			case ns_t_aaaa:
+			case ns_t_loc:
+			case ns_t_eid:
+			case ns_t_nimloc:
+			case ns_t_srv:
+			case ns_t_atma:
+			case ns_t_naptr:
+			case ns_t_kx:
+			case ns_t_dname:
+			case ns_t_sink:
 				escape = 0;
+				break;
+			case ns_t_opt:
+			case ns_t_tkey:
+			case ns_t_tsig:
+			case ns_t_ixfr:
+			case ns_t_axfr:
+			case ns_t_mailb:
+			case ns_t_maila:
+			case ns_t_any:
+			case ns_t_zxfr:
+				escape = 0;
+				ns_info(ns_log_load,
+					"%s: Line %d: meta type: %s.",
+					filename, lineno, p_type(type));
+				errs++;
+				break;
+			case ns_t_a6:	/* not implemented */
+			default:
+				escape = 1;
+				break;
 			}
 			if (!getword(buf, sizeof buf, fp, escape))
 				break;
@@ -710,7 +757,8 @@ db_load(const char *filename, const char *in_origin,
 					ns_notice(ns_log_load,
 			 "%s:%d: WARNING: new serial number < old (%lu < %lu)",
 						  filename , lineno,
-						  zp->z_serial, serial);
+						  (unsigned long)zp->z_serial,
+						  (unsigned long)serial);
 				}
 				if (getttl(fp, filename, lineno, &n,
 					   &multiline) <= 0) {
@@ -1004,7 +1052,7 @@ db_load(const char *filename, const char *in_origin,
 			case ns_t_key: 
 			case ns_t_cert:
 		        case ns_t_sig: {
-				char *errmsg = NULL;
+				const char *errmsg = NULL;
 				int ret;
 				if (ttl == USE_MINIMUM)	/* no ttl set */
 					ttl = 0;
@@ -1043,9 +1091,28 @@ db_load(const char *filename, const char *in_origin,
 				endline(fp);
 				break;
 
-
 			default:
-				goto err;
+				if (strcmp(buf, "\\#") != 0)
+					goto err;
+                                if (!getword(buf, sizeof buf, fp, 0) ||
+				     !isdigit((unsigned char)buf[0]))
+					ERRTO("opaque length");
+				n = strtoul(buf, &cp, 10);
+				if (n > 0xffff || *cp != '\0')
+					ERRTO("opaque length");
+				multiline = 0;
+				i = isc_gethexstring(data, sizeof(data), n, fp,
+						     &multiline);
+				if (i == -1)
+					ERRTO("opaque data read failed");
+				if (multiline) {
+					buf[0] = getnonblank(fp, filename, 1);
+					buf[1] = '\0';
+					if (buf[0] != ')')
+						ERRTO("\")\" expected");
+					multiline = 0;
+				}
+				endline(fp);
 			}
 			/*
 			 * Ignore data outside the zone.
@@ -1072,8 +1139,9 @@ db_load(const char *filename, const char *in_origin,
 					  &fcachetab : &hashtab, 
 					  empty_from, &rrcount, lineno,
 					  filename);
-			if (c == CNAMEANDOTHER)
+			if (c == CNAMEANDOTHER || c == NONGLUE)
 				errs++;
+			db_detach(&dp);
 			continue;
 
 		case ERRTOK:
@@ -1091,7 +1159,7 @@ db_load(const char *filename, const char *in_origin,
 			  (dataflags & DB_F_HINT) ? &fcachetab : &hashtab,
 			  empty_from, &rrcount, lineno, filename);
 	if (c != OK) {
-		if (c == CNAMEANDOTHER)
+		if (c == CNAMEANDOTHER || c == NONGLUE)
 			errs++;
 	}
 
@@ -1130,7 +1198,7 @@ db_load(const char *filename, const char *in_origin,
 		while (filenames) {
 			fn = filenames;
 			filenames = filenames->next;
-			freestr(fn->name);
+			fn->name = freestr(fn->name);
 			memput(fn, sizeof *fn);
 		}
 		if (errs != 0) {
@@ -1155,7 +1223,8 @@ db_load(const char *filename, const char *in_origin,
 		zp->z_ftime = 0;
 	}
 #ifdef BIND_NOTIFY
-	if (errs == 0 && (!ininclude) &&
+	if (errs == 0 && (!ininclude) && (initial_configuration == 0 ||
+	    !NS_OPTION_P(OPTION_SUPNOTIFY_INITIAL)) &&
 	    (zp->z_type == z_master || zp->z_type == z_slave))
 		ns_notify(zp->z_origin, zp->z_class, ns_t_soa);
 #endif
@@ -1332,6 +1401,7 @@ getword(char *buf, size_t size, FILE *fp, int preserve) {
 					if (preserve == 1)
 						break;
 				case '\\':
+				case '#':
 				case '.':
 				case '0':
 				case '1':
@@ -1994,7 +2064,7 @@ get_nxt_types(u_char *data, FILE *fp, const char *filename) {
 			continue;
 
 		/* Parse RR type (A, MX, etc) */
-		type = sym_ston(__p_type_syms, (char *)b, &success);
+		type = res_nametotype((char *)b, &success);
 		if ((!success) || type == ns_t_any) {
 			errs++;
 			ns_info(ns_log_db,
@@ -2064,7 +2134,8 @@ fixup_soa(const char *fn, struct zoneinfo *zp) {
 static int
 parse_sig_rr(char *buf, int buf_len, u_char *data, int data_size,
 	     FILE *fp, struct zoneinfo *zp, char *domain, u_int32_t ttl, 
-	     enum context domain_ctx, enum transport transport, char **errmsg)
+	     enum context domain_ctx, enum transport transport,
+	     const char **errmsg)
 {
 /* The SIG record looks like this in the db file:
    Name Cl SIG RRtype Algid [OTTL] Texp Tsig Kfoot Signer Sig
@@ -2097,7 +2168,7 @@ parse_sig_rr(char *buf, int buf_len, u_char *data, int data_size,
 	u_int32_t origTTL;
 	enum context context;
 	time_t now;
-	char *errtype = "SIG error";
+	const char *errtype = "SIG error";
 	int i, my_buf_size = MAXDATA, errs = 0;
 
 	
@@ -2122,7 +2193,7 @@ parse_sig_rr(char *buf, int buf_len, u_char *data, int data_size,
 	if (buf && buf_len == 0) 
 		if (!getmlword((char*)buf, my_buf_size, fp, 0))
 			ERRTO("SIG record doesn't specify type");
-	sig_type = sym_ston(__p_type_syms, buf, &success);
+	sig_type = res_nametotype(buf, &success);
 	if (!success || sig_type == ns_t_any) {
 		/*
 		 * We'll also accept a numeric RR type,
@@ -2324,9 +2395,9 @@ parse_sig_rr(char *buf, int buf_len, u_char *data, int data_size,
 }
 
 static int
-parse_nxt_rr(char *buf, int buf_len, u_char *data, int data_size,
-	     FILE *fp, struct zoneinfo *zp, char *domain, enum context context,
-	     enum transport transport, char **errmsg)
+parse_nxt_rr(char *buf, u_char *data, int data_size, FILE *fp,
+	     struct zoneinfo *zp, char *domain, enum context context,
+	     enum transport transport, const char **errmsg)
 {
 	
 	/* The NXT record looks like:
@@ -2364,7 +2435,7 @@ parse_nxt_rr(char *buf, int buf_len, u_char *data, int data_size,
 
 static int
 parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size, 
-	      FILE *fp, char **errmsg)
+	      FILE *fp, const char **errmsg)
 {
 	/* Cert record looks like:
 	 *   Type Key_tag Alg Cert
@@ -2375,7 +2446,7 @@ parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size,
 	 */
 	u_char *cp;
 	u_int32_t cert_type, key_tag, alg;
-	char *errtype = "CERT parse error";
+	const char *errtype = "CERT parse error";
 	int certlen, i, n, success;
 	
 	i = 0;
@@ -2386,6 +2457,8 @@ parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size,
 		if (wordtouint32_error || cert_type > 0xFFFF)
 			ERRTO("CERT type out of range");
 	}
+	if (i + INT16SZ > data_size)
+		ERRTO("CERT no space");
 	PUTSHORT((u_int16_t)cert_type, cp);
 	i += INT16SZ;
 	
@@ -2396,6 +2469,8 @@ parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size,
 	if (wordtouint32_error || key_tag > 0xFFFF)
 		ERRTO("CERT KEY tag out of range");
 	
+	if (i + INT16SZ > data_size)
+		ERRTO("CERT no space");
 	PUTSHORT((u_int16_t)key_tag, cp);
 	i += INT16SZ;
 	
@@ -2408,7 +2483,8 @@ parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size,
 		if (wordtouint32_error || alg > 0xFF)
 			ERRTO("CERT KEY alg out of range");
 	}
-	
+	if (i + 1 > data_size)
+		ERRTO("CERT no space");
 	data[i++] = (u_char)alg;
 	
 	if (!getallwords(buf, buf_len, fp, 0)) {
@@ -2431,8 +2507,7 @@ parse_cert_rr(char *buf, int buf_len, u_char *data, int data_size,
 
 static int
 parse_key_rr(char *buf, int buf_len, u_char *data, int data_size,
-	     FILE *fp, struct zoneinfo *zp, char *domain, enum context context,
-	     enum transport transport, char **errmsg)
+	     FILE *fp, const char **errmsg)
 {
 	/* The KEY record looks like this in the db file:
 	 *	Name  Cl KEY Flags  Proto  Algid  PublicKeyData
@@ -2449,7 +2524,7 @@ parse_key_rr(char *buf, int buf_len, u_char *data, int data_size,
 	u_int32_t al, pr;
 	int nk, klen,i, n;
 	u_int32_t keyflags;
-	char *errtype = "KEY error";
+	const char *errtype = "KEY error";
 	u_char *cp, *expstart;
 	u_int expbytes, modbytes;
 
@@ -2636,7 +2711,7 @@ int
 parse_sec_rdata(char *buf, int buf_len, int buf_full, u_char *data,
 		int data_size, FILE *fp, struct zoneinfo *zp,
 		char *domain, u_int32_t ttl, int type, enum context context,
-		enum transport transport, char **errmsg)
+		enum transport transport, const char **errmsg)
 {
 	int ret = -1;
 
@@ -2653,11 +2728,10 @@ parse_sec_rdata(char *buf, int buf_len, int buf_full, u_char *data,
 				   domain, ttl, context, transport, errmsg);
 		break;
 	case ns_t_key:
-		ret = parse_key_rr(buf, buf_len, data, data_size, fp, zp,
-				   domain, context, transport, errmsg);
+		ret = parse_key_rr(buf, buf_len, data, data_size, fp, errmsg);
 		break;
 	case ns_t_nxt:
-		ret = parse_nxt_rr(buf, buf_len, data, data_size, fp, zp,
+		ret = parse_nxt_rr(buf, data, data_size, fp, zp,
 				   domain, context, transport, errmsg);
 		break;
 	case ns_t_cert:
@@ -2673,4 +2747,3 @@ parse_sec_rdata(char *buf, int buf_len, int buf_full, u_char *data,
 	endline(fp);
 	return (ret);
 }
-

contrib/bind/bin/named/db_lookup.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_lookup.c	4.18 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: db_lookup.c,v 8.26 2000/04/21 06:54:03 vixie Exp $";
+static const char rcsid[] = "$Id: db_lookup.c,v 8.27 2001/06/18 14:42:55 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -258,7 +258,7 @@ match(struct databuf *dp, int class, int type) {
 		return (0);
 	if (dp->d_type != type && dp->d_type != T_SIG && type != T_ANY)
 		return (0);
-	if (type != T_SIG && dp->d_type == T_SIG && SIG_COVERS(dp) != type)
+	if (type != T_SIG && dp->d_type == T_SIG && (int)SIG_COVERS(dp) != type)
 		return (0);
 	return (1);
 }

contrib/bind/bin/named/db_save.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_save.c	4.16 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: db_save.c,v 8.28 2000/11/29 06:55:48 marka Exp $";
+static const char rcsid[] = "$Id: db_save.c,v 8.30 2002/05/18 01:02:56 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -137,7 +137,7 @@ savedata(class, type, ttl, data, size)
 	int size;
 {
 	struct databuf *dp;
-	int bytes = DATASIZE(size);
+	int bytes = BIND_DATASIZE(size);
 
 	dp = (struct databuf *)memget(bytes);
 	if (dp == NULL)
@@ -158,6 +158,10 @@ savedata(class, type, ttl, data, size)
 	dp->d_rcode = NOERROR;
 	dp->d_addr.s_addr = htonl(0);
 	dp->d_nstime = 0;
+	dp->d_rcnt = 1;
+#ifdef CHECK_MAGIC
+	dp->d_magic = DATABUF_MAGIC;
+#endif
 	memcpy(dp->d_data, data, dp->d_size);
 	return (dp);
 }

contrib/bind/bin/named/db_sec.c

@@ -1,6 +1,6 @@
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: db_sec.c,v 8.32 2000/12/23 08:14:36 vixie Exp $";
+static const char rcsid[] = "$Id: db_sec.c,v 8.35 2001/06/18 14:42:57 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -139,7 +139,7 @@ static struct zpubkey *
 tree_srch_pubkey (const char *name) {
 	struct zpubkey tkey, *key;
 
-	tkey.zpk_name = (char *) name;
+	DE_CONST(name, tkey.zpk_name);
 	if (trusted_keys == NULL) {
 		tree_init(&trusted_keys);
 		return (NULL);
@@ -270,7 +270,7 @@ convert_databuf(struct databuf *dp, struct converted_databuf *cdp) {
 	    case ns_t_soa:
 	    case ns_t_minfo:
 	    case ns_t_rp:
-		if (eob - bp < strlen((char *)cp) + 1)
+		if (eob - bp < (int)strlen((char *)cp) + 1)
 			return (-1);
 		if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
 			return (-1);
@@ -280,7 +280,7 @@ convert_databuf(struct databuf *dp, struct converted_databuf *cdp) {
 		bp += len;
 		cp += strlen((char *)cp) + 1;
 
-		if (eob - bp < strlen((char *)cp) + 1)
+		if (eob - bp < (int)strlen((char *)cp) + 1)
 			return (-1);
 		if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
 			return (-1);
@@ -307,7 +307,7 @@ convert_databuf(struct databuf *dp, struct converted_databuf *cdp) {
 	    case ns_t_mr:
 	    case ns_t_ptr:
 	    case ns_t_nxt:
-		if (eob - bp < strlen((char *)cp) + 1)
+		if (eob - bp < (int)strlen((char *)cp) + 1)
 			return (-1);
 		if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
 			return (-1);
@@ -343,7 +343,7 @@ convert_databuf(struct databuf *dp, struct converted_databuf *cdp) {
 		bp += INT16SZ;
 		cp += INT16SZ;
 
-		if (eob - bp < strlen((char *)cp) + 1)
+		if (eob - bp < (int)strlen((char *)cp) + 1)
 			return (-1);
 		if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
 			return (-1);
@@ -354,7 +354,7 @@ convert_databuf(struct databuf *dp, struct converted_databuf *cdp) {
 		cp += strlen((char *)cp) + 1;
 
 		if (dp->d_type == ns_t_px) {
-			if (eob - bp < strlen((char *)cp) + 1)
+			if (eob - bp < (int)strlen((char *)cp) + 1)
 				return (-1);
 			if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
 				return (-1);
@@ -473,13 +473,15 @@ rrset_trim_sigs(struct db_rrset *rrset) {
 	}
 }
 
-int
+static int
 verify_set(struct db_rrset *rrset) {
 	DST_KEY *key = NULL;
 	struct sig_record *sigdata;
 	struct dnode *sigdn;
 	struct databuf *sigdp;
-	time_t now;
+	u_int32_t now;
+	u_int32_t exptime;
+	u_int32_t signtime;
 	char *signer;
 	u_char name_n[MAXDNAME];
 	u_char *sig, *eom;
@@ -492,6 +494,7 @@ verify_set(struct db_rrset *rrset) {
 	int dnssec_failed = 0, dnssec_succeeded = 0;
 	int return_value;
 	int i;
+	int expired = 0;
 
 	if (rrset == NULL || rrset->rr_name == NULL) {
 		ns_warning (ns_log_default, "verify_set: missing rrset/name");
@@ -527,13 +530,16 @@ verify_set(struct db_rrset *rrset) {
 		 * Don't verify a set if the SIG inception time is in
 		 * the future.  This should be fixed before 2038 (BEW)
 		 */
-		if (ntohl(sigdata->sig_time_n) > now)
+		signtime = ntohl(sigdata->sig_time_n);
+		if (SEQ_GT(signtime, now))
 			continue;
 
 		/* An expired set is dropped, but the data is not. */
-		if (ntohl(sigdata->sig_exp_n) < now) {
-			db_freedata(sigdp);
-			sigdn->dp = NULL;
+		exptime = ntohl(sigdata->sig_exp_n);
+		if (SEQ_GT(now, exptime)) {
+			expired++;
+			db_detach(&sigdn->dp);
+			sigdp = NULL;
 			continue;
 		}
 
@@ -715,15 +721,15 @@ verify_set(struct db_rrset *rrset) {
 
 		if (ret < 0) {
 			dnssec_failed++;
-			db_freedata(sigdp);
-			sigdn->dp = NULL;
+			db_detach(&sigdn->dp);
+			sigdp = NULL;
 		}
 		else
 			dnssec_succeeded++;
 	}
 
 end:
-	if (dnssec_failed > 0)
+	if (dnssec_failed > 0 || expired > 0)
 		rrset_trim_sigs(rrset);
 	if (trustedkey == 0 && key != NULL)
 		dst_free_key(key);
@@ -746,40 +752,27 @@ end:
 }
 
 static void
-rrset_free_partial(struct db_rrset *rrset, int free_data, struct dnode *start) {
+rrset_free(struct db_rrset *rrset) {
 	struct dnode *dnp;
-	int found_start = 0;
 
 	ns_debug(ns_log_default, 5, "rrset_free(%s)", rrset->rr_name);
 
-	if (start == NULL)
-		found_start = 1;
-
 	while (rrset->rr_list) {
 		dnp = rrset->rr_list;
-		if (dnp == start)
-			found_start = 1;
 		rrset->rr_list = rrset->rr_list->dn_next;
-		if (dnp->dp != NULL && free_data == 1 && found_start == 1)
-			db_freedata(dnp->dp);
+		if (dnp->dp != NULL)
+			db_detach(&dnp->dp);
 		memput(dnp, sizeof(struct dnode));
 	}
 	while (rrset->rr_sigs) {
 		dnp = rrset->rr_sigs;
-		if (dnp == start)
-			found_start = 1;
 		rrset->rr_sigs = rrset->rr_sigs->dn_next;
-		if (dnp->dp != NULL && free_data == 1 && found_start == 1)
-			db_freedata(dnp->dp);
+		if (dnp->dp != NULL)
+			db_detach(&dnp->dp);
 		memput(dnp, sizeof(struct dnode));
 	}
 }
 
-static void
-rrset_free(struct db_rrset *rrset, int free_data) {
-	rrset_free_partial(rrset, free_data, NULL);
-}
-
 /*
  * This is called when we have an rrset with SIGs and no other data.
  * Returns 1 if we either found the necessary data or if the SIG can be added
@@ -838,7 +831,6 @@ rrset_db_update(struct db_rrset *rrset, int flags, struct hashbuf **htpp,
 		struct sockaddr_in from, int *rrcount)
 {
 	struct dnode *dnp;
-	struct databuf *dp;
 	int ret;
 
 	/* If we have any unattached SIG records that are DNSSEC signatures,
@@ -848,57 +840,51 @@ rrset_db_update(struct db_rrset *rrset, int flags, struct hashbuf **htpp,
 	 */ 
 	if (rrset->rr_list == NULL) {
 		if (attach_data(rrset) == 0) {
-			rrset_free(rrset, 1);
+			rrset_free(rrset);
 			return (OK);
 		}
 
 		if (rrset->rr_list != NULL &&
 		    verify_set(rrset) == DB_S_FAILED)
 		{
-			rrset_free(rrset, 1);
+			rrset_free(rrset);
 			return (OK);
 		}
 	}
 
 	for (dnp = rrset->rr_list; dnp != NULL; dnp = dnp->dn_next) {
-		dp = dnp->dp;
-		ret = db_update(rrset->rr_name, dp, dp, NULL,
+		ret = db_update(rrset->rr_name, dnp->dp, dnp->dp, NULL,
 				flags, (*htpp), from);
 		if (ret != OK) {
 			/* XXX Probably should do rollback.  */
-			db_err(ret, rrset->rr_name, dp->d_type,
+			db_err(ret, rrset->rr_name, dnp->dp->d_type,
 			       dnp->file, dnp->line);
 			if (ret != DATAEXISTS) {
-				rrset_free_partial(rrset, 1, dnp);
+				rrset_free(rrset);
 				return (ret);
 			}
-			db_freedata(dp);
 		}
 		if (rrcount != NULL)
 			(*rrcount)++;
-		dnp->dp = NULL;
 	}
 	for (dnp = rrset->rr_sigs; dnp != NULL; dnp = dnp->dn_next) {
-		dp = dnp->dp;
-		if (dp == NULL) /* verifyset() can remove sigs */
+		if (dnp->dp == NULL) /* verifyset() can remove sigs */
 			continue;
-		ret = db_update(rrset->rr_name, dp, dp, NULL,
+		ret = db_update(rrset->rr_name, dnp->dp, dnp->dp, NULL,
 				flags, (*htpp), from);
 		if (ret != OK) {
 			/* XXX Probably should do rollback.  */
-			db_err(ret, rrset->rr_name, dp->d_type,
+			db_err(ret, rrset->rr_name, dnp->dp->d_type,
 			       dnp->file, dnp->line);
 			if (ret != DATAEXISTS) {
-				rrset_free_partial(rrset, 1, dnp);
+				rrset_free(rrset);
 				return (ret);
 			}
-			db_freedata(dp);
 		}
 		if (rrcount != NULL)
 			(*rrcount)++;
-		dnp->dp = NULL;
 	}
-	rrset_free(rrset, 0);
+	rrset_free(rrset);
 	return (OK);
 }
 
@@ -927,7 +913,7 @@ add_to_rrset_list(struct db_rrset **rrsets, char *name, struct databuf *dp,
 	while (rrset != NULL) {
 		if (rrset->rr_type != ns_t_nxt || dp->d_type != ns_t_nxt) {
 			if (dp->d_type == ns_t_sig) {
-				if (SIG_COVERS(dp) == rrset->rr_type)
+				if ((int)SIG_COVERS(dp) == rrset->rr_type)
 					break;
 			} else {
 				if (dp->d_type == rrset->rr_type)
@@ -942,10 +928,7 @@ add_to_rrset_list(struct db_rrset **rrsets, char *name, struct databuf *dp,
 	if (rrset != NULL) {
 		if ((dp->d_type == ns_t_sig && rr_in_set(dp, rrset->rr_sigs)) ||
 		    (dp->d_type != ns_t_sig && rr_in_set(dp, rrset->rr_list)))
-		{
-			db_freedata(dp);
 			return (DATAEXISTS);
-		}
 	} else {
 		rrset = (struct db_rrset *) memget(sizeof(struct db_rrset));
 		if (rrset == NULL)
@@ -968,6 +951,7 @@ add_to_rrset_list(struct db_rrset **rrsets, char *name, struct databuf *dp,
 			 "add_to_rrset_list: memget failed(%s)", name);
 	memset(dnp, 0, sizeof(struct dnode));
 	dnp->dp = dp;
+	DRCNTINC(dnp->dp);
 	if (dp->d_type == ns_t_sig) {
 		if (rrset->rr_sigs != NULL) {
 			struct dnode *fdnp;
@@ -995,7 +979,7 @@ add_to_rrset_list(struct db_rrset **rrsets, char *name, struct databuf *dp,
 		} else
 			rrset->rr_list = dnp;
 	}
-	dnp->file = (char *) file;
+	dnp->file = file;
 	dnp->line = line;
 	return (0);
 }
@@ -1035,10 +1019,10 @@ update_rrset_list(struct db_rrset **rrsets, int flags, struct hashbuf **htpp,
 				result = tresult;
 		}
 		else {
-			rrset_free(rrset, 1);
+			rrset_free(rrset);
 			result = DNSSECFAIL;
 		}
-		freestr(rrset->rr_name);
+		rrset->rr_name = freestr(rrset->rr_name);
 		next = rrset->rr_next;
 		memput(rrset, sizeof(struct db_rrset));
 		rrset = next;

contrib/bind/bin/named/db_tsig.c

@@ -1,6 +1,6 @@
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: db_tsig.c,v 8.6 2000/04/21 06:54:04 vixie Exp $";
+static const char rcsid[] = "$Id: db_tsig.c,v 8.8 2002/05/21 02:34:32 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -110,7 +110,7 @@ typedef struct {
 #define TSIG_ALG_MD5 "HMAC-MD5.SIG-ALG.REG.INT"
 #define TSIG_ALG_MD5_SHORT "hmac-md5"
 
-char *
+const char *
 tsig_alg_name(int value) {
 	if (value == KEY_HMAC_MD5)
 		return(TSIG_ALG_MD5);
@@ -129,7 +129,7 @@ tsig_alg_value(char *name) {
 
 DST_KEY *
 tsig_key_from_addr(struct in_addr addr) {
-	server_info si = si = find_server(addr);
+	server_info si = find_server(addr);
 	if (si == NULL || si->key_list == NULL || si->key_list->first == NULL)
 		return(NULL);
 	return(si->key_list->first->key);

contrib/bind/bin/named/db_update.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_update.c	4.28 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: db_update.c,v 8.46 2001/02/08 02:05:51 marka Exp $";
+static const char rcsid[] = "$Id: db_update.c,v 8.50 2001/10/24 23:53:09 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -117,7 +117,7 @@ isRefByNS(const char *name, struct hashbuf *htp) {
 			     dp->d_class == C_HS) &&
 			    dp->d_type == T_NS &&
 			    !dp->d_rcode &&
-			    ns_samename(name, (char *)dp->d_data) == 1) {
+			    ns_samename(name, (const char *)dp->d_data) == 1) {
 				return (1);
 			}
 		}
@@ -227,7 +227,7 @@ db_update(const char *name,
 	struct databuf *tmpdp;
 #endif
 
-	ns_debug(ns_log_db, 3, "db_update(%s, %#x, %#x, %#x, 0%o, %#x)%s",
+	ns_debug(ns_log_db, 3, "db_update(%s, %p, %p, %p, 0%o, %p)%s",
 		 name, odp, newdp, savedpp, flags, htp,
 		 (odp && (odp->d_flags&DB_F_HINT)) ? " hint" : "");
 	np = nlookup(name, &htp, &fname, newdp != NULL);
@@ -267,9 +267,21 @@ db_update(const char *name,
 
 	if (newdp && zn && !(flags & DB_NOTAUTH)) {
 		if (nlabels(zones[zn].z_origin) > newdp->d_clev) {
-			ns_debug(ns_log_db, 5,
-				 "attempted update child zone %s, %s",
-				 zones[zn].z_origin, name);
+			if ((!ISVALIDGLUE(newdp) &&
+			    zones[newdp->d_zone].z_type == Z_PRIMARY) ||
+			    (newdp->d_type == T_NS &&
+			     !ns_samename(name, zones[zn].z_origin))) {
+				ns_info(ns_log_db,
+			  "domain %s %s record in zone %s should be in zone %s",
+				name, p_type(newdp->d_type),
+				zones[newdp->d_zone].z_origin,
+				zones[zn].z_origin);
+				return (NONGLUE);
+			} else
+				ns_debug(ns_log_db, 5,
+				       "attempted update child zone %s, %s %s",
+					 zones[zn].z_origin, name,
+					 p_type(newdp->d_type));
 			return (AUTH);
 		}
 	}
@@ -319,11 +331,10 @@ db_update(const char *name,
 			      dp, dp, NULL,
 			      (flags|DB_NOHINTS),
 			      fcachetab, from)
-		    != OK) {
+		    != OK)
 			ns_debug(ns_log_db, 3,
-				 "db_update: hint %#x freed", dp);
-			db_freedata(dp);
-		}
+				 "db_update: hint %p freed", dp);
+		db_detach(&dp);
         }
 
 	if (odp != NULL) {
@@ -749,7 +760,7 @@ db_update(const char *name,
 	 *	response source address here if flags&NOTAUTH.
 	 */
 	fixttl(newdp);
-	ns_debug(ns_log_db, 3, "db_update: adding%s %#x",
+	ns_debug(ns_log_db, 3, "db_update: adding%s %p",
 		 (newdp->d_flags&DB_F_HINT) ? " hint":"", newdp);
 
 	if (newdp->d_zone == DB_Z_CACHE &&
@@ -840,7 +851,8 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 	case T_MG:
 	case T_MR:
 		/* Only a domain name */
-		if (ns_samename((char *)dp1->d_data, (char *)dp2->d_data) == 1)
+		if (ns_samename((const char *)dp1->d_data,
+			        (const char *)dp2->d_data) == 1)
 			return (0);
 		else
 			return (1);
@@ -852,9 +864,9 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 		if (memcmp(dp1->d_data, dp2->d_data, NS_SIG_SIGNER))
 			return (1);
 		len = NS_SIG_SIGNER +
-			strlen((char *)dp1->d_data + NS_SIG_SIGNER);
-		if (ns_samename((char *)dp1->d_data + NS_SIG_SIGNER,
-				(char *)dp2->d_data + NS_SIG_SIGNER) != 1)
+			strlen((const char *)dp1->d_data + NS_SIG_SIGNER);
+		if (ns_samename((const char *)dp1->d_data + NS_SIG_SIGNER,
+				(const char *)dp2->d_data + NS_SIG_SIGNER) != 1)
 			return (1);
 		return (memcmp(dp1->d_data + len,
 			       dp2->d_data + len,
@@ -862,9 +874,10 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 
 	case T_NXT:
 		/* First a domain name, then binary data */
-		if (ns_samename((char *)dp1->d_data, (char *)dp2->d_data) != 1)
+		if (ns_samename((const char *)dp1->d_data,
+			        (const char *)dp2->d_data) != 1)
 			return (1);
-		len = strlen((char *)dp1->d_data)+1;
+		len = strlen((const char *)dp1->d_data)+1;
 		return (memcmp(dp1->d_data + len,
 			       dp2->d_data + len,
 			       dp1->d_size - len));
@@ -877,7 +890,7 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 		len2 = *cp2;
 		if (len != len2)
                       return (1);
-		if (strncasecmp((char *)++cp1, (char *)++cp2, len))
+		if (strncasecmp((const char *)++cp1, (const char *)++cp2, len))
 			return (1);
 		cp1 += len;
 		cp2 += len;
@@ -885,21 +898,23 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 		len2 = *cp2;
 		if (len != len2)
                       return (1);
-		return (strncasecmp((char *)++cp1, (char *)++cp2, len));
+		return (strncasecmp((const char *)++cp1, (const char *)++cp2,
+				    len));
 
 	case T_SOA:
 	case T_MINFO:
 	case T_RP:
-		if (ns_samename((char *)dp1->d_data, (char *)dp2->d_data) != 1)
+		if (ns_samename((const char *)dp1->d_data,
+			        (const char *)dp2->d_data) != 1)
 			return (1);
-		cp1 = dp1->d_data + strlen((char *)dp1->d_data) + 1;
-		cp2 = dp2->d_data + strlen((char *)dp2->d_data) + 1;
-		if (ns_samename((char *)cp1, (char *)cp2) != 1)
+		cp1 = dp1->d_data + strlen((const char *)dp1->d_data) + 1;
+		cp2 = dp2->d_data + strlen((const char *)dp2->d_data) + 1;
+		if (ns_samename((const char *)cp1, (const char *)cp2) != 1)
 			return (1);
 		if (dp1->d_type != T_SOA)
 			return (0);
-		cp1 += strlen((char *)cp1) + 1;
-		cp2 += strlen((char *)cp2) + 1;
+		cp1 += strlen((const char *)cp1) + 1;
+		cp2 += strlen((const char *)cp2) + 1;
 		return (memcmp(cp1, cp2, INT32SZ * 5));
 	
 	case T_NAPTR: {
@@ -937,7 +952,7 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 		cp1 += t1; cp2 += t2;
 
 		/* Replacement */
-		if (ns_samename((char *)cp1, (char *)cp2) != 1)
+		if (ns_samename((const char *)cp1, (const char *)cp2) != 1)
 			return (1);
 
 		/* they all checked out! */
@@ -958,7 +973,7 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 			if (*cp1++ != *cp2++ || *cp1++ != *cp2++) /* port */
 				return (1);
 		}
-		if (ns_samename((char *)cp1, (char *)cp2) != 1)
+		if (ns_samename((const char *)cp1, (const char *)cp2) != 1)
 			return (1);
 		return (0);
 
@@ -967,11 +982,11 @@ db_cmp(const struct databuf *dp1, const struct databuf *dp2) {
 		cp2 = dp2->d_data;
 		if (*cp1++ != *cp2++ || *cp1++ != *cp2++)       /* cmp prio */
 			return (1);
-		if (ns_samename((char *)cp1, (char *)cp2) != 1)
+		if (ns_samename((const char *)cp1, (const char *)cp2) != 1)
 			return (1);
-		cp1 += strlen((char *)cp1) + 1;
-		cp2 += strlen((char *)cp2) + 1;
-		if (ns_samename((char *)cp1, (char *)cp2) != 1)
+		cp1 += strlen((const char *)cp1) + 1;
+		cp2 += strlen((const char *)cp2) + 1;
+		if (ns_samename((const char *)cp1, (const char *)cp2) != 1)
 			return (1);
 		return (0);
 	

contrib/bind/bin/named/named.conf

@@ -14,6 +14,16 @@
 
 // watch out for ";" -- it's important!
 
+key sample_key {			// for TSIG
+	algorithm hmac-md5;		// hmac-md5 is the supported algorithm
+	secret "abcdefgh";		// base 64 encoded secret
+};
+
+key key2 {
+	algorithm hmac-md5;
+	secret "87654321";
+};
+
 options {
 	directory ".";			// use current directory
 	named-xfer "/usr/libexec/named-xfer";	// _PATH_XFER
@@ -42,7 +52,9 @@ options {
 					// notify on a zone-by-zone
 					// basis in the "zone" statement
 					// see (below)
-	max-serial-queries 4;		// number of parallel SOA queries
+	// notify explicit;		// only sent the notifies to the
+					// also-notify list
+	serial-queries 4;		// number of parallel SOA queries
 					// we can have outstanding for master
 					// zone change testing purposes
 	auth-nxdomain yes;		// always set AA on NXDOMAIN.
@@ -183,6 +195,8 @@ zone "master.demo.zone" {
 					// zone?  The global option is used
 					// if "notify" is not specified
 					// here.
+	// notify explicit;		// only sent the notifies to the
+					// also-notify list
 	also-notify { };		// don't notify any nameservers other
 					// than those on the NS list for this
 					// zone
@@ -194,7 +208,7 @@ zone "slave.demo.zone" {
 	ixfr-base  "slave.demo.zone.ixfr";  // File name for IXFR transaction log file
 	masters {
 		1.2.3.4;		// where to zone transfer from
-		5.6.7.8;
+		5.6.7.8 key key2;
 	};
 	transfer-source 10.0.0.53;	// fixes multihoming problems
 	check-names warn;
@@ -250,19 +264,11 @@ zone "non-default-acl.demo.zone" {
 	};
 };
 
-key sample_key {			// for TSIG
-	algorithm hmac-md5;		// hmac-md5 is the supported algorithm
-	secret "abcdefgh";		// base 64 encoded secret
-};
-
-key key2 {
-	algorithm hmac-md5;
-	secret "87654321";
-};
-
 acl key_acl { key sample_key; };	// a request signed with sample_key
 
 server 1.2.3.4 {
+	edns no;			// if no, we won't send ends queries
+					// to this server
 	bogus no;			// if yes, we won't query or listen
 					// to this server
 	transfer-format one-answer;	// set transfer format for this

contrib/bind/bin/named/named.h

@@ -16,10 +16,11 @@
  */
 
 /*
- * $Id: named.h,v 8.28 2001/02/12 05:56:15 marka Exp $
+ * $Id: named.h,v 8.32 2002/03/15 00:58:16 vixie Exp $
  */
 
 /* Options. Change them at your peril. */
+#undef NXDOMAIN_ON_DENIAL
 #define DEBUG
 #define ADDAUTH
 #define STUBS
@@ -28,7 +29,7 @@
 #define TRACEROOT
 #define XFRNETS
 #define QRYLOG
-#define YPKLUDGE
+#undef YPKLUDGE
 #define	RENICE
 #define BIND_IXFR
 #define BIND_NOTIFY
@@ -45,6 +46,8 @@
 #define STRICT_RFC2308
 #undef BIND_ZXFR
 #undef LOG_TSIG_BUG
+#define NOADDITIONAL
+#undef FORWARD_ALLOWS	/* enable allow-query for forward zones. */
 
 #include <isc/assertions.h>
 #include <isc/list.h>

contrib/bind/bin/named/ns_config.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_config.c,v 8.121 2001/02/08 02:05:53 marka Exp $";
+static const char rcsid[] = "$Id: ns_config.c,v 8.135 2002/05/24 03:04:59 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -89,7 +89,6 @@ static int default_logging_installed;
 static int options_installed = 0;
 static int logging_installed = 0;
 static int default_options_installed;
-static int initial_configuration = 1;
 
 static char **logging_categories;
 static char *current_pid_filename = NULL;
@@ -102,7 +101,7 @@ static symbol_table zone_symbol_table;
 void
 free_zone_timerinfo(struct zoneinfo *zp) {
 	if (zp->z_timerinfo != NULL) {
-		freestr(zp->z_timerinfo->name);
+		zp->z_timerinfo->name = freestr(zp->z_timerinfo->name);
 		memput(zp->z_timerinfo, sizeof *zp->z_timerinfo);
 		zp->z_timerinfo = NULL;
 	} else
@@ -125,17 +124,13 @@ free_zone_contents(struct zoneinfo *zp, int undefine_sym) {
 				 strerror(errno));
 	}
 	if (zp->z_origin != NULL)
-		freestr(zp->z_origin);
-	zp->z_origin = NULL;
+		zp->z_origin = freestr(zp->z_origin);
 	if (zp->z_source != NULL)
-		freestr(zp->z_source);
-	zp->z_source = NULL;
+		zp->z_source = freestr(zp->z_source);
 	if (zp->z_ixfr_base != NULL)
-		freestr(zp->z_ixfr_base);
-	zp->z_ixfr_base = NULL;
+		zp->z_ixfr_base = freestr(zp->z_ixfr_base);
 	if (zp->z_ixfr_tmp != NULL)
-		freestr(zp->z_ixfr_tmp);
-	zp->z_ixfr_tmp = NULL;
+		zp->z_ixfr_tmp = freestr(zp->z_ixfr_tmp);
 	if (zp->z_update_acl != NULL)
 		free_ip_match_list(zp->z_update_acl);
 	zp->z_update_acl = NULL;
@@ -147,8 +142,7 @@ free_zone_contents(struct zoneinfo *zp, int undefine_sym) {
 	zp->z_transfer_acl = NULL;
 #ifdef BIND_UPDATE
 	if (zp->z_updatelog != NULL)
-		freestr(zp->z_updatelog);
-	zp->z_updatelog = NULL;
+		zp->z_updatelog = freestr(zp->z_updatelog);
 #endif /* BIND_UPDATE */
 #ifdef BIND_NOTIFY
 	if (zp->z_also_notify != NULL)
@@ -156,6 +150,9 @@ free_zone_contents(struct zoneinfo *zp, int undefine_sym) {
 		       zp->z_notify_count * sizeof *zp->z_also_notify);
 	zp->z_also_notify = NULL;
 #endif
+	if (zp->z_fwdtab != NULL)
+		free_forwarders(zp->z_fwdtab);
+	zp->z_fwdtab = NULL;
 	block_signals();
 	if (LINKED(zp, z_reloadlink))
 		UNLINK(reloadingzones, zp, z_reloadlink);
@@ -189,7 +186,7 @@ find_zone(const char *name, int class) {
 }
 
 static struct zoneinfo *
-new_zone(int class, int type) {
+new_zone(void) {
 	struct zoneinfo *zp;
 
 	if (EMPTY(freezones))
@@ -303,9 +300,16 @@ validate_zone(struct zoneinfo *zp) {
 	if (zp->z_query_acl) {
 		if (zp->z_type != z_master &&
 		    zp->z_type != z_slave &&
+#ifdef FORWARD_ALLOWS
+		    zp->z_type != z_forward &&
+#endif
 		    zp->z_type != z_stub) {
 			ns_error(ns_log_config,
+#ifdef FORWARD_ALLOWS
+		  "'allow-query' option for hint zone '%s'",
+#else
 		  "'allow-query' option for non-{master,slave,stub} zone '%s'",
+#endif
 				 zp->z_origin);
 			return (0);
 		}
@@ -313,7 +317,7 @@ validate_zone(struct zoneinfo *zp) {
 
 #ifdef BIND_NOTIFY
 	/* Check notify */
-	if (zp->z_notify != znotify_use_default) {
+	if (zp->z_notify != notify_use_default) {
 		if (zp->z_type != z_master && zp->z_type != z_slave) {
 			ns_error(ns_log_config,
 			"'notify' given for non-master, non-slave zone '%s'",
@@ -472,7 +476,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 	 * any data that was dynamically allocated.
 	 */
 	if (zp->z_origin != NULL)
-		freestr(zp->z_origin);
+		(void)freestr(zp->z_origin);
 	zp->z_origin = new_zp->z_origin;
 	new_zp->z_origin = NULL;
 	zp->z_maintain_ixfr_base = new_zp->z_maintain_ixfr_base;
@@ -480,8 +484,10 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 	zp->z_class = new_zp->z_class;
 	zp->z_type = new_zp->z_type;
 	zp->z_checknames = new_zp->z_checknames;
-	for (i = 0; i < new_zp->z_addrcnt; i++)
+	for (i = 0; i < new_zp->z_addrcnt; i++) {
 		zp->z_addr[i] = new_zp->z_addr[i];
+		zp->z_keys[i] = new_zp->z_keys[i];
+	}
 	zp->z_addrcnt = new_zp->z_addrcnt;
 	if (zp->z_update_acl)
 		free_ip_match_list(zp->z_update_acl);
@@ -529,7 +535,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 	zp->z_dumpintvl = new_zp->z_dumpintvl;
 	zp->z_deferupdcnt = new_zp->z_deferupdcnt;
 	if (zp->z_updatelog)
-		freestr(zp->z_updatelog);
+		(void)freestr(zp->z_updatelog);
 	zp->z_updatelog = new_zp->z_updatelog;
 	new_zp->z_updatelog = NULL;
 #endif /* BIND_UPDATE */
@@ -554,7 +560,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 
 		/* File has changed, or hasn't been loaded yet. */
 		if (zp->z_source) {
-			freestr(zp->z_source);
+			zp->z_source = freestr(zp->z_source);
 			ns_stopxfrs(zp);
 			purge_zone(zp->z_origin, fcachetab, zp->z_class);
 		}
@@ -562,12 +568,12 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 		new_zp->z_source = NULL;
 
 		if (zp->z_ixfr_base)
-			freestr(zp->z_ixfr_base);
+			(void)freestr(zp->z_ixfr_base);
 		zp->z_ixfr_base = new_zp->z_ixfr_base;
 		new_zp->z_ixfr_base = NULL;	
 
 		if (zp->z_ixfr_tmp)
-			freestr(zp->z_ixfr_tmp);
+			(void)freestr(zp->z_ixfr_tmp);
 		zp->z_ixfr_tmp = new_zp->z_ixfr_tmp;
 		new_zp->z_ixfr_tmp = NULL;	
 
@@ -597,17 +603,17 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 	primary_reload:
 #endif /* BIND_UPDATE */
 		if (zp->z_source != NULL)
-			freestr(zp->z_source);
+			(void)freestr(zp->z_source);
 		zp->z_source = new_zp->z_source;
 		new_zp->z_source = NULL;
 
 		if (zp->z_ixfr_base != NULL)
-			freestr(zp->z_ixfr_base);
+			(void)freestr(zp->z_ixfr_base);
 		zp->z_ixfr_base = new_zp->z_ixfr_base;
 		new_zp->z_ixfr_base = NULL;
 
 		if (zp->z_ixfr_tmp != NULL)
-			freestr(zp->z_ixfr_tmp);
+			(void)freestr(zp->z_ixfr_tmp);
 		zp->z_ixfr_tmp = new_zp->z_ixfr_tmp;
 		new_zp->z_ixfr_tmp = NULL;
 
@@ -649,8 +655,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 		     ((!reconfiging) && zonefile_changed_p(zp)))) {
 			ns_debug(ns_log_config, 1,
 				 "backup file changed or missing");
-			freestr(zp->z_source);
-			zp->z_source = NULL;
+			zp->z_source = freestr(zp->z_source);
 			zp->z_serial = 0;	/* force xfer */
 			ns_stopxfrs(zp);
 			/*
@@ -674,7 +679,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 		}
 
 		if (zp->z_ixfr_base != NULL)
-			freestr(zp->z_ixfr_base);
+			(void)freestr(zp->z_ixfr_base);
 		zp->z_ixfr_base = new_zp->z_ixfr_base;
 		new_zp->z_ixfr_base = NULL;
 
@@ -727,7 +732,7 @@ update_zone_info(struct zoneinfo *zp, struct zoneinfo *new_zp) {
 void
 end_zone(zone_config zh, int should_install) {
 	struct zoneinfo *zp, *new_zp;
-	char *zname;
+	const char *zname;
 	symbol_value value;
 
 	new_zp = zh.opaque;
@@ -753,11 +758,11 @@ end_zone(zone_config zh, int should_install) {
 		zp = NULL;
 	}
 	if (zp == NULL) {
-		zp = new_zone(new_zp->z_class, new_zp->z_type);
+		zp = new_zone();
 		INSIST(zp != NULL);
 		value.integer = (zp - zones);
-		define_symbol(zone_symbol_table, savestr(new_zp->z_origin, 1),
-			      new_zp->z_class, value, SYMBOL_FREE_KEY);
+		define_symbol(zone_symbol_table, new_zp->z_origin,
+			      new_zp->z_class, value, 0);
 	}
 	ns_debug(ns_log_config, 5, "zone '%s', type = %d, class = %d", zname,
 		 new_zp->z_type, new_zp->z_class);
@@ -867,7 +872,7 @@ set_zone_dialup(zone_config zh, int value) {
 	if (value) {
 		zp->z_dialup = zdialup_yes;
 #ifdef BIND_NOTIFY
-		zp->z_notify = znotify_yes;
+		zp->z_notify = notify_yes;
 #endif
 	} else
 		zp->z_dialup = zdialup_no;
@@ -876,17 +881,14 @@ set_zone_dialup(zone_config zh, int value) {
 }
 
 int
-set_zone_notify(zone_config zh, int value) {
+set_zone_notify(zone_config zh, enum notify value) {
 #ifdef BIND_NOTIFY
 	struct zoneinfo *zp;
 
 	zp = zh.opaque;
 	INSIST(zp != NULL);
 
-	if (value)
-		zp->z_notify = znotify_yes;
-	else
-		zp->z_notify = znotify_no;
+	zp->z_notify = value;
 #endif
 	return (1);
 }
@@ -930,7 +932,7 @@ set_zone_query_acl(zone_config zh, ip_match_list iml) {
 	zp = zh.opaque;
 	INSIST(zp != NULL);
 
-	/* Fail if checknames already set for this zone */
+	/* Fail if allow-query acl already set for this zone */
 	if (zp->z_query_acl != NULL)
 		return (0);
 	zp->z_query_acl = iml;
@@ -960,7 +962,7 @@ set_zone_transfer_acl(zone_config zh, ip_match_list iml) {
 	zp = zh.opaque;
 	INSIST(zp != NULL);
 
-	/* Fail if checknames already set for this zone */
+	/* Fail if allow-transfer acl already set for this zone */
 	if (zp->z_transfer_acl != NULL)
 		return (0);
 	zp->z_transfer_acl = iml;
@@ -974,7 +976,7 @@ set_zone_transfer_time_in(zone_config zh, long max_time) {
 	zp = zh.opaque;
 	INSIST(zp != NULL);
 
-	/* Fail if checknames already set for this zone */
+	/* Fail if max-transfer-time-in already set for this zone */
 	if (zp->z_max_transfer_time_in)
 		return (0);
 	zp->z_max_transfer_time_in = max_time;
@@ -1013,13 +1015,14 @@ set_trusted_key(const char *name, const int flags, const int proto,
 }
 
 int
-add_zone_master(zone_config zh, struct in_addr address) {
+add_zone_master(zone_config zh, struct in_addr address, struct dst_key * key) {
 	struct zoneinfo *zp;
 
 	zp = zh.opaque;
 	INSIST(zp != NULL);
 
 	zp->z_addr[zp->z_addrcnt] = address;
+	zp->z_keys[zp->z_addrcnt] = key;
 	zp->z_addrcnt++;
 	if (zp->z_addrcnt >= NSMAX) {
 		ns_warning(ns_log_config, "NSMAX reached for zone '%s'",
@@ -1084,12 +1087,17 @@ add_zone_notify(zone_config zh, struct in_addr address) {
 options
 new_options() {
 	options op;
+	char hostname[256];
 
 	op = (options)memget(sizeof (struct options));
 	if (op == NULL)
 		panic("memget failed in new_options()", NULL);
 
 	op->version = savestr(ShortVersion, 1);
+	if (gethostname(hostname, sizeof(hostname)) == 0)
+		op->hostname = savestr(hostname, 1);
+	else
+		op->hostname = NULL;
 	op->directory = savestr(".", 1);
 	op->pid_filename = savestr(_PATH_PIDFILE, 1);
 	op->named_xfer = savestr(_PATH_XFER, 1);
@@ -1136,8 +1144,12 @@ new_options() {
 	op->max_host_stats = 0;
 	op->lame_ttl = NTTL;
 	op->heartbeat_interval = 3600;
-	op->max_log_size_ixfr = 20;
+	op->max_log_size_ixfr = 0;
 	op->minroots = MINROOTS;
+	op->preferred_glue = 0;
+#ifdef BIND_NOTIFY
+	op->notify = notify_yes;
+#endif
 	return (op);
 }
 
@@ -1145,20 +1157,22 @@ void
 free_options(options op) {
 	INSIST(op != NULL);
 
+	if (op->hostname)
+		op->hostname = freestr(op->hostname);
 	if (op->version)
-		freestr(op->version);
+		op->version = freestr(op->version);
 	if (op->directory)
-		freestr(op->directory);
+		op->directory = freestr(op->directory);
 	if (op->pid_filename)
-		freestr(op->pid_filename);
+		op->pid_filename = freestr(op->pid_filename);
 	if (op->named_xfer)
-		freestr(op->named_xfer);
+		op->named_xfer = freestr(op->named_xfer);
 	if (op->dump_filename)
-		freestr(op->dump_filename);
+		op->dump_filename = freestr(op->dump_filename);
 	if (op->stats_filename)
-		freestr(op->stats_filename);
+		op->stats_filename = freestr(op->stats_filename);
 	if (op->memstats_filename)
-		freestr(op->memstats_filename);
+		op->memstats_filename = freestr(op->memstats_filename);
 #ifdef BIND_NOTIFY
 	if (op->also_notify)
 		free_also_notify(op);
@@ -1196,7 +1210,7 @@ set_boolean_option(u_int *op_flags, int bool_opt, int value) {
 	case OPTION_NOFETCHGLUE:
 	case OPTION_FORWARD_ONLY:
 	case OPTION_FAKE_IQUERY:
-	case OPTION_NONOTIFY:
+	case OPTION_SUPNOTIFY_INITIAL:
 	case OPTION_NONAUTH_NXDOMAIN:
 	case OPTION_MULTIPLE_CNAMES:
 	case OPTION_USE_IXFR:
@@ -1290,7 +1304,7 @@ ns_rlimit(enum limit limit, u_long limit_value) {
 	struct rlimit limits, old_limits;
 	int rlimit = -1;
 	int fdlimit = evHighestFD(ev) + 1;
-	char *name;
+	const char *name;
 	rlimit_type value;
 
 	if (limit_value == ULONG_MAX) {
@@ -1337,7 +1351,7 @@ ns_rlimit(enum limit limit, u_long limit_value) {
 		name = "max number of open files";
 		if (value == 0)
 			limits = initial_num_files;
-		if (value > fdlimit)
+		if ((int)value > fdlimit)
 			limits.rlim_cur = limits.rlim_max = value = fdlimit;
 		break;
 	default:
@@ -1455,8 +1469,10 @@ write_open(char *filename) {
 		return (NULL);
 	(void) fchown(fd, user_id, group_id);
 	stream = fdopen(fd, "w");
-	if (stream == NULL)
+	if (stream == NULL) {
+		(void)unlink(filename);
 		(void)close(fd);
+	}
 	return (stream);
 }
 
@@ -1470,8 +1486,7 @@ update_pid_file() {
 	/* XXX */ ns_debug(ns_log_default, 1, "update_pid_file()");
 	if (current_pid_filename != NULL) {
 		(void)unlink(current_pid_filename);
-		freestr(current_pid_filename);
-		current_pid_filename = NULL;
+		current_pid_filename = freestr(current_pid_filename);
 	}
 	current_pid_filename = savestr(server_options->pid_filename, 0);
 	if (current_pid_filename == NULL) {
@@ -1521,6 +1536,11 @@ static void
 periodic_getnetconf(evContext ctx, void *uap, struct timespec due,
 		    struct timespec inter)
 {
+	UNUSED(ctx);
+	UNUSED(uap);
+	UNUSED(due);
+	UNUSED(inter);
+
 	getnetconf(1);
 }
 
@@ -1709,11 +1729,11 @@ use_default_options() {
  * rrset order types
  */
 static struct res_sym order_table [] = {
-	{ unknown_order, " unknown " }, /* can't match */
-	{ fixed_order, "fixed" },
-	{ cyclic_order, "cyclic" },
-	{ random_order, "random" },
-	{ unknown_order, NULL }
+	{ unknown_order, " unknown ", NULL }, /* can't match */
+	{ fixed_order, "fixed", NULL },
+	{ cyclic_order, "cyclic", NULL },
+	{ random_order, "random", NULL },
+	{ unknown_order, NULL, NULL }
 };
 
 /*
@@ -1759,7 +1779,7 @@ free_rrset_order_list(rrset_order_list rol) {
 
 	for (roe = rol->first; roe != NULL; roe = next_element) {
 		next_element = roe->next;
-		freestr(roe->name);
+		roe->name = freestr(roe->name);
 		memput(roe, sizeof (*roe));
 	}
 	memput(rol, sizeof (*rol));
@@ -1778,6 +1798,7 @@ add_to_rrset_order_list(rrset_order_list rol, rrset_order_element roe) {
 		rol->first = roe;
 }
 
+#ifdef notyet
 /* XXX this isn't being used yet, but it probably should be. Where? */
 void
 dprint_rrset_order_list(int category, rrset_order_list rol, int indent,
@@ -1799,7 +1820,7 @@ dprint_rrset_order_list(int category, rrset_order_list rol, int indent,
 			 roe->name, p_order(roe->order));
 	}
 }
-
+#endif
 
 rrset_order_element
 new_rrset_order_element(int class, int type, char *name, enum ordering order)
@@ -1986,7 +2007,7 @@ add_to_ip_match_list(ip_match_list iml, ip_match_element ime) {
 
 void
 dprint_ip_match_list(int category, ip_match_list iml, int indent,
-		     char *allow, char *deny) {
+		     const char *allow, const char *deny) {
 	ip_match_element ime;
 	char spaces[40+1];
 	char addr_text[sizeof "255.255.255.255"];
@@ -2083,6 +2104,7 @@ ip_match_addr_or_key(ip_match_list iml, struct in_addr address,
 					continue;
 			}
 		default:
+			indirect = 0;
 			panic("unexpected ime type in ip_match_addr_or_key()",
 			      NULL);
 		}
@@ -2278,7 +2300,6 @@ find_forwarder(struct in_addr address)
 {
 	struct fwddata *fdp;
 	struct fwddata **fdpp = NULL;
-	struct databuf *ns, *nsdata;
 	register int i;
 
 	for (i = 0; i < fwddata_count; i++) {
@@ -2299,28 +2320,19 @@ find_forwarder(struct in_addr address)
 	if (!fdp)
 		panic("memget failed in find_forwarder", NULL);
 
+	memset(&fdp->fwdaddr, 0, sizeof(fdp->fwdaddr));
 	fdp->fwdaddr.sin_family = AF_INET;
 	fdp->fwdaddr.sin_addr = address;
 	fdp->fwdaddr.sin_port = ns_port;
 
-	ns = fdp->ns = (struct databuf *)memget(sizeof(*ns));
-	if (!ns)
+	fdp->ns = savedata(C_IN, T_NS, 0, NULL, 0);
+	if (!fdp->ns)
 		panic("memget failed in find_forwarder", NULL);
-	memset(ns, 0, sizeof(*ns));
 
-	nsdata = fdp->nsdata = (struct databuf *)memget(sizeof(*nsdata));
-	if (!nsdata)
+	fdp->nsdata = savedata(C_IN, T_A, 0, NULL, 0);
+	if (!fdp->nsdata)
 		panic("memget failed in find_forwarder", NULL);
-	memset(nsdata, 0, sizeof(*nsdata));
-
-	ns->d_type = T_NS; 
-	ns->d_class = C_IN;
-	ns->d_rcnt = 1;
-
-	nsdata->d_type = T_A;
-	nsdata->d_class = C_IN;
-	nsdata->d_nstime = 1 + (int)(25.0*rand()/(RAND_MAX + 1.0));
-	nsdata->d_rcnt = 1;
+	fdp->nsdata->d_nstime = 1 + (int)(25.0*rand()/(RAND_MAX + 1.0));
 
 	fdp->ref_count = 1;
 
@@ -2480,7 +2492,7 @@ set_zone_forward(zone_config zh) {
 void
 add_zone_forwarder(zone_config zh, struct in_addr address) {
 	struct zoneinfo *zp;
-	char *zname;
+	const char *zname;
 
 	zp = zh.opaque;
 	INSIST(zp != NULL);
@@ -2507,9 +2519,8 @@ free_forwarders(struct fwdinfo *fwdtab) {
 					fwddata[i] = NULL;
 					break;
 				}
-			memput(ftp->fwddata->ns, sizeof *ftp->fwddata->ns);
-			memput(ftp->fwddata->nsdata,
-					sizeof *ftp->fwddata->nsdata);
+			db_detach(&ftp->fwddata->ns);
+			db_detach(&ftp->fwddata->nsdata);
 			memput(ftp->fwddata, sizeof *ftp->fwddata);
 		}
 		memput(ftp, sizeof *ftp);
@@ -2538,12 +2549,14 @@ new_server(struct in_addr address) {
 		si->flags |= SERVER_INFO_SUPPORT_IXFR;
 	else
 		si->flags &= ~SERVER_INFO_SUPPORT_IXFR;	
+	si->flags |= SERVER_INFO_EDNS;
 	return (si);
 }
 
 static void
 free_server(server_info si) {
-	/* Don't free key; it'll be done when the auth table is freed. */
+	if (si->key_list)
+		free_key_info_list(si->key_list);
 	memput(si, sizeof *si);
 }
 
@@ -2637,6 +2650,7 @@ set_server_option(server_config sc, int bool_opt, int value) {
 	switch (bool_opt) {
 	case SERVER_INFO_BOGUS:
 	case SERVER_INFO_SUPPORT_IXFR:
+	case SERVER_INFO_EDNS:
 		if (value)
 			si->flags |= bool_opt;
 		else
@@ -2999,7 +3013,7 @@ use_default_logging() {
 static void
 init_default_log_channels() {
 	u_int flags;
-	char *name;
+	const char *name;
 	FILE *stream;
 
 	syslog_channel = log_new_syslog_channel(0, log_info, ISC_FACILITY);
@@ -3072,7 +3086,8 @@ shutdown_logging() {
 	log_free_context(log_ctx);
 
 	for (s = category_constants; s != NULL && s->name != NULL; s++)
-		freestr(logging_categories[s->number]);
+		logging_categories[s->number] =
+			freestr(logging_categories[s->number]);
 	size = ns_log_max_category * (sizeof (char *));
 	memput(logging_categories, size);
 	logging_categories = NULL;
@@ -3108,11 +3123,15 @@ shutdown_configuration() {
 		server_options = NULL;
 	}
 	if (current_pid_filename != NULL)
-		freestr(current_pid_filename);
+		current_pid_filename = freestr(current_pid_filename);
 	free_nameserver_info();
 	free_secretkey_info();
 	free_symbol_table(zone_symbol_table);
 	parser_shutdown();
+	if (fwddata != NULL)
+		memput(fwddata, fwddata_count * sizeof *fwddata);
+	fwddata = NULL;
+	fwddata_count = 0;
 	config_initialized = 0;
 }
 

contrib/bind/bin/named/ns_ctl.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_ctl.c,v 8.39 2000/12/19 23:31:38 marka Exp $";
+static const char rcsid[] = "$Id: ns_ctl.c,v 8.47 2002/06/24 07:11:07 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -91,55 +91,61 @@ static void		propagate_changes(const control, control);
 static void		install(control);
 static void		install_inet(control);
 static void		install_unix(control);
-static void		logger(enum ctl_severity, const char *fmt, ...);
+static void		logger(enum ctl_severity, const char *fmt, ...)
+			ISC_FORMAT_PRINTF(2,3);
 static void		verb_connect(struct ctl_sctx *, struct ctl_sess *,
 				     const struct ctl_verb *,
-				     const char *, u_int, void *, void *);
+				     const char *, u_int, const void *, void *);
 static void		verb_getpid(struct ctl_sctx *, struct ctl_sess *,
 				    const struct ctl_verb *,
-				    const char *, u_int, void *, void *);
+				    const char *, u_int, const void *, void *);
 static void		getpid_closure(struct ctl_sctx *, struct ctl_sess *,
 				       void *);
 static void		verb_status(struct ctl_sctx *, struct ctl_sess *,
 				    const struct ctl_verb *,
-				    const char *, u_int, void *, void *);
+				    const char *, u_int, const void *, void *);
 static void		status_closure(struct ctl_sctx *, struct ctl_sess *,
 				       void *);
 static void		verb_stop(struct ctl_sctx *, struct ctl_sess *,
 				  const struct ctl_verb *,
-				  const char *, u_int, void *, void *);
+				  const char *, u_int, const void *, void *);
 static void		verb_exec(struct ctl_sctx *, struct ctl_sess *,
 				  const struct ctl_verb *,
-				  const char *, u_int, void *, void *);
+				  const char *, u_int, const void *, void *);
+static void		exec_closure(struct ctl_sctx *, struct ctl_sess *,
+				     void *);
 static void		verb_reload(struct ctl_sctx *, struct ctl_sess *,
 				    const struct ctl_verb *,
-				    const char *, u_int, void *, void *);
+				    const char *, u_int, const void *, void *);
 static void		verb_reconfig(struct ctl_sctx *, struct ctl_sess *,
 				      const struct ctl_verb *,
-				      const char *, u_int, void *, void *);
+				      const char *, u_int, const void *, void *);
 static void		verb_dumpdb(struct ctl_sctx *, struct ctl_sess *,
 				    const struct ctl_verb *,
-				    const char *, u_int, void *, void *);
+				    const char *, u_int, const void *, void *);
 static void		verb_stats(struct ctl_sctx *, struct ctl_sess *,
 				   const struct ctl_verb *,
-				   const char *, u_int, void *, void *);
+				   const char *, u_int, const void *, void *);
 static void		verb_trace(struct ctl_sctx *, struct ctl_sess *,
 				   const struct ctl_verb *,
-				   const char *, u_int, void *, void *);
+				   const char *, u_int, const void *, void *);
 static void		trace_closure(struct ctl_sctx *, struct ctl_sess *,
 				       void *);
 static void		verb_notrace(struct ctl_sctx *, struct ctl_sess *,
 				     const struct ctl_verb *,
-				     const char *, u_int, void *, void *);
+				     const char *, u_int, const void *, void *);
 static void		verb_querylog(struct ctl_sctx *, struct ctl_sess *,
 				      const struct ctl_verb *,
-				      const char *, u_int, void *, void *);
+				      const char *, u_int, const void *, void *);
 static void		verb_help(struct ctl_sctx *, struct ctl_sess *,
 				  const struct ctl_verb *,
-				  const char *, u_int, void *, void *);
+				  const char *, u_int, const void *, void *);
 static void		verb_quit(struct ctl_sctx *, struct ctl_sess *,
 				  const struct ctl_verb *,
-				  const char *, u_int, void *, void *);
+				  const char *, u_int, const void *, void *);
+static void		verb_args(struct ctl_sctx *, struct ctl_sess *,
+				  const struct ctl_verb *,
+				  const char *, u_int, const void *, void *);
 
 /* Private data. */
 
@@ -161,6 +167,7 @@ static struct ctl_verb verbs[] = {
 	{ "qrylog",	verb_querylog,	"qrylog"},
 	{ "help",	verb_help,	"help"},
 	{ "quit",	verb_quit,	"quit"},
+	{ "args",	verb_args,	"args"},
 	{ NULL,		NULL,		NULL}
 };
 
@@ -226,7 +233,7 @@ ns_ctl_new_inet(struct in_addr saddr, u_int sport, ip_match_list allow) {
 
 #ifndef NO_SOCKADDR_UN
 control
-ns_ctl_new_unix(char *path, mode_t mode, uid_t owner, gid_t group) {
+ns_ctl_new_unix(const char *path, mode_t mode, uid_t owner, gid_t group) {
 	control new = new_control();
 
 	INIT_LINK(new, link);
@@ -525,11 +532,11 @@ install_unix(control ctl) {
 		if (slash != path)
 			*slash = '\0';
 		else {
-			freestr(path);
+			(void)freestr(path);
 			path = savestr("/", 1);
 		}
 	} else {
-		freestr(path);
+		(void)freestr(path);
 		path = savestr(".", 1);
 	}
 	if (mkdir(path, ctl->var.v_unix.mode) < 0) {
@@ -567,7 +574,7 @@ install_unix(control ctl) {
 		}
 	}
 #ifdef NEED_SECURE_DIRECTORY
-	freestr(path);
+	(void)freestr(path);
 #endif
 }
 #endif
@@ -581,7 +588,8 @@ logger(enum ctl_severity ctlsev, const char *format, ...) {
 	case ctl_debug:		logsev = log_debug(5);	break;
 	case ctl_warning:	logsev = log_warning;	break;
 	case ctl_error:		logsev = log_error;	break;
-	default:		panic("invalid ctlsev in logger", NULL);
+	default:		logsev = 0;
+				panic("invalid ctlsev in logger", NULL);
 	}
 	if (!log_ctx_valid)
 		return;
@@ -593,13 +601,18 @@ logger(enum ctl_severity ctlsev, const char *format, ...) {
 static void
 verb_connect(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	     const struct ctl_verb *verb, const char *rest,
-	     u_int respflags, void *respctx, void *uctx)
+	     u_int respflags, const void *respctx, void *uctx)
 {
-	const struct sockaddr *sa = (struct sockaddr *)respctx;
+	const struct sockaddr *sa = (const struct sockaddr *)respctx;
 	control nsctl = (control)uctx;
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+
 	if (sa->sa_family == AF_INET) {
-		const struct sockaddr_in *in = (struct sockaddr_in *)sa;
+		const struct sockaddr_in *in = (const struct sockaddr_in *)sa;
 		const ip_match_list acl = nsctl->var.v_inet.allow;
 
 		if (!ip_address_allowed(acl, in->sin_addr)) {
@@ -615,10 +628,17 @@ verb_connect(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_getpid(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	    const struct ctl_verb *verb, const char *rest,
-	    u_int respflags, void *respctx, void *uctx)
+	    u_int respflags, const void *respctx, void *uctx)
 {
 	char *msg = memget(MAX_STR_LEN);
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (msg == NULL) {
 		ctl_response(sess, 503, "(out of memory)", 0,
 			     NULL, NULL, NULL, NULL, 0);
@@ -632,6 +652,9 @@ static void
 getpid_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
 	char *msg = uap;
 
+	UNUSED(sctx);
+	UNUSED(sess);
+
 	memput(msg, MAX_STR_LEN);
 }
 
@@ -656,10 +679,17 @@ struct pvt_status {
 static void
 verb_status(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	    const struct ctl_verb *verb, const char *rest,
-	    u_int respflags, void *respctx, void *uctx)
+	    u_int respflags, const void *respctx, void *uctx)
 {
 	struct pvt_status *pvt = ctl_getcsctx(sess);
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (pvt == NULL) {
 		pvt = memget(sizeof *pvt);
 		if (pvt == NULL) {
@@ -717,6 +747,9 @@ static void
 status_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
 	struct pvt_status *pvt = ctl_getcsctx(sess);
 
+	UNUSED(sctx);
+	UNUSED(uap);
+
 	memput(pvt, sizeof *pvt);
 	ctl_setcsctx(sess, NULL);
 }
@@ -724,8 +757,15 @@ status_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
 static void
 verb_stop(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	  const struct ctl_verb *verb, const char *rest,
-	  u_int respflags, void *respctx, void *uctx)
+	  u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	ns_need(main_need_exit);
 	ctl_response(sess, 250, "Shutdown initiated.", 0, NULL, NULL, NULL,
 		     NULL, 0);
@@ -734,10 +774,16 @@ verb_stop(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_exec(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	  const struct ctl_verb *verb, const char *rest,
-	  u_int respflags, void *respctx, void *uctx)
+	  u_int respflags, const void *respctx, void *uctx)
 {
 	struct stat sb;
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (rest != NULL && *rest != '\0') {
 		if (stat(rest, &sb) < 0) {
 			ctl_response(sess, 503, strerror(errno),
@@ -754,24 +800,43 @@ verb_exec(struct ctl_sctx *ctl, struct ctl_sess *sess,
 			   saved_argv[0], save);
 		ctl_response(sess, 502, save, 0, NULL, NULL, NULL,
 			     NULL, 0);
+	} else if (user_name != NULL || group_name != NULL) {
+		ctl_response(sess, 502,
+			     "can't exec as user or group was specified",
+			     0, NULL, NULL, NULL, NULL, 0);
 	} else {
-		ns_need(main_need_restart);
 		ctl_response(sess, 250, "Restart initiated.", 0, NULL,
-			     NULL, NULL, NULL, 0);
+			     exec_closure, NULL, NULL, 0);
 	}
 }
 
+static void
+exec_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
+
+	UNUSED(sctx);
+	UNUSED(sess);
+	UNUSED(uap);
+	ns_need(main_need_restart);
+}
+
 static void
 verb_reload(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	    const struct ctl_verb *verb, const char *rest,
-	    u_int respflags, void *respctx, void *uctx)
+	    u_int respflags, const void *respctx, void *uctx)
 {
 	static const char spaces[] = " \t";
 	struct zoneinfo *zp;
 	char *tmp = NULL, *x;
+	const char *cl;
 	const char *msg;
 	int class, code, success;
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	/* If there are no args, this is a classic reload of the config. */
 	if (rest == NULL || *rest == '\0') {
 		ns_need(main_need_reload);
@@ -787,9 +852,8 @@ verb_reload(struct ctl_sctx *ctl, struct ctl_sess *sess,
 		*x++ = '\0';
 		x += strspn(x, spaces);
 	}
-	if (x == NULL || *x == '\0')
-		x = "in";
-	class = sym_ston(__p_class_syms, x, &success);
+	cl = (x == NULL || *x == '\0') ? "in" : x;
+	class = res_nametoclass(cl, &success);
 	if (!success) {
 		code = 507;
 		msg = "unrecognized class";
@@ -833,14 +897,20 @@ verb_reload(struct ctl_sctx *ctl, struct ctl_sess *sess,
  respond:
 	ctl_response(sess, code, msg, 0, NULL, NULL, NULL, NULL, 0);
 	if (tmp != NULL)
-		freestr(tmp);
+		(void)freestr(tmp);
 }
 
 static void
 verb_reconfig(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	      const struct ctl_verb *verb, const char *rest,
-	      u_int respflags, void *respctx, void *uctx)
+	      u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (strcmp(rest, "-noexpired") != 0)
 		ns_need(main_need_reconfig);
 	else
@@ -852,8 +922,15 @@ verb_reconfig(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_dumpdb(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	    const struct ctl_verb *verb, const char *rest,
-	    u_int respflags, void *respctx, void *uctx)
+	    u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	ns_need(main_need_dump);
 	ctl_response(sess, 250, "Database dump initiated.", 0, NULL,
 		     NULL, NULL, NULL, 0);
@@ -862,8 +939,14 @@ verb_dumpdb(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_stats(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	   const struct ctl_verb *verb, const char *rest,
-	   u_int respflags, void *respctx, void *uctx)
+	   u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (rest != NULL && strcmp(rest, "clear") == 0) {
 		ns_need(main_need_statsdumpandclear);
 		ctl_response(sess, 250, "Statistics dump and clear initiated.",
@@ -878,22 +961,31 @@ verb_stats(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_trace(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	   const struct ctl_verb *verb, const char *rest,
-	   u_int respflags, void *respctx, void *uctx)
+	   u_int respflags, const void *respctx, void *uctx)
 {
 	int i = atoi(rest);
 	char *msg = memget(MAX_STR_LEN);
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	if (msg == NULL) {
 		ctl_response(sess, 503, "(out of memory)", 0,
 			     NULL, NULL, NULL, NULL, 0);
 		return;
 	}
-	if (i > 0) 
+	if (isdigit(*(const unsigned char *)rest) && i >= 0) 
 		desired_debug = i;
 	else
 		desired_debug++;
 	ns_need(main_need_debug);
-	sprintf(msg, "Debug level: %d", desired_debug);
+	if (desired_debug == 0)
+		sprintf(msg, "Debugging turned off.");
+	else
+		sprintf(msg, "Debug level: %d", desired_debug);
 	ctl_response(sess, 250, msg, 0, NULL, trace_closure, msg, NULL, 0);
 }
 
@@ -901,14 +993,24 @@ static void
 trace_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
 	char *msg = uap;
 
+	UNUSED(sctx);
+	UNUSED(sess);
+
 	memput(msg, MAX_STR_LEN);
 }
 
 static void
 verb_notrace(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	     const struct ctl_verb *verb, const char *rest,
-	     u_int respflags, void *respctx, void *uctx)
+	     u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	desired_debug = 0;
 	ns_need(main_need_debug);
 	ctl_response(sess, 250, "Debugging turned off.",
@@ -918,11 +1020,18 @@ verb_notrace(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_querylog(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	      const struct ctl_verb *verb, const char *rest,
-	      u_int respflags, void *respctx, void *uctx)
+	      u_int respflags, const void *respctx, void *uctx)
 {
 	static const char	on[] = "Query logging is now on.",
 				off[] = "Query logging is now off.";
 
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	toggle_qrylog();
 	ctl_response(sess, 250, qrylog ? on : off,
 		     0, NULL, NULL, NULL, NULL, 0);
@@ -931,16 +1040,108 @@ verb_querylog(struct ctl_sctx *ctl, struct ctl_sess *sess,
 static void
 verb_help(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	  const struct ctl_verb *verb, const char *rest,
-	  u_int respflags, void *respctx, void *uctx)
+	  u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	ctl_sendhelp(sess, 214);
 }
 
 static void
 verb_quit(struct ctl_sctx *ctl, struct ctl_sess *sess,
 	  const struct ctl_verb *verb, const char *rest,
-	  u_int respflags, void *respctx, void *uctx)
+	  u_int respflags, const void *respctx, void *uctx)
 {
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
 	ctl_response(sess, 221, "End of control session.", CTL_EXIT, NULL,
 		     NULL, NULL, NULL, 0);
 }
+
+static char hex[] = "0123456789abcdef";
+
+struct pvt_args {
+	int	argc;
+	char            text[MAX_STR_LEN];
+};
+
+static void
+args_closure(struct ctl_sctx *sctx, struct ctl_sess *sess, void *uap) {
+	struct pvt_args *pvt = ctl_getcsctx(sess);
+
+	UNUSED(sctx);
+	UNUSED(uap);
+
+	memput(pvt, sizeof *pvt);
+	ctl_setcsctx(sess, NULL);
+}
+
+static void
+verb_args(struct ctl_sctx *ctl, struct ctl_sess *sess,
+	  const struct ctl_verb *verb, const char *rest,
+	  u_int respflags, const void *respctx, void *uctx)
+{
+	struct pvt_args *pvt = ctl_getcsctx(sess);
+	char *cp, *tp;
+
+	UNUSED(ctl);
+	UNUSED(verb);
+	UNUSED(rest);
+	UNUSED(respflags);
+	UNUSED(respctx);
+	UNUSED(uctx);
+
+	if (pvt == NULL) {
+		unsigned int i = 0;
+		pvt = memget(sizeof *pvt);
+		if (pvt == NULL) {
+			ctl_response(sess, 505, "(out of memory)",
+				     0, NULL, NULL, NULL, NULL, 0);
+			return;
+		}
+		pvt->argc = 0;
+		ctl_setcsctx(sess, pvt);
+
+		/* Send the arguement count. */
+		while (saved_argv[i] != NULL)
+			i++;
+		sprintf(pvt->text, "%u", i);
+		ctl_response(sess, 250, pvt->text, CTL_MORE,
+			     NULL, args_closure, NULL, NULL, 0);
+		return;
+	}
+
+	/*
+	 * Percent escape arguement.
+	 */
+	cp = saved_argv[pvt->argc++];
+	tp = pvt->text;
+	while (cp && *cp != NULL)
+		if (*cp == '%' || *cp == ' ' ||
+		    !isprint((unsigned char)*cp)) {
+			if (tp >= pvt->text + sizeof(pvt->text) - 4)
+				break;
+			*tp++ = '%';
+			*tp++ = hex[(*cp>>4)&0xf];
+			*tp++ = hex[(*cp++)&0xf];
+		} else {
+			if (tp >= pvt->text + sizeof(pvt->text) - 2)
+				break;
+			*tp++ = *cp++;
+		}
+	*tp = '\0';
+	
+	ctl_response(sess, 250, pvt->text, 
+		     saved_argv[pvt->argc] == NULL ? 0 : CTL_MORE,
+		     NULL, args_closure, NULL, NULL, 0);
+}

contrib/bind/bin/named/ns_defs.h

@@ -1,6 +1,6 @@
 /*
  *	from ns.h	4.33 (Berkeley) 8/23/90
- *	$Id: ns_defs.h,v 8.105 2001/04/01 22:41:24 marka Exp $
+ *	$Id: ns_defs.h,v 8.121 2002/06/26 03:27:19 marka Exp $
  */
 
 /*
@@ -147,6 +147,7 @@
 #define	MAX_SYNCDELAY	3	/* Presumed timeout in use by our clients. */
 #define	MAX_SYNCDRAIN	100000	/* How long we'll spin in drain_all_rcvbuf. */
 #define	MAX_SYNCSTORE	500
+#define NS_MAX_DISTANCE 3	/* maximum nameserver chaining before failure */
 
 				  /* maximum time to cache negative answers */
 #define DEFAULT_MAX_NCACHE_TTL (3*60*60)
@@ -169,34 +170,37 @@ typedef enum need {
 	main_need_qrylog,	/* toggle_qrylog() needed. */
 	main_need_debug,	/* use_desired_debug() needed. */
 	main_need_restart,	/* exec() needed. */
-	main_need_reap,		/* need to reap dead children */
-	main_need_noexpired,	/* ns_reconfig() needed w/ noexpired set */
-	main_need_num,		/* number of needs, used for array bound. */
-	main_need_tick		/* tick every second to poll for cleanup (NT)*/
+	main_need_reap,		/* need to reap dead children. */
+	main_need_noexpired,	/* ns_reconfig() needed w/ noexpired set. */
+	main_need_tryxfer,	/* attemt to start a zone transfer. */
+	main_need_num		/* MUST BE LAST. */
 } main_need;
 
 	/* What global options are set? */
-#define	OPTION_NORECURSE	0x0001	/* Don't recurse even if asked. */
-#define	OPTION_NOFETCHGLUE	0x0002	/* Don't fetch missing glue. */
-#define	OPTION_FORWARD_ONLY	0x0004	/* Don't use NS RR's, just forward. */
-#define	OPTION_FAKE_IQUERY	0x0008	/* Fake up bogus response to IQUERY. */
+#define	OPTION_NORECURSE	0x00000001 /* Don't recurse even if asked. */
+#define	OPTION_NOFETCHGLUE	0x00000002 /* Don't fetch missing glue. */
+#define	OPTION_FORWARD_ONLY	0x00000004 /* Don't use NS RR's, just forward. */
+#define	OPTION_FAKE_IQUERY	0x00000008 /* Fake up bogus response to IQUERY. */
 #ifdef BIND_NOTIFY
-#define	OPTION_NONOTIFY		0x0010	/* Turn off notify */
+/* #define	OPTION_NONOTIFY		0x00000010 */ /* Turn off notify */
+#define	OPTION_SUPNOTIFY_INITIAL 0x00000020 /* Supress initial notify */
 #endif
-#define	OPTION_NONAUTH_NXDOMAIN	0x0020	/* Generate non-auth NXDOMAINs? */
-#define	OPTION_MULTIPLE_CNAMES	0x0040	/* Allow a name to have multiple
-					 * CNAME RRs */
-#define OPTION_HOSTSTATS	0x0080	/* Maintain per-host statistics? */
-#define OPTION_DEALLOC_ON_EXIT	0x0100	/* Deallocate everything on exit? */
-#define OPTION_NODIALUP		0x0200	/* Turn off dialup support */
-#define OPTION_NORFC2308_TYPE1	0x0400	/* Prevent type1 respones (RFC 2308)
-					 * to cached negative respones */
-#define	OPTION_USE_ID_POOL	0x0800	/* Use the memory hogging query ID */
-#define	OPTION_TREAT_CR_AS_SPACE 0x1000 /* Treat CR in zone files as space */
-#define OPTION_USE_IXFR		0x2000	/* Use by delault ixfr in zone transfer */
-#define OPTION_MAINTAIN_IXFR_BASE 0x4000 /* Part of IXFR file name logic. */
-#define OPTION_HITCOUNT		0x8000	/* Keep track of each time an RR gets
-					 * hit in the database */
+#define	OPTION_NONAUTH_NXDOMAIN	0x00000040 /* Generate non-auth NXDOMAINs? */
+#define	OPTION_MULTIPLE_CNAMES	0x00000080 /* Allow a name to have multiple
+					    * CNAME RRs */
+#define OPTION_HOSTSTATS	0x00000100 /* Maintain per-host statistics? */
+#define OPTION_DEALLOC_ON_EXIT	0x00000200 /* Deallocate everything on exit? */
+#define OPTION_NODIALUP		0x00000400 /* Turn off dialup support */
+#define OPTION_NORFC2308_TYPE1	0x00000800 /* Prevent type1 respones (RFC 2308)
+					    * to cached negative respones */
+#define	OPTION_USE_ID_POOL	0x00001000 /* Use the memory hogging query ID */
+#define	OPTION_TREAT_CR_AS_SPACE 0x00002000 /* Treat CR in zone files as
+					     * space */
+#define OPTION_USE_IXFR		0x00004000 /* Use by default ixfr in zone
+					    * transfer */
+#define OPTION_MAINTAIN_IXFR_BASE 0x00008000 /* Part of IXFR file name logic. */
+#define OPTION_HITCOUNT		0x00010000 /* Keep track of each time an
+					    * RR gets hit in the database */
 
 #define	DEFAULT_OPTION_FLAGS	(OPTION_NODIALUP|OPTION_NONAUTH_NXDOMAIN|\
 				 OPTION_USE_ID_POOL|OPTION_NORFC2308_TYPE1)
@@ -236,6 +240,7 @@ typedef enum need {
 
 	/* Sequence space arithmetic. */
 #define SEQ_GT(a,b)	((int32_t)((a)-(b)) > 0)
+#define SEQ_LT(a,b)	((int32_t)((a)-(b)) < 0)
 
 #define	NS_OPTION_P(option) ((server_options == NULL) ? \
 		(panic(panic_msg_no_options, NULL), 0) : \
@@ -267,7 +272,7 @@ typedef enum need {
 enum severity { ignore, warn, fail, not_set };
 
 #ifdef BIND_NOTIFY
-enum znotify { znotify_use_default=0, znotify_yes, znotify_no };
+enum notify { notify_use_default=0, notify_yes, notify_no, notify_explicit };
 #endif
 
 enum zdialup { zdialup_use_default=0, zdialup_yes, zdialup_no };
@@ -332,6 +337,7 @@ struct zoneinfo {
 	time_t		z_ftime;	/* modification time of source file */
 	struct in_addr	z_axfr_src;	/* bind() the axfr socket to this */
 	struct in_addr	z_addr[NSMAX];	/* list of master servers for zone */
+	struct dst_key * z_keys[NSMAX];	/* tsig key associated with master */
 	u_char		z_addrcnt;	/* number of entries in z_addr[] */
 	struct in_addr	z_xaddr[NSMAX];	/* list of master servers for xfer */
 	u_char		z_xaddrcnt;	/* number of entries in z_xaddr[] */
@@ -362,7 +368,7 @@ struct zoneinfo {
 					   from us */
 	long		z_max_transfer_time_in;	/* max num seconds for AXFR */
 #ifdef BIND_NOTIFY
-	enum znotify	z_notify;	/* Notify mode */
+	enum notify	z_notify;	/* Notify mode */
 	struct in_addr *z_also_notify; /* More nameservers to notify */
 	int		z_notify_count;
 #endif
@@ -431,6 +437,7 @@ enum zonetype { z_nil, z_master, z_slave, z_hint, z_stub, z_forward,
 #define XFER_SUCCESSAXFR 4              /* named-xfr recived a xfr */
 #define XFER_SUCCESSIXFR 5              /* named-xfr recived a ixfr */
 #define XFER_SUCCESSAXFRIXFRFILE 6      /* named-xfr received AXFR for IXFR */
+#define XFER_REFUSED 7      		/* one master returned REFUSED */
 #define XFER_ISAXFR     -1              /* the last XFR is AXFR */
 #define XFER_ISIXFR     -2              /* the last XFR is IXFR */
 #define XFER_ISAXFRIXFR	-3		/* the last XFR is AXFR but we must create IXFR base */
@@ -442,7 +449,8 @@ struct qserv {
 	struct databuf	*nsdata;	/* databuf for server address */
 	struct timeval	stime;		/* time first query started */
 	unsigned int	forwarder:1;	/* this entry is for a forwarder */
-	unsigned int	nretry:31;	/* # of times addr retried */
+	unsigned int	noedns:1;	/* don't try edns */
+	unsigned int	nretry:30;	/* # of times addr retried */
 	u_int32_t	serial;		/* valid if Q_ZSERIAL */
 };
 
@@ -461,6 +469,10 @@ struct qinfo {
 			q_cmsglen,	/* len of cname message */
 			q_cmsgsize;	/* allocated size of cname message */
 	int16_t		q_dfd;		/* UDP file descriptor */
+	u_int16_t	q_udpsize;	/* UDP message size */
+	int		q_distance;	/* distance this query is from the
+					 * original query that the server
+					 * received. */
 	time_t		q_time;		/* time to retry */
 	time_t		q_expire;	/* time to expire */
 	struct qinfo	*q_next;	/* rexmit list (sorted by time) */
@@ -470,6 +482,7 @@ struct qinfo {
 #ifdef notyet
 	struct nameser	*q_ns[NSMAX];	/* name servers */
 #endif
+	struct dst_key *q_keys[NSMAX];	/* keys to use with this address */
 	u_char		q_naddr;	/* number of addr's in q_addr */
 	u_char		q_curaddr;	/* last addr sent to */
 	u_char		q_nusedns;	/* number of elements in q_usedns[] */
@@ -484,7 +497,7 @@ struct qinfo {
 	u_int16_t	q_class;	/* class of query */
 	u_int16_t	q_type;		/* type of query */
 #ifdef BIND_NOTIFY
-	int		q_notifyzone;	/* zone which needs another znotify()
+	int		q_notifyzone;	/* zone which needs another notify()
 					 * when the reply to this comes in.
 					 */
 #endif
@@ -497,6 +510,7 @@ struct qinfo {
 #define	Q_PRIMING	0x02		/* generated during priming phase */
 #define	Q_ZSERIAL	0x04		/* getting zone serial for xfer test */
 #define	Q_USEVC		0x08		/* forward using tcp not udp */
+#define	Q_EDNS		0x10		/* add edns opt record to answer */
 
 #define Q_NEXTADDR(qp,n) (&(qp)->q_addr[n].ns_addr)
 
@@ -597,6 +611,8 @@ struct qstream {
 		ns_tcp_tsig_state *tsig_state;	/* used by ns_sign_tcp */
 		int		tsig_skip;	/* skip calling ns_sign_tcp
 						 * during the next flush */
+		int		tsig_size;	/* need to reserve this space
+						 * for the tsig. */
 		struct qs_x_lev {		/* decompose the recursion. */
 			enum {sxl_ns, sxl_all, sxl_sub}
 					state;	/* what's this level doing? */
@@ -731,7 +747,8 @@ typedef struct rrset_order_list {
 
 
 typedef struct options {
-	u_int flags;
+	u_int32_t flags;
+	char *hostname;
 	char *version;
 	char *directory;
 	char *dump_filename;
@@ -775,6 +792,8 @@ typedef struct options {
 	u_int max_host_stats;
 	u_int lame_ttl;
 	int minroots;
+	u_int16_t preferred_glue;
+	enum notify notify;
 } *options;
 
 typedef struct key_list_element {
@@ -816,6 +835,7 @@ typedef struct server_config {
 
 #define SERVER_INFO_BOGUS	0x01
 #define SERVER_INFO_SUPPORT_IXFR	0x02
+#define SERVER_INFO_EDNS	0x04
 
 typedef struct server_info {
 	struct in_addr address;
@@ -832,8 +852,8 @@ typedef struct server_info {
  */
 
 struct ns_sym {
-	int	number;		/* Identifying number, like ns_log_default */
-	char *	name;		/* Its symbolic name, like "default" */
+	int		number;	/* Identifying number, like ns_log_default */
+	const char *	name;	/* Its symbolic name, like "default" */
 };
 
 /*
@@ -877,7 +897,7 @@ typedef struct log_config {
 } *log_config;
 
 struct map {
-	char *			token;
+	const char *		token;
 	int			val;
 };
 
@@ -908,3 +928,5 @@ enum req_action { Finish, Refuse, Return };
 #define INIT(x)
 #define DECL extern
 #endif
+
+#define EDNS_MESSAGE_SZ	4096

contrib/bind/bin/named/ns_forw.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_forw.c	4.32 (Berkeley) 3/3/91";
-static const char rcsid[] = "$Id: ns_forw.c,v 8.78 2000/12/23 08:14:37 vixie Exp $";
+static const char rcsid[] = "$Id: ns_forw.c,v 8.91 2002/05/24 03:04:57 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -133,10 +133,10 @@ ns_forw(struct databuf *nsp[], u_char *msg, int msglen,
 	HEADER *hp;
 	u_int16_t id;
 	int sendto_errno = 0;
-	int n, has_tsig, oldqlen;
-	u_char *oldqbuf;
-	u_char *smsg;
-	int smsglen, smsgsize, siglen;
+	int n, has_tsig, oldqlen = 0;
+	u_char *oldqbuf = NULL;
+	u_char *smsg = NULL;
+	int smsglen, smsgsize = 0, siglen;
 	u_char sig[TSIG_SIG_SIZE];
 	DST_KEY *key;
 
@@ -225,39 +225,50 @@ ns_forw(struct databuf *nsp[], u_char *msg, int msglen,
 	if (debug >= 10)
 		res_pquery(&res, msg, msglen, log_get_stream(packet_channel));
 #endif
-	key = tsig_key_from_addr(nsa->sin_addr);
-	if (key != NULL) {
-		smsgsize = qp->q_msglen + TSIG_BUF_SIZE;
+        key = qp->q_keys[0];
+        if (key == NULL)
+                key = qp->q_keys[0] = tsig_key_from_addr(nsa->sin_addr);
+	if (key != NULL || !qp->q_addr[0].noedns) {
+		smsgsize = qp->q_msglen + TSIG_BUF_SIZE + 11;
 		smsg = memget(smsgsize);
 		if (smsg == NULL)
 			ns_panic(ns_log_default, 1, "ns_forw: memget failed");
 		smsglen = qp->q_msglen;
 		siglen = sizeof(sig);
 		memcpy(smsg, qp->q_msg, qp->q_msglen);
+	}
+
+	if (!qp->q_addr[0].noedns)
+		smsglen += ns_add_opt(smsg, smsg + smsglen, smsgsize, 0, 0,
+				      EDNS_MESSAGE_SZ, 0, NULL, 0);
+
+	if (key != NULL) {
 		n = ns_sign(smsg, &smsglen, smsgsize, NOERROR, key, NULL, 0,
 			    sig, &siglen, 0);
 		if (n == 0) {
-			oldqbuf = qp->q_msg;
-			oldqlen = qp->q_msglen;
-			qp->q_msglen = smsglen;
-			qp->q_msg = smsg;
-			hp = (HEADER *) qp->q_msg;
 			has_tsig = 1;
+			free_tsig(qp->q_nstsig);
 			qp->q_nstsig = new_tsig(key, sig, siglen);
-		}
-		else {
+		} else {
 			has_tsig = 0;
 			free_tsig(qp->q_nstsig);
 			qp->q_nstsig = NULL;
 			INSIST(0);
 		}
-	}
-	else {
+	} else {
 		has_tsig = 0;
 		free_tsig(qp->q_nstsig);
 		qp->q_nstsig = NULL;
 	}
 
+	if (smsg != NULL) {
+		oldqbuf = qp->q_msg;
+		oldqlen = qp->q_msglen;
+		qp->q_msglen = smsglen;
+		qp->q_msg = smsg;
+		hp = (HEADER *) qp->q_msg;
+	}
+
 	if (qp->q_flags & Q_USEVC) {
 		if (tcp_send(qp) != NOERROR) {
 			if (!haveComplained(ina_ulong(nsa->sin_addr),
@@ -269,15 +280,16 @@ ns_forw(struct databuf *nsp[], u_char *msg, int msglen,
 	} else if (sendto(ds, (char *)qp->q_msg, qp->q_msglen, 0,
 		   (struct sockaddr *)nsa,
 		   sizeof(struct sockaddr_in)) < 0) {
-		sendto_errno  = errno;
+		sendto_errno = errno;
 		if (!haveComplained(ina_ulong(nsa->sin_addr),
 				    (u_long)sendtoStr))
 			ns_info(ns_log_default, "ns_forw: sendto(%s): %s",
 				sin_ntoa(*nsa), strerror(errno));
 		nameserIncr(nsa->sin_addr, nssSendtoErr);
 	}
-	if (has_tsig == 1) {
-		memput(qp->q_msg, smsgsize);
+
+	if (smsgsize != 0) {
+		memput(smsg, smsgsize);
 		qp->q_msg = oldqbuf;
 		qp->q_msglen = oldqlen;
 		hp = (HEADER *) qp->q_msg;
@@ -455,9 +467,10 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 	const char *fname;
 	int oldn, naddr, class, found_arr, potential_ns, lame_ns;
 	time_t curtime;
+	int found_auth6;
 
-	ns_debug(ns_log_default, 3, "nslookup(nsp=%#x, qp=%#x, \"%s\")",
-		nsp, qp, syslogdname);
+	ns_debug(ns_log_default, 3, "nslookup(nsp=%p, qp=%p, \"%s\", d=%d)",
+		 nsp, qp, syslogdname, qp->q_distance);
 
 	lame_ns = potential_ns = 0;
 	naddr = n = qp->q_naddr;
@@ -491,19 +504,17 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 			}
 		}
 
+		found_arr = 0;
+		found_auth6 = 0;
 		tmphtp = ((nsdp->d_flags & DB_F_HINT) ?fcachetab :hashtab);
 		np = nlookup(dname, &tmphtp, &fname, 0);
 		if (np == NULL) {
-			ns_debug(ns_log_default, 3, "%s: not found %s %#x",
+			ns_debug(ns_log_default, 3, "%s: not found %s %p",
 				 dname, fname, np);
-			found_arr = 0;
 			goto need_sysquery;
 		}
-		if (fname != dname) {
-			found_arr = 0;
+		if (fname != dname)
 			goto need_sysquery;
-		}
-		found_arr = 0;
 		oldn = n;
 
 		/* look for name server addresses */
@@ -520,6 +531,15 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 						complaint, dname, dp, nsdp);
 				goto skipserver;
 			}
+			if (dp->d_rcode == NXDOMAIN && dp->d_class == class)
+				goto skipserver;
+			if (dp->d_class == class && 
+			    (dp->d_type == T_AAAA || dp->d_type == ns_t_a6) &&
+			    (zones[dp->d_zone].z_type == z_master ||
+			     zones[dp->d_zone].z_type == z_slave)) {
+				found_auth6++;
+				continue;
+			}
 			if (dp->d_type != T_A || dp->d_class != class)
 				continue;
 			if (dp->d_rcode) {
@@ -587,9 +607,16 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 			qs->ns_addr.sin_family = AF_INET;
 			qs->ns_addr.sin_port = ns_port;
 			qs->ns_addr.sin_addr = nsa;
+			qp->q_keys[n] = NULL;
 			qs->ns = nsdp;
 			qs->nsdata = dp;
 			qs->forwarder = 0;
+			qs->noedns = dp->d_noedns;
+			if (!qs->noedns) {
+				server_info si = find_server(nsa);
+				if (si && (si->flags & SERVER_INFO_EDNS) == 0)
+					qs->noedns = 1;
+			}
 			qs->nretry = 0;
 			/*
 			 * If this A RR has no RTT, initialize its RTT to a
@@ -615,7 +642,8 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 			 * gdonl mar96
 			 */
 			if (aIsUs(nsa)) {
-			    static char *complaint = "contains our address";
+			    static const char *complaint =
+					 "contains our address";
 			    nslookupComplain(sysloginfo, syslogdname,
 					     complaint, dname, dp, nsdp);
 			    continue;
@@ -632,7 +660,7 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 			if (memcmp(&qp->q_from, &qs->ns_addr,
 				   sizeof(qp->q_from)) == 0)
 			{
-			    static char *complaint = "forwarding loop";
+			    static const char *complaint = "forwarding loop";
 			    nslookupComplain(sysloginfo, syslogdname,
 					     complaint, dname, dp, nsdp);
 			    continue;
@@ -666,11 +694,12 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 		}
 		ns_debug(ns_log_default, 8, "nslookup: %d ns addrs", n);
  need_sysquery:
-		if (found_arr == 0) {
+		if (found_arr == 0 && found_auth6 == 0) {
 			potential_ns++;
-			if (!(qp->q_flags & Q_SYSTEM))
-				(void) sysquery(dname, class, T_A, NULL, 0,
-						ns_port, QUERY);
+			if (qp->q_distance < NS_MAX_DISTANCE)
+				(void) sysquery(dname, class, T_A, NULL, NULL,
+						0, ns_port, QUERY,
+						qp->q_distance + 1);
 		}
  skipserver:
 		(void)NULL;
@@ -678,7 +707,7 @@ nslookup(struct databuf *nsp[], struct qinfo *qp,
 	ns_debug(ns_log_default, 3, "nslookup: %d ns addrs total", n);
 	qp->q_naddr = n;
 	if (n == 0 && potential_ns == 0 && !NS_ZFWDTAB(qp->q_fzone)) {
-		static char *complaint = "No possible A RRs";
+		static const char *complaint = "No possible A RRs";
 		if (lame_ns != 0)
 			complaint = "All possible A RR's lame";
 		if (sysloginfo && syslogdname &&
@@ -784,7 +813,7 @@ qcomp(struct qserv *qs1, struct qserv *qs2) {
 
 		strcpy(t, inet_ntoa(qs1->ns_addr.sin_addr));
 		ns_debug(ns_log_default, 10,
-			 "qcomp(%s, %s) %lu (%lu) - %lu (%lu) = %lu",
+			 "qcomp(%s, %s) %u (%u) - %u (%u) = %u",
 			 t, inet_ntoa(qs2->ns_addr.sin_addr),
 			 rtt1, rttr1, rtt2, rttr2, rtt1 - rtt2);
 	}
@@ -813,7 +842,7 @@ void
 schedretry(struct qinfo *qp, time_t t) {
 	struct qinfo *qp1, *qp2;
 
-	ns_debug(ns_log_default, 4, "schedretry(%#x, %ld sec)", qp, (long)t);
+	ns_debug(ns_log_default, 4, "schedretry(%p, %ld sec)", qp, (long)t);
 	if (qp->q_time)
 		ns_debug(ns_log_default, 4,
 			 "WARNING: schedretry(%#lx, %ld) q_time already %ld",
@@ -885,22 +914,28 @@ reset_retrytimer() {
 void
 retrytimer(evContext ctx, void *uap, struct timespec due,
 	   struct timespec ival) {
+
+	UNUSED(ctx);
+	UNUSED(uap);
+	UNUSED(due);
+	UNUSED(ival);
+
 	retry_timer_set = 0;
-	retry(retryqp);
+	retry(retryqp, 0);
 }
 
 /*
  * Retry is called to retransmit query 'qp'.
  */
 void
-retry(struct qinfo *qp) {
-	int n, has_tsig, oldqlen;
+retry(struct qinfo *qp, int samehost) {
+	int n, has_tsig, oldqlen = 0;
 	HEADER *hp;
 	struct sockaddr_in *nsa;
 	int sendto_errno = 0;
-	u_char *oldqbuf;
-	u_char *smsg;
-	int smsglen, smsgsize, siglen;
+	u_char *oldqbuf = NULL;
+	u_char *smsg = NULL;
+	int smsglen, smsgsize = 0, siglen;
 	u_char sig[TSIG_SIG_SIZE];
 	DST_KEY *key;
 
@@ -923,7 +958,15 @@ retry(struct qinfo *qp) {
 
 	/* Try next address. */
 	n = qp->q_curaddr;
+	if (samehost) {
+		qp->q_addr[n].nretry++;
+		if (qp->q_addr[n].nretry < MAXRETRY)
+			goto found;
+		qp->q_addr[n].nretry--;
+	}
+
 	if (qp->q_naddr > 0) {
+		qp->q_addr[n].noedns = 1;
 		++qp->q_addr[n].nretry;
 		do {
 			if (++n >= (int)qp->q_naddr)
@@ -970,7 +1013,7 @@ retry(struct qinfo *qp) {
 	}
 	ns_debug(ns_log_default, 5, "give up");
 	if ((qp->q_flags & Q_SYSTEM) == 0) {
-		n = ((HEADER *)qp->q_cmsg ? qp->q_cmsglen : qp->q_msglen);
+		n = (qp->q_cmsg ? qp->q_cmsglen : qp->q_msglen);
 		hp->id = qp->q_id;
 		hp->qr = 1;
 		hp->ra = (NS_OPTION_P(OPTION_NORECURSE) == 0);
@@ -1015,24 +1058,29 @@ retry(struct qinfo *qp) {
 		res_pquery(&res, qp->q_msg, qp->q_msglen,
 			    log_get_stream(packet_channel));
 #endif
-	key = tsig_key_from_addr(nsa->sin_addr);
-	if (key != NULL) {
-		smsgsize = qp->q_msglen + TSIG_BUF_SIZE;
+	key = qp->q_keys[n];
+        if (key == NULL)
+                key = qp->q_keys[n] = tsig_key_from_addr(nsa->sin_addr);
+	if (key != NULL || !qp->q_addr[n].noedns) {
+		smsgsize = qp->q_msglen + TSIG_BUF_SIZE + 11;
 		smsg = memget(smsgsize);
 		smsglen = qp->q_msglen;
 		siglen = sizeof(sig);
 		memcpy(smsg, qp->q_msg, qp->q_msglen);
+	}
+
+	if (!qp->q_addr[n].noedns)
+		smsglen += ns_add_opt(smsg, smsg + smsglen, smsgsize, 0, 0,
+				      EDNS_MESSAGE_SZ, 0, NULL, 0);
+
+	if (key != NULL) {
 		n = ns_sign(smsg, &smsglen, smsgsize, NOERROR, key, NULL, 0,
 			    sig, &siglen, 0);
 		if (n == 0) {
-			oldqbuf = qp->q_msg;
-			oldqlen = qp->q_msglen;
-			qp->q_msglen = smsglen;
-			qp->q_msg = smsg;
 			has_tsig = 1;
+			free_tsig(qp->q_nstsig);
 			qp->q_nstsig = new_tsig(key, sig, siglen);
-		}
-		else {
+		} else {
 			has_tsig = 0;
 			free_tsig(qp->q_nstsig);
 			qp->q_nstsig = NULL;
@@ -1044,6 +1092,13 @@ retry(struct qinfo *qp) {
 		qp->q_nstsig = NULL;
 	}
 
+	if (smsg != NULL) {
+		oldqbuf = qp->q_msg;
+		oldqlen = qp->q_msglen;
+		qp->q_msglen = smsglen;
+		qp->q_msg = smsg;
+	}
+
 	if (qp->q_flags & Q_USEVC) {
 		if (tcp_send(qp) != NOERROR)
 			ns_debug(ns_log_default, 3,
@@ -1057,8 +1112,8 @@ retry(struct qinfo *qp) {
 		ns_debug(ns_log_default, 3, "error resending msg: %s",
 			 strerror(errno));
 	}
-	if (has_tsig == 1) {
-		memput(qp->q_msg, smsgsize);
+	if (smsgsize != 0) {
+		memput(smsg, smsgsize);
 		qp->q_msg = oldqbuf;
 		qp->q_msglen = oldqlen;
 	}
@@ -1171,33 +1226,14 @@ qnew(const char *name, int class, int type, int forward) {
 }
 
 void
-ns_freeqns(struct qinfo *qp, char *where) {
-	static const char freed[] = "freed", busy[] = "busy";
-	const char *result;
-	struct databuf *dp;
-	int i;
+ns_freeqns(struct qinfo *qp) {
+	unsigned int i;
 
-	for (i = 0 ; i < (int)qp->q_naddr ; i++) {
-		dp = qp->q_addr[i].ns;
-		if (dp) {
-			DRCNTDEC(dp);
-			result = (dp->d_rcnt) ? busy : freed;
-			ns_debug(ns_log_default, 3, "%s: ns %s rcnt %d (%s)",
-				 where, dp->d_data, dp->d_rcnt, result);
-			if (result == freed)
-				db_freedata(dp);
-		}
-		dp = qp->q_addr[i].nsdata;
-		if (dp) {
-			DRCNTDEC(dp);
-			result = (dp->d_rcnt) ? busy : freed;
-			ns_debug(ns_log_default, 3,
-				 "%s: nsdata %s rcnt %d (%s)",
-				 where, inet_ntoa(ina_get(dp->d_data)),
-				 dp->d_rcnt, result);
-			if (result == freed)
-				db_freedata(dp);
-		}
+	for (i = 0 ; i < qp->q_naddr ; i++) {
+		if (qp->q_addr[i].ns != NULL)
+			db_detach(&qp->q_addr[i].ns);
+		if (qp->q_addr[i].nsdata != NULL)
+			db_detach(&qp->q_addr[i].nsdata);
 	}
 }
 
@@ -1214,14 +1250,14 @@ ns_freeqry(struct qinfo *qp) {
  	if (qp->q_cmsg != NULL)
 		memput(qp->q_cmsg, qp->q_cmsgsize);
 	if (qp->q_domain != NULL)
-		freestr(qp->q_domain);
+		qp->q_domain = freestr(qp->q_domain);
 	if (qp->q_name != NULL)
-		freestr(qp->q_name);
+		qp->q_name = freestr(qp->q_name);
 	if (qp->q_tsig != NULL)
 		memput(qp->q_tsig, sizeof(struct tsig_record));
 	if (qp->q_nstsig != NULL)
 		memput(qp->q_nstsig, sizeof(struct tsig_record));
-	ns_freeqns(qp, "ns_freeqry");
+	ns_freeqns(qp);
 	if (nsqhead == qp)
 		nsqhead = qp->q_link;
 	else {
@@ -1245,7 +1281,7 @@ nsfwdadd(struct qinfo *qp, struct fwdinfo *fwd) {
 	n = qp->q_naddr;
 	while (fwd != NULL && n < NSMAX) {
 		qs = qp->q_addr;
-		for (i = 0; i < (u_int)n; i++, qs++)
+		for (i = 0; i < n; i++, qs++)
 			if (ina_equal(qs->ns_addr.sin_addr,
 				      fwd->fwddata->fwdaddr.sin_addr))
 				goto nextfwd;
@@ -1253,6 +1289,12 @@ nsfwdadd(struct qinfo *qp, struct fwdinfo *fwd) {
 		qs->ns = fwd->fwddata->ns;
 		qs->nsdata = fwd->fwddata->nsdata;
 		qs->forwarder = 1;
+		qs->noedns = fwd->fwddata->nsdata->d_noedns;
+		if (!qs->noedns) {
+			server_info si = find_server(qs->ns_addr.sin_addr);
+			if (si && (si->flags & SERVER_INFO_EDNS) == 0)
+				qs->noedns = 1;
+		}
 		qs->nretry = 0;
 		n++;
  nextfwd:
@@ -1260,7 +1302,7 @@ nsfwdadd(struct qinfo *qp, struct fwdinfo *fwd) {
 	}
 
 	/* Update the refcounts before the sort. */
-	for (i = qp->q_naddr; i < (u_int)n; i++) {
+	for (i = qp->q_naddr; i < n; i++) {
 		DRCNTINC(qp->q_addr[i].nsdata);
 		DRCNTINC(qp->q_addr[i].ns);
 	}

contrib/bind/bin/named/ns_func.h

@@ -90,43 +90,43 @@
 
 /* ns_func.h - declarations for ns_*.c's externally visible functions
  *
- * $Id: ns_func.h,v 8.105 2001/02/16 04:46:12 marka Exp $
+ * $Id: ns_func.h,v 8.117 2002/04/25 05:27:07 marka Exp $
  */
 
 /* ++from ns_glue.c++ */
 struct in_addr		ina_get(const u_char *data);
 const char *		sin_ntoa(struct sockaddr_in);
 int			ns_wouldlog(int category, int level);
-void			ns_debug(int, int, const char *, ...);
-void			ns_info(int, const char *, ...);
-void			ns_notice(int, const char *, ...);
-void			ns_warning(int, const char *, ...);
-void			ns_error(int, const char *, ...);
-void			ns_critical(int, const char *, ...);
-void			ns_panic(int, int, const char *, ...);
-void			ns_assertion_failed(char *file, int line,
-					    assertion_type type, char *cond,
-					    int print_errno);
+void			ns_debug(int, int, const char *, ...) ISC_FORMAT_PRINTF(3, 4);
+void			ns_info(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void			ns_notice(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void			ns_warning(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void			ns_error(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void			ns_critical(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+void			ns_panic(int, int, const char *, ...) ISC_FORMAT_PRINTF(3, 4);
+void			ns_assertion_failed(const char *file, int line,
+					    assertion_type type,
+					    const char *cond, int print_errno);
 void			panic(const char *, const void *);
 void			gettime(struct timeval *);
 int			nlabels(const char *);
 int			my_close(int);
 int			my_fclose(FILE *);
-void			__freestr(char *);
+void *			__freestr(char *);
 char *			__newstr(size_t, int);
 char *			__savestr(const char *, int);
-char *			checked_ctime(const time_t *t);
-char *			ctimel(long);
-void			__freestr_record(char *, char *, int);
-char *			__newstr_record(size_t, int, char *, int);
-char *			__savestr_record(const char *, int, char *, int);
+const char *		checked_ctime(const time_t *t);
+const char *		ctimel(long);
+void *			__freestr_record(char *, const char *, int);
+char *			__newstr_record(size_t, int, const char *, int);
+char *			__savestr_record(const char *, int, const char *, int);
 u_char *		ina_put(struct in_addr ina, u_char *data);
 u_char *		savebuf(const u_char *, size_t, int);
-void			dprintf(int level, const char *format, ...);
+void			dprintf(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3);
 #ifdef DEBUG_STRINGS
 char *			debug_newstr(size_t, int, const char *, int);
 char *			debug_savestr(const char *, int, const char *, int);
-void			debug_freestr(char *, const char *, int);
+void *			debug_freestr(char *, const char *, int);
 #define newstr(l, n) debug_newstr((l), (n), __FILE__, __LINE__)
 #define savestr(s, n) debug_savestr((s), (n), __FILE__, __LINE__)
 #define freestr(s) debug_freestr((s), __FILE__, __LINE__)
@@ -159,7 +159,8 @@ void			prime_cache(void);
 void			delete_all(struct namebuf *, int, int);
 int			delete_stale(struct namebuf *);
 struct qinfo *		sysquery(const char *, int, int,
-				 struct in_addr *, int, u_int16_t, int);
+				 struct in_addr *, struct dst_key **keys,
+				 int, u_int16_t, int, int);
 int			doupdate(u_char *, u_char *, struct databuf **,
 				 int, int, int, u_int, struct sockaddr_in);
 int			send_msg(u_char *, int, struct qinfo *);
@@ -174,6 +175,14 @@ int			trunc_adjust(u_char *, int, int);
 /* --from ns_resp.c-- */
 
 /* ++from ns_req.c++ */
+int			ns_get_opt(u_char *msg, u_char *eom,
+				   u_int8_t *versionp, u_int16_t *rcodep,
+				   u_int16_t *flagp, u_int16_t *bufsizep,
+				   u_char **optionsp, size_t *optsizep);
+int			ns_add_opt(u_char *msg, u_char *cp, size_t buflen,
+				   u_int8_t version, u_int16_t rcode,
+				   u_int16_t size, u_int16_t flags,
+				   u_char *options, size_t optlen);
 void			ns_req(u_char *, int, int,
 			       struct qstream *,
 			       struct sockaddr_in,
@@ -192,6 +201,7 @@ int			doaddauth(HEADER *, u_char *, int,
 int			findZonePri(const struct zoneinfo *,
 				    const struct sockaddr_in);
 #endif
+int			drop_port(u_int16_t);
 /* --from ns_req.c-- */
 
 /* ++from ns_xfr.c++ */
@@ -212,8 +222,8 @@ void			ns_ctl_shutdown(void);
 void			ns_ctl_defaults(controls *);
 void			ns_ctl_add(controls *, control);
 control			ns_ctl_new_inet(struct in_addr, u_int, ip_match_list);
-#ifndef WINNT
-control			ns_ctl_new_unix(char *, mode_t, uid_t, gid_t);
+#ifndef NO_SOCKADDR_UN
+control			ns_ctl_new_unix(const char *, mode_t, uid_t, gid_t);
 #endif
 void			ns_ctl_install(controls *);
 /* --from ns_ctl.c-- */
@@ -249,10 +259,10 @@ void			unsched(struct qinfo *);
 void			reset_retrytimer(void);
 void			retrytimer(evContext ctx, void *uap,
 				   struct timespec due, struct timespec ival);
-void			retry(struct qinfo *);
+void			retry(struct qinfo *, int);
 void			qflush(void);
 void			qremove(struct qinfo *);
-void			ns_freeqns(struct qinfo *, char *);
+void			ns_freeqns(struct qinfo *);
 void			ns_freeqry(struct qinfo *);
 void			freeComplaints(void);
 void			nsfwdadd(struct qinfo *, struct fwdinfo *);
@@ -267,7 +277,7 @@ void			sq_remove(struct qstream *);
 void			sq_flushw(struct qstream *);
 void			sq_flush(struct qstream *allbut);
 void			dq_remove_gen(time_t gen);
-void			dq_remove_all();
+void			dq_remove_all(void);
 void			sq_done(struct qstream *);
 void			ns_setproctitle(char *, int);
 void			getnetconf(int);
@@ -303,6 +313,7 @@ void			qserial_answer(struct qinfo *);
 void			printzoneinfo(int, int, int);
 #endif
 void			endxfer(void);
+void			tryxfer(void);
 void			addxfer(struct zoneinfo *);
 void			ns_zreload(void);
 void			ns_reload(void);
@@ -386,8 +397,7 @@ int			merge_logs(struct zoneinfo *zp, char *logname);
 int			zonedump(struct zoneinfo *zp, int isixfr);
 void			dynamic_about_to_exit(void);
 enum req_action		req_update(HEADER *hp, u_char *cp, u_char *eom,
-				   u_char *msg, struct qstream *qsp,
-				   int dfd, struct sockaddr_in from,
+				   u_char *msg, struct sockaddr_in from,
 				   struct tsig_record *in_tsig);
 void			rdata_dump(struct databuf *dp, FILE *fp);
 /* --from ns_update.c-- */
@@ -412,7 +422,7 @@ int			set_zone_type(zone_config, int);
 int			set_zone_filename(zone_config, char *);
 int 			set_zone_checknames(zone_config, enum severity);
 #ifdef BIND_NOTIFY
-int			set_zone_notify(zone_config, int value);
+int			set_zone_notify(zone_config, enum notify value);
 #endif
 int			set_zone_maintain_ixfr_base(zone_config, int value);
 int			set_zone_update_acl(zone_config, ip_match_list);
@@ -422,7 +432,8 @@ int			set_zone_transfer_source(zone_config, struct in_addr);
 int			set_zone_pubkey(zone_config, const int, const int,
 					const int, const char *);
 int 			set_zone_transfer_time_in(zone_config, long);
-int			add_zone_master(zone_config, struct in_addr);
+int			add_zone_master(zone_config, struct in_addr,
+					struct dst_key *);
 #ifdef BIND_NOTIFY
 int			add_zone_notify(zone_config, struct in_addr);
 #endif
@@ -453,8 +464,8 @@ ip_match_element	new_ip_match_localhost(void);
 ip_match_element	new_ip_match_localnets(void);
 void			ip_match_negate(ip_match_element);
 void			add_to_ip_match_list(ip_match_list, ip_match_element);
-void			dprint_ip_match_list(int, ip_match_list, int, char *,
-					     char *);
+void			dprint_ip_match_list(int, ip_match_list, int,
+					     const char *, const char *);
 int			ip_match_address(ip_match_list, struct in_addr);
 int			ip_match_addr_or_key(ip_match_list, struct in_addr,
 					     struct dst_key *key);
@@ -503,10 +514,10 @@ time_t			load_configuration(const char *);
 /* --from ns_config.c-- */
 
 /* ++from parser.y++ */
-ip_match_list		lookup_acl(char *);
-void			define_acl(char *, ip_match_list);
+ip_match_list		lookup_acl(const char *);
+void			define_acl(const char *, ip_match_list);
 struct dst_key		*lookup_key(char *);
-void			define_key(char *, struct dst_key *);
+void			define_key(const char *, struct dst_key *);
 time_t			parse_configuration(const char *);
 void			parser_initialize(void);
 void			parser_shutdown(void);

contrib/bind/bin/named/ns_glob.h

@@ -1,6 +1,6 @@
 /*
  *	from ns.h	4.33 (Berkeley) 8/23/90
- *	$Id: ns_glob.h,v 8.56 2000/12/02 18:39:25 vixie Exp $
+ *	$Id: ns_glob.h,v 8.58 2002/06/05 04:53:50 marka Exp $
  */
 
 /*
@@ -336,9 +336,11 @@ DECL	char *			user_name		INIT(NULL);
 DECL	gid_t			group_id;
 DECL	char *			group_name		INIT(NULL);
 DECL	char *			chroot_dir		INIT(NULL);
+DECL	char *			working_dir		INIT(NULL);
 
 DECL	int			loading			INIT(0);
 
 DECL	int			xfers_running		INIT(0);
 DECL	int			xfers_deferred		INIT(0);
 DECL	int			qserials_running	INIT(0);
+DECL	int			initial_configuration	INIT(1);

contrib/bind/bin/named/ns_glue.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_glue.c,v 8.20 2001/02/16 04:46:14 marka Exp $";
+static const char rcsid[] = "$Id: ns_glue.c,v 8.24 2002/01/07 02:54:37 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -179,8 +179,8 @@ ns_panic(int category, int dump_core, const char *format, ...) {
 }
 
 void
-ns_assertion_failed(char *file, int line, assertion_type type, char *cond,
-		    int print_errno)
+ns_assertion_failed(const char *file, int line, assertion_type type,
+		    const char *cond, int print_errno)
 {
 	ns_panic(ns_log_insist, 1, "%s:%d: %s(%s)%s%s failed.",
 		file, line, assertion_type_to_text(type), cond,
@@ -277,7 +277,11 @@ my_close(int fd) {
 		s = close(fd);
 	} while (s < 0 && errno == EINTR);
 
-	if (s < 0 && errno != EBADF)
+	/*
+	 * Tru64 UNIX V5.1 can return a spurious EINVAL after connect()
+	 * failures.
+	 */
+	if (s < 0 && errno != EBADF && errno != EINVAL)
 		ns_info(ns_log_default, "close(%d) failed: %s", fd,
 		       strerror(errno));
 	else
@@ -328,9 +332,10 @@ __savestr(const char *str, int needpanic) {
 	return (__savestr_record(str, needpanic, __FILE__, __LINE__));
 }
 
-void
+void *
 __freestr(char *str) {
 	__freestr_record(str, __FILE__, __LINE__);
+	return (NULL);
 }
 
 #ifdef DEBUG_STRINGS
@@ -364,7 +369,7 @@ debug_freestr(char *str, const char *file, int line) {
 	len += 3;	/* 2 length bytes + NUL. */
 	printf("%s:%d: freestr %d %s\n", file, line, len, str);
 	__freestr_record(str, file, line);
-	return;
+	return (NULL);
 }
 #endif /* DEBUG_STRINGS */
 
@@ -372,7 +377,7 @@ debug_freestr(char *str, const char *file, int line) {
  * Return a counted string buffer big enough for a string of length 'len'.
  */
 char *
-__newstr_record(size_t len, int needpanic, char *file, int line) {
+__newstr_record(size_t len, int needpanic, const char *file, int line) {
 	u_char *buf, *bp;
 
 	REQUIRE(len <= 65536);
@@ -393,7 +398,7 @@ __newstr_record(size_t len, int needpanic, char *file, int line) {
  * Save a NUL terminated string and return a pointer to it.
  */
 char *
-__savestr_record(const char *str, int needpanic, char *file, int line) {
+__savestr_record(const char *str, int needpanic, const char *file, int line) {
 	char *buf;
 	size_t len;
 
@@ -410,8 +415,8 @@ __savestr_record(const char *str, int needpanic, char *file, int line) {
 	return (buf);
 }
 
-void
-__freestr_record(char *str, char *file, int line) {
+void *
+__freestr_record(char *str, const char *file, int line) {
 	u_char *buf, *bp;
 	size_t len;
 
@@ -419,11 +424,12 @@ __freestr_record(char *str, char *file, int line) {
 	bp = buf;
 	NS_GET16(len, bp);
 	__memput_record(buf, 2/*Len*/ + len + 1/*Nul*/, file, line);
+	return (NULL);
 }
 
-char *
+const char *
 checked_ctime(const time_t *t) {
-	char *ctime_result;
+	const char *ctime_result;
 
 	ctime_result = ctime(t);
 	if (ctime_result == NULL) {
@@ -438,7 +444,7 @@ checked_ctime(const time_t *t) {
  * Since the fields in a "struct timeval" are longs, and the argument to ctime
  * is a pointer to a time_t (which might not be a long), here's a bridge.
  */
-char *
+const char *
 ctimel(long l) {
 	time_t t = (time_t)l;
 

contrib/bind/bin/named/ns_init.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_init.c	4.38 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: ns_init.c,v 8.73 2001/04/20 00:21:40 vixie Exp $";
+static const char rcsid[] = "$Id: ns_init.c,v 8.76 2001/12/19 01:41:51 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -294,7 +294,10 @@ do_reload(const char *domain, int type, int class, int mark) {
 	 * Clean up any leftover data.
 	 */
 	ns_stopxfrs(zp);
-	purge_zone(domain, hashtab, class);
+	if (type == z_hint || (type == z_stub && *domain == 0))
+		purge_zone(domain, fcachetab, class);
+	else
+		purge_zone(domain, hashtab, class);
 
 	/*
 	 * Reload
@@ -534,9 +537,9 @@ ns_nameok(const struct qinfo *qry, const char *name, int class,
 		if (severity == warn)
 			ok = 1;
 		if (s != NULL)
-			freestr(s);
+			(void)freestr(s);
 		if (o != NULL)
-			freestr(o);
+			(void)freestr(o);
 	}
 	return (ok);
 }

contrib/bind/bin/named/ns_ixfr.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_ixfr.c,v 8.26.2.2 2001/08/10 03:00:08 marka Exp $";
+static const char rcsid[] = "$Id: ns_ixfr.c,v 8.32 2002/05/18 01:02:57 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -201,10 +201,10 @@ sx_send_ixfr(struct qstream *qsp) {
 		ns_panic(ns_log_update, 1,
 			 "sx_send_ixfr: unable to locate soa");
 	}
-	old_soadp = memget(DATASIZE(soa_dp->d_size));
+	old_soadp = memget(BIND_DATASIZE(soa_dp->d_size));
 	if (old_soadp == NULL)
 		ns_panic(ns_log_update, 1, "sx_send_ixfr: out of memory");
-	memcpy(old_soadp, soa_dp, DATASIZE(soa_dp->d_size));
+	memcpy(old_soadp, soa_dp, BIND_DATASIZE(soa_dp->d_size));
 
  again:
 	switch (qsp->xfr.state) {
@@ -232,8 +232,7 @@ sx_send_ixfr(struct qstream *qsp) {
 					if (sx_addrr(qsp, rp->r_dname,
 						     rp->r_dp) < 0)
 						goto cleanup;
-					db_freedata(rp->r_dp);
-					rp->r_dp = NULL;
+					db_detach(&rp->r_dp);
 					foundsoa = 1;
 					break;
 				}
@@ -268,8 +267,7 @@ sx_send_ixfr(struct qstream *qsp) {
 					    sx_addrr(qsp, rp->r_dname,
 						     rp->r_dp) < 0)
 						goto cleanup;
-					db_freedata(rp->r_dp);
-					rp->r_dp = NULL;
+					db_detach(&rp->r_dp);
 				}
 				rp = NEXT(rp, r_link);
 			}
@@ -292,8 +290,7 @@ sx_send_ixfr(struct qstream *qsp) {
 					if (sx_addrr(qsp, rp->r_dname,
 						     rp->r_dp) < 0)
 						goto cleanup;
-					db_freedata(rp->r_dp);
-					rp->r_dp = NULL;
+					db_detach(&rp->r_dp);
 					foundsoa = 1;
 					break;
 				}
@@ -332,8 +329,7 @@ sx_send_ixfr(struct qstream *qsp) {
 						if (sx_addrr(qsp, rp->r_dname,
 							     rp->r_dp) < 0)
 							goto cleanup;
-						db_freedata(rp->r_dp);
-						rp->r_dp = NULL;
+						db_detach(&rp->r_dp);
 					}
 					rp = NEXT(rp, r_link);
 				}
@@ -344,10 +340,8 @@ sx_send_ixfr(struct qstream *qsp) {
 				/* clean up old update */
 				while ((rp = HEAD(dp->d_changes)) != NULL) {
 					UNLINK(dp->d_changes, rp, r_link);
-					if (rp->r_dp != NULL) {
-						db_freedata(rp->r_dp);
-						rp->r_dp = NULL;
-					}
+					if (rp->r_dp != NULL)
+						db_detach(&rp->r_dp);
 					res_freeupdrec(rp);
 				}
 				memput(dp, sizeof (*dp));
@@ -379,8 +373,7 @@ sx_send_ixfr(struct qstream *qsp) {
 				while ((rp = HEAD(dp->d_changes)) != NULL) {
 					UNLINK(dp->d_changes, rp, r_link);
 					if (rp->r_dp != NULL)
-						db_freedata(rp->r_dp);
-					rp->r_dp = NULL;
+						db_detach(&rp->r_dp);
 					res_freeupdrec(rp);
 				} 
 				memput(dp, sizeof *dp);
@@ -390,7 +383,7 @@ sx_send_ixfr(struct qstream *qsp) {
 		qsp->xfr.top.ixfr = NULL;
 	}
  cleanup:
-	memput(old_soadp, DATASIZE(old_soadp->d_size));
+	memput(old_soadp, BIND_DATASIZE(old_soadp->d_size));
 }
 
 
@@ -432,9 +425,8 @@ ixfr_log_maint(struct zoneinfo *zp) {
 		return (-1);
 	}
 	(void) my_fclose(db_fp);
-	ns_debug(ns_log_default, 3, "%s, size %d blk %d", 
-	     zp->z_source, db_sb.st_size, 
-	     db_sb.st_size);
+	ns_debug(ns_log_default, 3, "%s, size %ld", 
+		 zp->z_source, (long)db_sb.st_size);
 
 	/* open up the zone ixfr log */
 	if ((from_fp = fopen(zp->z_ixfr_base, "r")) == NULL) {
@@ -449,10 +441,8 @@ ixfr_log_maint(struct zoneinfo *zp) {
 		(void) my_fclose(from_fp);
 		return (-1);
 	}
-	ns_debug(ns_log_default, 3, "%s, size %d max %d\n", 
-	     zp->z_ixfr_base, 
-	     sb.st_size, 
-	     zp->z_max_log_size_ixfr);
+	ns_debug(ns_log_default, 3, "%s, size %ld max %ld\n", zp->z_ixfr_base, 
+		 (long)sb.st_size, (long)zp->z_max_log_size_ixfr);
 	if (zp->z_max_log_size_ixfr) {
 		if (sb.st_size > zp->z_max_log_size_ixfr)
 			seek = sb.st_size -
@@ -467,7 +457,7 @@ ixfr_log_maint(struct zoneinfo *zp) {
 		else 
 			 seek = 0;
 	}
-	ns_debug(ns_log_default, 3, "seek: %d", seek);
+	ns_debug(ns_log_default, 3, "seek: %ld", (long)seek);
 	if (seek < 1) {
 		ns_debug(ns_log_default, 3, "%s does not need to be reduced", 
 			zp->z_ixfr_base);
@@ -489,7 +479,7 @@ ixfr_log_maint(struct zoneinfo *zp) {
 
 	(void) strcat(tmpname, ".XXXXXX");
 	if ((fd = mkstemp(tmpname)) == -1) {
-		ns_warning(ns_log_db, "can't make tmpfile (%s): %s",
+		ns_warning(ns_log_db, "can't make tmpfile (%s): %s", 
 			   tmpname, strerror(errno));
 		memput(tmpname, len);
 		(void) my_fclose(from_fp);
@@ -536,7 +526,8 @@ ixfr_log_maint(struct zoneinfo *zp) {
 			break;
 	}
 	if (found) {
-		ns_debug(ns_log_default, 1, "ixfr_log_maint(): found [END_DELTA]");
+		ns_debug(ns_log_default, 1,
+			 "ixfr_log_maint(): found [END_DELTA]");
 	
 		fprintf(to_fp, "%s", LogSignature);
 
@@ -557,7 +548,8 @@ ixfr_log_maint(struct zoneinfo *zp) {
 	(void) my_fclose(from_fp);
 	if (error == 0) {
 		if (isc_movefile(tmpname, zp->z_ixfr_base) == -1) {
-			ns_warning(ns_log_default, "can not rename %s to %s :%s",
+			ns_warning(ns_log_default,
+				   "can not rename %s to %s :%s",
 				   tmpname, zp->z_ixfr_base, strerror(errno));
 		}
 		if ((from_fp = fopen(zp->z_ixfr_base, "r")) == NULL) {
@@ -576,25 +568,23 @@ ixfr_log_maint(struct zoneinfo *zp) {
 		if (sb.st_size <= 0)
 			(void) unlink(zp->z_ixfr_base);
 		else if (chmod(zp->z_ixfr_base, 0644) < 0)
-				ns_error(ns_log_update,
-					"chmod(%s,%o) failed, pressing on: %s",
-					 zp->z_source, sb.st_mode,
-					 strerror(errno));
+			ns_error(ns_log_update,
+				"chmod(%s,%o) failed, pressing on: %s",
+				 zp->z_source, sb.st_mode, strerror(errno));
 		(void) my_fclose(from_fp);
 	}
 	(void) unlink(tmpname);
 	memput(tmpname, len);
 
-	zp->z_serial_ixfr_start = 0; /* signal to read for lowest serial number */	
+	/* signal to read for lowest serial number */	
+	zp->z_serial_ixfr_start = 0;
 
-	ns_debug(ns_log_default, 3, "%s, size %d max %d\n", 
-	     zp->z_ixfr_base, 
-	     sb.st_size, 
-	     zp->z_max_log_size_ixfr);
+	ns_debug(ns_log_default, 3, "%s, size %ld max %ld\n", zp->z_ixfr_base,
+		 (long)sb.st_size, (long)zp->z_max_log_size_ixfr);
 
 	if (error)
 	 	return(-1);
 	else
-	    return (0);
+		return (0);
 }
 

contrib/bind/bin/named/ns_lexer.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_lexer.c,v 8.22 2000/11/29 06:55:58 marka Exp $";
+static const char rcsid[] = "$Id: ns_lexer.c,v 8.31 2002/05/24 03:05:03 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -57,7 +57,7 @@ typedef enum lexer_state {
 #define LEXER_MAX_PUSHBACK	2
 
 typedef struct lexer_file_context {
-	const char *	name;
+	char *	name;
 	FILE *		stream;
 	int		line_number;
 	LexerState	state;
@@ -140,6 +140,10 @@ token_to_text(int token, YYSTYPE lval) {
 static char where[MAXPATHLEN + 100];
 static char message[20480];
 
+static void
+parser_complain(int is_warning, int print_last_token, const char *format,
+		va_list args) ISC_FORMAT_PRINTF(3, 0);
+
 static void
 parser_complain(int is_warning, int print_last_token, const char *format,
 		va_list args)
@@ -199,7 +203,7 @@ parser_error(int print_last_token, const char *format, ...) {
 
 void
 yyerror(const char *message) {
-	parser_error(1, message);
+	parser_error(1, "%s", message);
 }
 
 /*
@@ -207,7 +211,7 @@ yyerror(const char *message) {
  */
 
 struct keyword {
-        char *name;
+        const char *name;
 	int token;
 };
 
@@ -247,6 +251,8 @@ static struct keyword keywords[] = {
 	{"directory", T_DIRECTORY}, 
 	{"dump-file", T_DUMP_FILE},
 	{"dynamic", T_DYNAMIC},
+	{"edns", T_EDNS},
+	{"explicit", T_EXPLICIT},
 	{"fail", T_FAIL},
 	{"fake-iquery", T_FAKE_IQUERY},
 	{"false", T_FALSE},
@@ -265,6 +271,7 @@ static struct keyword keywords[] = {
 #endif /* HITCOUNTS */
 	{"host-statistics", T_HOSTSTATS},
 	{"host-statistics-max", T_HOSTSTATSMAX},
+	{"hostname", T_HOSTNAME},
 	{"if-no-answer", T_IF_NO_ANSWER},
 	{"if-no-domain", T_IF_NO_DOMAIN},
 	{"ignore", T_IGNORE},
@@ -303,6 +310,7 @@ static struct keyword keywords[] = {
 	{"perm", T_PERM},
 	{"pid-file", T_PIDFILE},
 	{"port", T_PORT},
+	{"preferred-glue", T_PREFERRED_GLUE},
 	{"print-category", T_PRINT_CATEGORY},
 	{"print-severity", T_PRINT_SEVERITY},
 	{"print-time", T_PRINT_TIME},
@@ -324,6 +332,9 @@ static struct keyword keywords[] = {
 	{"statistics-interval", T_STATS_INTERVAL},
 	{"stub", T_STUB},
 	{"support-ixfr", T_SUPPORT_IXFR},
+#ifdef BIND_NOTIFY
+	{"suppress-initial-notify", T_NOTIFY_INITIAL},
+#endif
 	{"syslog", T_SYSLOG}, 
 	{"topology", T_TOPOLOGY},
 	{"transfer-format", T_TRANSFER_FORMAT}, 
@@ -391,7 +402,7 @@ lexer_begin_file(const char *filename, FILE *stream) {
 		panic("memget failed in lexer_begin_file", NULL);
 	INSIST(stream != NULL);
 	lf->stream = stream;
-	lf->name = filename;  /* note copy by reference */
+	lf->name = savestr(filename, 1);
 	lf->line_number = 1;
 	lf->state = scan;
 	lf->flags = 0;
@@ -410,6 +421,7 @@ lexer_end_file(void) {
 	lf = current_file;
 	current_file = lf->next;
 	fclose(lf->stream);
+	freestr(lf->name);
 	memput(lf, sizeof *lf);
 }
 
@@ -474,7 +486,7 @@ scan_to_comment_end(int c_plus_plus_style) {
 	}
 }
 
-int
+static int
 get_next_char(int comment_ok) {
 	int c, nc;
 
@@ -518,7 +530,7 @@ get_next_char(int comment_ok) {
 	return (c);
 }
 
-void
+static void
 put_back_char(int c) {
 	if (c == EOF)
 		current_file->flags |= LEX_EOF;

contrib/bind/bin/named/ns_lexer.h

@@ -30,8 +30,8 @@
 #define SYM_LOGGING	0x04
 #define SYM_SYSLOG	0x08
 
-int	parser_warning(int, const char *, ...);
-int	parser_error(int, const char *, ...);
+int	parser_warning(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
+int	parser_error(int, const char *, ...) ISC_FORMAT_PRINTF(2, 3);
 void	yyerror(const char *);
 void	lexer_begin_file(const char *, FILE *);
 void	lexer_end_file(void);

contrib/bind/bin/named/ns_main.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_main.c	4.55 (Berkeley) 7/1/91";
-static const char rcsid[] = "$Id: ns_main.c,v 8.145 2001/03/16 12:07:57 marka Exp $";
+static const char rcsid[] = "$Id: ns_main.c,v 8.160 2002/06/24 07:06:55 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -99,8 +99,10 @@ char copyright[] =
 #ifdef SVR4	/* XXX */
 # include <sys/sockio.h>
 #else
+#ifndef __hpux
 # include <sys/mbuf.h>
 #endif
+#endif
 
 #include <netinet/in.h>
 #include <net/route.h>
@@ -174,7 +176,7 @@ static	u_int16_t               nsid_c1, nsid_c2, nsid_c3;
 static	u_int16_t               nsid_state2;
 static	int                     nsid_algorithm;
 
-static	int			needs = 0, needs_exit = 0;
+static	int			needs = 0, needs_exit = 0, needs_restart = 0;
 static	handler			handlers[main_need_num];
 static	void			savedg_waitfunc(evContext, void*, const void*);
 static	void			need_waitfunc(evContext, void *, const void *);
@@ -233,14 +235,14 @@ usage() {
 	exit(1);
 }
 
-static char bad_p_option[] =
+static const char bad_p_option[] =
 "-p remote/local obsolete; use 'listen-on' in config file to specify local";
 
-static char bad_directory[] = "chdir failed for directory '%s': %s";
+static const char bad_directory[] = "chdir failed for directory '%s': %s";
 
 /*ARGSUSED*/
 int
-main(int argc, char *argv[], char *envp[]) {
+main(int argc, char *argv[]) {
 	int n;
 	char *p;
 	int ch;
@@ -281,7 +283,7 @@ main(int argc, char *argv[], char *envp[]) {
 		case 'b':
 		case 'c':
 			if (conffile != NULL)
-				freestr(conffile);
+				(void)freestr(conffile);
 			conffile = savestr(optarg, 1);
 			break;
 
@@ -309,14 +311,7 @@ main(int argc, char *argv[], char *envp[]) {
 			break;
 
 		case 'w':
-			if (chdir(optarg) < 0) {
-				syslog(LOG_CRIT, bad_directory, optarg,
-				       strerror(errno));
-				fprintf(stderr, bad_directory, optarg,
-					strerror(errno));
-				fputc('\n', stderr);
-				exit(1);
-			}
+			working_dir = savestr(optarg, 1);
 			break;
 #ifdef QRYLOG
 		case 'q':
@@ -367,7 +362,7 @@ main(int argc, char *argv[], char *envp[]) {
 
 		case 'g':
 			if (group_name != NULL)
-				freestr(group_name);
+				(void)freestr(group_name);
 			group_name = savestr(optarg, 1);
 			if (only_digits(group_name))
 				group_id = atoi(group_name);
@@ -394,7 +389,7 @@ main(int argc, char *argv[], char *envp[]) {
 
 	if (argc) {
 		if (conffile != NULL)
-			freestr(conffile);
+			(void)freestr(conffile);
 		conffile = savestr(*argv, 1);
 		argc--, argv++;
 	}
@@ -431,10 +426,22 @@ main(int argc, char *argv[], char *envp[]) {
 		}
 #else
 		fprintf(stderr, "warning: chroot() not available\n");
-		freestr(chroot_dir);
-		chroot_dir = NULL;
+		chroot_dir = freestr(chroot_dir);
 #endif
 	}
+	/*
+	 * Set working directory.
+	 */
+	if (working_dir != NULL) {
+		if (chdir(working_dir) < 0) {
+			syslog(LOG_CRIT, bad_directory, working_dir,
+			       strerror(errno));
+			fprintf(stderr, bad_directory, working_dir,
+				strerror(errno));
+			fputc('\n', stderr);
+			exit(1);
+		}
+	}
 
 	/* Establish global event context. */
 	evCreate(&ev);
@@ -551,7 +558,10 @@ main(int argc, char *argv[], char *envp[]) {
 		else
 			INSIST_ERR(errno == EINTR);
 	}
-	ns_info(ns_log_default, "named shutting down");
+	if (needs_restart)
+		ns_info(ns_log_default, "named restarting");
+	else
+		ns_info(ns_log_default, "named shutting down");
 #ifdef BIND_UPDATE
 	dynamic_about_to_exit();
 #endif
@@ -564,25 +574,56 @@ main(int argc, char *argv[], char *envp[]) {
 	else
 		shutdown_configuration();
 
-	/* Cleanup for system-dependent stuff */
-	custom_shutdown();
+	if (needs_restart)
+		execvp(saved_argv[0], saved_argv);
+	else
+		/* Cleanup for system-dependent stuff */
+		custom_shutdown();
 	
 	return (0);
 }
 
 static int
-ns_socket(int domain, int type, int protocol) {
-	int fd;
+sq_closeone(void) {
+	struct qstream *sp, *nextsp;
+	struct qstream *candidate = NULL;
+	time_t lasttime, maxctime = 0;
+	int result = 0;
 
+	gettime(&tt);
+	
+	for (sp = streamq; sp; sp = nextsp) {
+		nextsp = sp->s_next;
+		if (sp->s_refcnt)
+			continue;
+		lasttime = tt.tv_sec - sp->s_time;
+		if (lasttime >= VQEXPIRY) {
+			sq_remove(sp);
+			result = 1;
+		} else if (lasttime > maxctime) {
+			candidate = sp;
+			maxctime = lasttime;
+		}
+	}
+	if (candidate) {
+		sq_remove(candidate);
+		result = 1;
+	}
+	return (result);
+}
+
+static int
+ns_socket(int domain, int type, int protocol) {
+	int fd, tmp;
+
+ again:
 	fd = socket(domain, type, protocol);
-	if (fd == -1)
-		return (-1);
 #ifdef F_DUPFD		/* XXX */
 	/*
 	 * Leave a space for stdio to work in.
 	 */
 	if (fd >= 0 && fd <= 20) {
-		int new, tmp;
+		int new;
 		if ((new = fcntl(fd, F_DUPFD, 20)) == -1)
 			ns_notice(ns_log_default, "fcntl(fd, F_DUPFD, 20): %s",
 				  strerror(errno));
@@ -592,6 +633,11 @@ ns_socket(int domain, int type, int protocol) {
 		fd = new;
 	}
 #endif
+	tmp = errno;
+	if (errno == EMFILE)
+		if (sq_closeone())
+			goto again;
+	errno = tmp;
 	return (fd);
 }
 
@@ -608,13 +654,17 @@ stream_accept(evContext lev, void *uap, int rfd,
 	interface *ifp = uap;
 	struct qstream *sp;
 	struct iovec iov;
-	int len, n;
+	ISC_SOCKLEN_T len;
+	int n;
 	const int on = 1;
 #ifdef IP_OPTIONS	/* XXX */
 	u_char ip_opts[IP_OPT_BUF_SIZE];
 #endif
 	const struct sockaddr_in *la, *ra;
 
+	UNUSED(lalen);
+	UNUSED(ralen);
+
 	la = (const struct sockaddr_in *)lav;
 	ra = (const struct sockaddr_in *)rav;
 
@@ -677,25 +727,7 @@ stream_accept(evContext lev, void *uap, int rfd,
 			 * eventlib which will call us right back.
 			 */
 			if (streamq) {
-				struct qstream *nextsp;
-				struct qstream *candidate = NULL;
-				time_t lasttime, maxctime = 0;
-				
-				for (sp = streamq; sp; sp = nextsp) {
-					nextsp = sp->s_next;
-					if (sp->s_refcnt)
-						continue;
-					gettime(&tt);
-					lasttime = tt.tv_sec - sp->s_time;
-					if (lasttime >= VQEXPIRY)
-						sq_remove(sp);
-					else if (lasttime > maxctime) {
-						candidate = sp;
-						maxctime = lasttime;
-					}
-				}
-				if (candidate)
-					sq_remove(candidate);
+				(void)sq_closeone();
 				return;
 			}
 			/* fall through */
@@ -714,7 +746,7 @@ stream_accept(evContext lev, void *uap, int rfd,
 
 #ifndef CANNOT_SET_SNDBUF
 	if (setsockopt(rfd, SOL_SOCKET, SO_SNDBUF,
-		      (char*)&sbufsize, sizeof sbufsize) < 0) {
+		       (const char*)&sbufsize, sizeof sbufsize) < 0) {
 		ns_info(ns_log_default, "setsockopt(rfd, SO_SNDBUF, %d): %s",
 			sbufsize, strerror(errno));
 		(void) close(rfd);
@@ -722,13 +754,21 @@ stream_accept(evContext lev, void *uap, int rfd,
 	}
 #endif
 	if (setsockopt(rfd, SOL_SOCKET, SO_KEEPALIVE,
-		       (char *)&on, sizeof on) < 0) {
+		       (const char *)&on, sizeof on) < 0) {
 		ns_info(ns_log_default, "setsockopt(rfd, KEEPALIVE): %s",
 			strerror(errno));
 		(void) close(rfd);
 		return;
 	}
 
+#ifdef USE_FIONBIO_IOCTL
+	if (ioctl(ifp->dfd, FIONBIO, (char *) &on) == -1) {
+		ns_info(ns_log_default, "ioctl(rfd, FIONBIO): %s",
+			strerror(errno));
+		(void) close(rfd);
+		return;
+	}
+#else
 	if ((n = fcntl(rfd, F_GETFL, 0)) == -1) {
 		ns_info(ns_log_default, "fcntl(rfd, F_GETFL): %s",
 			strerror(errno));
@@ -741,6 +781,7 @@ stream_accept(evContext lev, void *uap, int rfd,
 		(void) close(rfd);
 		return;
 	}
+#endif
 
 	/*
 	 * We don't like IP options.  Turn them off if the connection came in
@@ -796,19 +837,20 @@ tcp_send(struct qinfo *qp) {
 	struct qstream *sp;
 	struct sockaddr_in src;
 	int on = 1, n;
+	int fd;
 	
 	ns_debug(ns_log_default, 1, "tcp_send");
+	if ((fd = ns_socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == -1)
+		return (SERVFAIL);
+	if (fd > evHighestFD(ev)) {
+		close(fd);
+		return (SERVFAIL);
+	}
 	if ((sp = sq_add()) == NULL) {
+		close(fd);
 		return (SERVFAIL);
 	}
-	if ((sp->s_rfd = ns_socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) == -1) {
-		sq_remove(sp);
-		return (SERVFAIL);
-	}
-	if (sp->s_rfd > evHighestFD(ev)) {
-		sq_remove(sp);
-		return (SERVFAIL);
-	}
+	sp->s_rfd = fd;
 	if (setsockopt(sp->s_rfd, SOL_SOCKET, SO_REUSEADDR,
 		       (char*)&on, sizeof(on)) < 0)
 		ns_info(ns_log_default,
@@ -830,6 +872,12 @@ tcp_send(struct qinfo *qp) {
 		sq_remove(sp);
 		return (SERVFAIL);
 	}
+#ifdef USE_FIONBIO_IOCTL
+	if (ioctl(sp->s_rfd, FIONBIO, (char *) &on) == -1) {
+		sq_remove(sp);
+		return (SERVFAIL);
+	}
+#else
 	if ((n = fcntl(sp->s_rfd, F_GETFL, 0)) == -1) {
 		sq_remove(sp);
 		return (SERVFAIL);
@@ -838,6 +886,7 @@ tcp_send(struct qinfo *qp) {
 		sq_remove(sp);
 		return (SERVFAIL);
 	}
+#endif
 	if (sq_openw(sp, qp->q_msglen + INT16SZ) == -1) {
 		sq_remove(sp);
 		return (SERVFAIL);
@@ -872,6 +921,12 @@ stream_send(evContext lev, void *uap, int fd, const void *la, int lalen,
 	    const void *ra, int ralen) {
 	struct qstream *sp = uap;
 
+	UNUSED(lev);
+	UNUSED(la);
+	UNUSED(lalen);
+	UNUSED(ra);
+	UNUSED(ralen);
+
 	ns_debug(ns_log_default, 1, "stream_send");
 
 	sp->flags &= ~STREAM_CONNECT_EV;
@@ -923,6 +978,8 @@ stream_getlen(evContext lev, void *uap, int fd, int bytes) {
 	struct qstream *sp = uap;
 	struct iovec iov;
 
+	UNUSED(fd);
+
 	sp->flags &= ~STREAM_READ_EV;
 	if (bytes != INT16SZ) {
 		/*
@@ -979,7 +1036,7 @@ stream_getlen(evContext lev, void *uap, int fd, int bytes) {
 	if (evRead(lev, sp->s_rfd, &iov, 1, stream_getmsg, sp, &sp->evID_r)
 	    == -1)
 		ns_panic(ns_log_default, 1, "evRead(fd %d): %s",
-			 (void *)sp->s_rfd, strerror(errno));
+			 sp->s_rfd, strerror(errno));
 	sp->flags |= STREAM_READ_EV;
 }
 
@@ -987,6 +1044,9 @@ static void
 stream_getmsg(evContext lev, void *uap, int fd, int bytes) {
 	struct qstream *sp = uap;
 
+	UNUSED(lev);
+	UNUSED(fd);
+
 	sp->flags &= ~STREAM_READ_EV;
 	if (bytes == -1) {
 		ns_info(ns_log_default, "stream_getmsg(%s): %s",
@@ -999,8 +1059,10 @@ stream_getmsg(evContext lev, void *uap, int fd, int bytes) {
 	sp->s_time = tt.tv_sec;
 
 	if (ns_wouldlog(ns_log_default,5)) {
-		ns_debug(ns_log_default, 5, "sp %#x rfd %d size %d time %d next %#x",
-			sp, sp->s_rfd, sp->s_size, sp->s_time, sp->s_next);
+		ns_debug(ns_log_default, 5,
+			 "sp %p rfd %d size %d time %ld next %p",
+			 sp, sp->s_rfd, sp->s_size, (long)sp->s_time,
+			 sp->s_next);
 		ns_debug(ns_log_default, 5, "\tbufsize %d bytes %d", sp->s_bufsize,
 			 bytes);
 	}
@@ -1034,13 +1096,16 @@ static void
 datagram_read(evContext lev, void *uap, int fd, int evmask) {
 	interface *ifp = uap;
 	struct sockaddr_in from;
-	int from_len = sizeof from;
+	ISC_SOCKLEN_T from_len = sizeof from;
 	int n, nudp;
 	union {
 		HEADER h;			/* Force alignment of 'buf'. */
-		u_char buf[PACKETSZ+1];
+		u_char buf[EDNS_MESSAGE_SZ+1];
 	} u;
 
+	UNUSED(lev);
+	UNUSED(evmask);
+
 	tt = evTimeVal(evNowTime());
 	nudp = 0;
 
@@ -1088,16 +1153,16 @@ datagram_read(evContext lev, void *uap, int fd, int evmask) {
 			 sin_ntoa(from), fd, n);
 	}
 
-	if (n > PACKETSZ) {
+	if (n > EDNS_MESSAGE_SZ) {
 		/*
 		 * The message is too big.  It's probably a response to
 		 * one of our questions, so we truncate it and press on.
 		 */
-		n = trunc_adjust(u.buf, PACKETSZ, PACKETSZ);
+		n = trunc_adjust(u.buf, EDNS_MESSAGE_SZ, EDNS_MESSAGE_SZ);
 		ns_debug(ns_log_default, 1, "truncated oversize UDP packet");
 	}
 
-	dispatch_message(u.buf, n, PACKETSZ, NULL, from, fd, ifp);
+	dispatch_message(u.buf, n, EDNS_MESSAGE_SZ, NULL, from, fd, ifp);
 	if (++nudp < nudptrans)
 		goto more;
 }
@@ -1106,8 +1171,11 @@ static void
 savedg_waitfunc(evContext ctx, void *uap, const void *tag) {
 	savedg *dg = (savedg *)uap;
 
+	UNUSED(ctx);
+	UNUSED(tag);
+
 	if (!EMPTY(iflist) && HEAD(iflist)->gen == dg->gen) {
-		u_char buf[PACKETSZ];
+		u_char buf[EDNS_MESSAGE_SZ];
 
 		memcpy(buf, dg->buf, dg->buflen);
 		dispatch_message(buf, dg->buflen, sizeof buf, NULL,
@@ -1222,8 +1290,7 @@ getnetconf(int periodic_scan) {
 	for (;;) {
 		buf = memget(bufsiz);
 		if (!buf)
-			ns_panic(ns_log_default, 1,
-				"memget(interface)", NULL);
+			ns_panic(ns_log_default, 1, "memget(interface)");
 		ifc.ifc_len = bufsiz;
 		ifc.ifc_buf = buf;
 #ifdef IRIX_EMUL_IOCTL_SIOCGIFCONF
@@ -1244,7 +1311,7 @@ getnetconf(int periodic_scan) {
 			 * buffer we will grow it just in case and
 			 * retry.
 			 */
-			if (ifc.ifc_len + 2 * sizeof(ifreq) < bufsiz)
+			if ((int)(ifc.ifc_len + 2 * sizeof(ifreq)) < bufsiz)
 				break;
 		}
 #endif
@@ -1345,7 +1412,7 @@ getnetconf(int periodic_scan) {
 				ifp = (interface *)memget(sizeof *ifp);
 				if (!ifp)
 					ns_panic(ns_log_default, 1,
-						 "memget(interface)", NULL);
+						 "memget(interface)");
 				memset(ifp, 0, sizeof *ifp);
 				INIT_LINK(ifp, link);
 				APPEND(iflist, ifp, link);
@@ -1491,8 +1558,8 @@ static int
 opensocket_d(interface *ifp) {
 	struct sockaddr_in nsa;
 	const int on = 1;
-	int m, n;
-	int fd;
+	ISC_SOCKLEN_T m;
+	int n;
 
 	memset(&nsa, 0, sizeof nsa);
 	nsa.sin_family = AF_INET;
@@ -1509,6 +1576,14 @@ opensocket_d(interface *ifp) {
 		close(ifp->dfd);
 		return (-1);
 	}
+#ifdef USE_FIONBIO_IOCTL
+	if (ioctl(ifp->dfd, FIONBIO, (char *) &on) == -1) {
+		ns_info(ns_log_default, "ioctl(ifp->dfd, FIONBIO): %s",
+			strerror(errno));
+		(void) close(ifp->dfd);
+		return (-1);
+	}
+#else
 	if ((n = fcntl(ifp->dfd, F_GETFL, 0)) == -1) {
 		ns_info(ns_log_default, "fcntl(ifp->dfd, F_GETFL): %s",
 			strerror(errno));
@@ -1521,6 +1596,7 @@ opensocket_d(interface *ifp) {
 		(void) close(ifp->dfd);
 		return (-1);
 	}
+#endif
 	if (fcntl(ifp->dfd, F_SETFD, 1) < 0) {
 		ns_error(ns_log_default, "F_SETFD: %s", strerror(errno));
 		close(ifp->dfd);
@@ -1529,7 +1605,7 @@ opensocket_d(interface *ifp) {
 	ns_debug(ns_log_default, 1, "ifp->addr %s d_dfd %d",
 		 sin_ntoa(nsa), ifp->dfd);
 	if (setsockopt(ifp->dfd, SOL_SOCKET, SO_REUSEADDR,
-	    (char *)&on, sizeof(on)) != 0) {
+		       (const char *)&on, sizeof(on)) != 0) {
 		ns_notice(ns_log_default, "setsockopt(REUSEADDR): %s",
 			  strerror(errno));
 		/* XXX press on regardless, this is not too serious. */
@@ -1540,12 +1616,12 @@ opensocket_d(interface *ifp) {
 	    && (m == sizeof n)
 	    && (n < drbufsize)) {
 		(void) setsockopt(ifp->dfd, SOL_SOCKET, SO_RCVBUF,
-				  (char *)&drbufsize, sizeof drbufsize);
+				  (const char *)&drbufsize, sizeof drbufsize);
 	}
 #endif /* SO_RCVBUF */
 #ifndef CANNOT_SET_SNDBUF
 	if (setsockopt(ifp->dfd, SOL_SOCKET, SO_SNDBUF,
-		      (char*)&dsbufsize, sizeof dsbufsize) < 0) {
+		       (const char*)&dsbufsize, sizeof dsbufsize) < 0) {
 		ns_info(ns_log_default,
 			"setsockopt(dfd=%d, SO_SNDBUF, %d): %s",
 			ifp->dfd, dsbufsize, strerror(errno));
@@ -1583,10 +1659,10 @@ drain_rcvbuf(evContext ctx, interface *ifp, int fd, int *mread, int *mstore) {
 	for (; *mread > 0; (*mread)--) {
 		union {
 			HEADER h;
-			u_char buf[PACKETSZ+1];
+			u_char buf[EDNS_MESSAGE_SZ+1];
 		} u;
 		struct sockaddr_in from;
-		int from_len = sizeof from;
+		ISC_SOCKLEN_T from_len = sizeof from;
 		savedg *dg;
 		int n;
 
@@ -1595,7 +1671,7 @@ drain_rcvbuf(evContext ctx, interface *ifp, int fd, int *mread, int *mstore) {
 		if (n <= 0)
 			break;		/* Socket buffer assumed empty. */
 		drop++;			/* Pessimistic assumption. */
-		if (n > PACKETSZ)
+		if (n > EDNS_MESSAGE_SZ)
 			continue;	/* Oversize message - EDNS0 needed. */
 		if (from.sin_family != AF_INET)
 			continue;	/* Not IPv4 - IPv6 needed. */
@@ -1655,7 +1731,6 @@ opensocket_s(interface *ifp) {
 	struct sockaddr_in nsa;
 	const int on = 1;
 	int n;
-	int fd;
 
 	memset(&nsa, 0, sizeof nsa);
 	nsa.sin_family = AF_INET;
@@ -1683,7 +1758,7 @@ opensocket_s(interface *ifp) {
 		return (-1);
 	}
 	if (setsockopt(ifp->sfd, SOL_SOCKET, SO_REUSEADDR,
-		       (char *)&on, sizeof on) != 0) {
+		       (const char *)&on, sizeof on) != 0) {
 		ns_notice(ns_log_default, "setsockopt(REUSEADDR): %s",
 			  strerror(errno));
 		/* Consider that your first warning of trouble to come. */
@@ -1728,7 +1803,8 @@ opensocket_f() {
 	static interface *prev_ifp;
 	struct sockaddr_in nsa;
 	const int on = 1;
-	int n, need_close;
+	ISC_SOCKLEN_T n;
+	int need_close;
 	interface *ifp;
 
 	need_close = 0;
@@ -1786,7 +1862,7 @@ opensocket_f() {
 	if (fcntl(ds, F_SETFD, 1) < 0)
 		ns_panic(ns_log_default, 1, "F_SETFD: %s", strerror(errno));
 	if (setsockopt(ds, SOL_SOCKET, SO_REUSEADDR,
-	    (char *)&on, sizeof on) != 0) {
+		       (const char *)&on, sizeof on) != 0) {
 		ns_notice(ns_log_default, "setsockopt(REUSEADDR): %s",
 			  strerror(errno));
 		/* XXX press on regardless, this is not too serious. */
@@ -1816,7 +1892,7 @@ opensocket_f() {
 
 	if (evSelectFD(ev, ds, EV_READ, datagram_read, NULL, &ds_evID) == -1)
 		ns_panic(ns_log_default, 1, "evSelectFD(fd %d): %s",
-			 (void *)ds, strerror(errno));
+			 ds, strerror(errno));
 	/* XXX: should probably use a different FileFunc that only accepts
 	 *	responses, since requests on this socket make no sense.
 	 */
@@ -1833,6 +1909,8 @@ setdebug(int new_debug) {
 	debug = new_debug;
 	log_option(log_ctx, LOG_OPTION_DEBUG, debug);
 	log_option(log_ctx, LOG_OPTION_LEVEL, debug);
+	if (old_debug && !debug)
+		log_close_debug_channels(log_ctx);
 	evSetDebug(ev, debug, log_get_stream(eventlib_channel));
 	if (debug) {
 		if (!old_debug)
@@ -2017,6 +2095,8 @@ static void
 sq_writable(evContext ctx, void *uap, int fd, int evmask) {
 	struct qstream *qs = uap;
 
+	UNUSED(ctx);
+
 	INSIST(evmask & EV_WRITE);
 	INSIST(fd == qs->s_rfd);
 	if (sq_dowrite(qs) < 0) {
@@ -2118,7 +2198,7 @@ sq_done(struct qstream *sp) {
 	if (evRead(ev, sp->s_rfd, &iov, 1, stream_getlen, sp, &sp->evID_r) ==
 	    -1)
 		ns_panic(ns_log_default, 1, "evRead(fd %d): %s",
-			 (void *)sp->s_rfd, strerror(errno));
+			 sp->s_rfd, strerror(errno));
 	sp->flags |= STREAM_READ_EV;
 }
 
@@ -2359,7 +2439,7 @@ nsid_hash(u_char *data, size_t len) {
 	 * fast.
 	 */
 	while (len-- > 0) {
-		HASHROTATE(nsid_hash_state);
+		nsid_hash_state = HASHROTATE(nsid_hash_state);
 		nsid_hash_state += *data++;
 	}
 }
@@ -2566,8 +2646,7 @@ nsid_init(void) {
 		nsid_vtable = memget(NSID_SHUFFLE_TABLE_SIZE *
 				     (sizeof(u_int16_t)) );
 		if (!nsid_vtable)
-			ns_panic(ns_log_default, 1, "memget(nsid_vtable)",
-				 NULL);
+			ns_panic(ns_log_default, 1, "memget(nsid_vtable)");
 		for (i = 0; i < NSID_SHUFFLE_TABLE_SIZE; i++) {
 			nsid_vtable[i] = nsid_state;
 			nsid_state = (((u_long) nsid_a1 * nsid_state) + nsid_c1)
@@ -2579,7 +2658,7 @@ nsid_init(void) {
 		nsid_algorithm = NSID_USE_POOL;
 		nsid_pool = memget(0x10000 * (sizeof(u_int16_t)));
 		if (!nsid_pool)
-			ns_panic(ns_log_default, 1, "memget(nsid_pool)", NULL);
+			ns_panic(ns_log_default, 1, "memget(nsid_pool)");
 		for (i = 0; ; i++) {
 			nsid_pool[i] = nsid_state;
 			nsid_state = (((u_long) nsid_a1 * nsid_state) + nsid_c1)                                     & 0xFFFF;
@@ -2632,8 +2711,10 @@ nsid_next() {
 			nsid_state = 0;
 		else
 			nsid_state++;
-	} else
-		ns_panic(ns_log_default, 1, "Unknown ID algorithm", NULL);
+	} else {
+		id = 0;	/* silence compiler */
+		ns_panic(ns_log_default, 1, "Unknown ID algorithm");
+	}
 
 	/* Now lets obfuscate ... */
 	id = (((u_long) nsid_a2 * id) + nsid_c2) & 0xFFFF;
@@ -2679,31 +2760,29 @@ deallocate_everything(void) {
 	if (chroot_dir != NULL)
 		freestr(chroot_dir);
 	chroot_dir = NULL;
+	if (working_dir != NULL)
+		freestr(working_dir);
+	working_dir = NULL;
 	if (nsid_pool != NULL)
 		memput(nsid_pool, 0x10000 * (sizeof(u_int16_t)));
 	nsid_pool = NULL;
+	if (nsid_vtable != NULL)
+		memput(nsid_vtable, NSID_SHUFFLE_TABLE_SIZE *
+				     (sizeof(u_int16_t)));
+	nsid_vtable = NULL;
 	irs_destroy();
 	if (f != NULL) {
 		memstats(f);
 		(void)fclose(f);
 	}
+	if (memactive())
+		abort();
 }
 	
 static void
 ns_restart(void) {
-	ns_info(ns_log_default, "named restarting");
-#ifdef BIND_UPDATE
-	dynamic_about_to_exit();
-#endif
-	if (server_options && server_options->pid_filename)
-		(void)unlink(server_options->pid_filename);
-	ns_logstats(ev, NULL, evNowTime(), evConsTime(0, 0));
-	if (NS_OPTION_P(OPTION_DEALLOC_ON_EXIT))
-		deallocate_everything();
-	else
-		shutdown_configuration();
-	execvp(saved_argv[0], saved_argv);
-	abort();
+	needs_restart = 1;
+	needs_exit = 1;
 }
 
 static void
@@ -2753,7 +2832,7 @@ toggle_qrylog(void) {
 
 static void
 wild(void) {
-	ns_panic(ns_log_default, 1, "wild need", NULL);
+	ns_panic(ns_log_default, 1, "wild need");
 }
 
 /*
@@ -2780,6 +2859,7 @@ init_needs(void) {
 	handlers[main_need_restart] = ns_restart;
 	handlers[main_need_reap] = reapchild;
 	handlers[main_need_noexpired] = ns_noexpired;
+	handlers[main_need_tryxfer] = tryxfer;
 }
 
 static void
@@ -2803,7 +2883,7 @@ handle_needs(void) {
 		INSIST_ERR(evDo(ev, (void *)handle_needs) != -1);
 		return;
 	}
-	ns_panic(ns_log_default, 1, "ns_handle_needs: queued == 0", NULL);
+	ns_panic(ns_log_default, 1, "ns_handle_needs: queued == 0");
 }
 
 static void
@@ -2812,6 +2892,8 @@ need_waitfunc(evContext ctx, void *uap, const void *tag) {
 	time_t begin;
 	long syncdelay;
 
+	UNUSED(tag);
+
 	begin = time(NULL);
 	(*hand)();
 	syncdelay = time(NULL) - begin;

contrib/bind/bin/named/ns_maint.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_maint.c	4.39 (Berkeley) 3/2/91";
-static const char rcsid[] = "$Id: ns_maint.c,v 8.122.2.4 2001/08/10 03:00:11 marka Exp $";
+static const char rcsid[] = "$Id: ns_maint.c,v 8.136 2002/06/26 03:27:20 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -132,7 +132,6 @@ static int		nxfers(struct zoneinfo *),
 
 static void		startxfer(struct zoneinfo *),
 			abortxfer(struct zoneinfo *),
-			tryxfer(void),
 			purge_z_2(struct hashbuf *, int);
 static int		purge_nonglue_2(const char *, struct hashbuf *,
 					int, int, int);
@@ -267,11 +266,8 @@ zone_maint(struct zoneinfo *zp) {
 		break;
 	}
 
-	/*
-	 * It is essential that we never try to set a timer in the past
-	 * or for now because doing so could cause an infinite loop.
-	 */
-	INSIST(zp->z_time == 0 || zp->z_time > tt.tv_sec);
+	if (zp->z_time != 0 && zp->z_time < tt.tv_sec)
+		zp->z_time = tt.tv_sec;
 
 	sched_zone_maint(zp);
 }
@@ -282,6 +278,10 @@ do_zone_maint(evContext ctx, void *uap, struct timespec due,
 	ztimer_info zti = uap;
 	struct zoneinfo *zp;
 
+	UNUSED(ctx);
+	UNUSED(due);
+	UNUSED(inter);
+
 	INSIST(zti != NULL);
 	
 	ns_debug(ns_log_maint, 1, "do_zone_maint for zone %s (class %s)",
@@ -403,6 +403,10 @@ ns_cleancache(evContext ctx, void *uap,
 {
 	int deleted;
 
+	UNUSED(ctx);
+	UNUSED(due);
+	UNUSED(inter);
+
 	gettime(&tt);
 	INSIST(uap == NULL);
 	deleted = clean_cache(hashtab, 0);
@@ -416,6 +420,10 @@ ns_heartbeat(evContext ctx, void *uap, struct timespec due,
 {
 	struct zoneinfo *zp;
 
+	UNUSED(ctx);
+	UNUSED(due);
+	UNUSED(inter);
+
 	gettime(&tt);
 	INSIST(uap == NULL);
 
@@ -444,9 +452,10 @@ ns_heartbeat(evContext ctx, void *uap, struct timespec due,
 		 * Trigger a refresh query while the link is up by
 		 * sending a notify.
 		 */
-		if (((zp->z_notify == znotify_yes) ||
-		     ((zp->z_notify == znotify_use_default) &&
-		      !NS_OPTION_P(OPTION_NONOTIFY))) &&
+		if (((zp->z_notify == notify_yes) ||
+		     (zp->z_notify == notify_explicit) ||
+		     ((zp->z_notify == notify_use_default) &&
+		      server_options->notify != notify_no)) &&
 		    (zt == z_master || zt == z_slave) && !loading &&
 		    ((zp->z_flags & Z_AUTH) != 0))
 			ns_notify(zp->z_origin, zp->z_class, ns_t_soa);
@@ -515,9 +524,9 @@ qserial_query(struct zoneinfo *zp) {
 	}
 
 	qp = sysquery(zp->z_origin, zp->z_class, T_SOA,
-		      zp->z_addr, zp->z_addrcnt,
+		      zp->z_addr, zp->z_keys, zp->z_addrcnt,
 		      ntohs(zp->z_port) ? zp->z_port : ns_port,
-		      QUERY);
+		      QUERY, 0);
 	if (qp == NULL) {
 		ns_debug(ns_log_default, 1,
 			 "qserial_query(%s): sysquery FAILED",
@@ -572,7 +581,7 @@ qserial_answer(struct qinfo *qp) {
 		qs = &qp->q_addr[n];
 		ns_debug(ns_log_default, 1, "qserial_answer(%s): [%s] -> %lu",
 			 zp->z_origin, inet_ntoa(qs->ns_addr.sin_addr),
-			 qs->serial);
+			 (unsigned long)qs->serial);
 		/* Don't consider serials which weren't set by a response. */
 		if (qs->serial == 0)
 			continue;
@@ -607,7 +616,7 @@ qserial_answer(struct qinfo *qp) {
 			ns_debug(ns_log_default, 1,
 				 "qserial_answer after sort: [%s] -> %lu",
 				 inet_ntoa(qs->ns_addr.sin_addr),
-				 qs->serial);
+				 (unsigned long)qs->serial);
 		}
 	}
 
@@ -647,18 +656,28 @@ qserial_answer(struct qinfo *qp) {
  *	 1:	Tsig info successfully written.
  */
 static int
-write_tsig_info(struct in_addr addr, char *name, int *fd) {
+write_tsig_info(struct zoneinfo *zp, struct in_addr addr, char *name, int *fd) {
 	server_info si;
-	DST_KEY *dst_key;
+	DST_KEY *dst_key = NULL;
 	int tsig_fd = *fd;
 	char tsig_str[1024], secret_buf64[172];
 	u_char secret_buf[128];
 	int secret_len, len;
+	int i;
 
-	si = find_server(addr);
-	if (si == NULL || si->key_list == NULL || si->key_list->first == NULL)
-		return(0);
-	dst_key = si->key_list->first->key;
+	for (i = 0; i < zp->z_addrcnt ; i++)
+		if (memcmp(&addr, &zp->z_addr[i], sizeof(addr)) == 0) {
+			dst_key = zp->z_keys[i];
+			break;
+		}
+
+	if (dst_key == NULL) {
+		si = find_server(addr);
+		if (si == NULL || si->key_list == NULL ||
+		    si->key_list->first == NULL)
+			return(0);
+		dst_key = si->key_list->first->key;
+	}
 	if (tsig_fd == -1) {
 		*fd = tsig_fd = mkstemp(name);
 		if (tsig_fd < 0) {
@@ -679,7 +698,7 @@ write_tsig_info(struct in_addr addr, char *name, int *fd) {
 	if (len == -1)
 		return (-1);
 	/* We need snprintf! */
-	if (strlen(dst_key->dk_key_name) + len + sizeof("XXX.XXX.XXX.XXX"),
+	if (strlen(dst_key->dk_key_name) + len + sizeof("XXX.XXX.XXX.XXX") +
 	    sizeof("123") + 5 > sizeof(tsig_str))
 		return (-1);
 	sprintf(tsig_str, "%s\n%s\n%d\n%s\n",
@@ -707,7 +726,7 @@ write_tsigs(struct zoneinfo *zp, char *tsig_name) {
 		if (aIsUs(a) && ns_port == zp->z_port)
 			continue;
 
-		tsig_ret = write_tsig_info(a, tsig_name, &tsig_fd);
+		tsig_ret = write_tsig_info(zp, a, tsig_name, &tsig_fd);
 		switch (tsig_ret) {
 		case -1:
 			goto error;
@@ -757,7 +776,8 @@ supports_ixfr(struct zoneinfo *zp) {
  */
 static void
 startxfer(struct zoneinfo *zp) {
-	char *argv[NSMAX*2 + 20], argv_ns[NSMAX][MAXDNAME];
+	char *argv[NSMAX*2 + 20];
+	char argv_ns[NSMAX][MAXDNAME];
 	int argc = 0, argc_ns = 0, i;
 	pid_t pid;
 	u_int cnt;
@@ -773,50 +793,50 @@ startxfer(struct zoneinfo *zp) {
 		 zp->z_origin[0] != '\0' ? zp->z_origin : ".");
 
 	argv[argc++] = server_options->named_xfer;
-	argv[argc++] = "-z";
-	argv[argc++] = zp->z_origin;
-	argv[argc++] = "-f";
+	DE_CONST("-z", argv[argc++]);
+	DE_CONST(*zp->z_origin ? zp->z_origin : ".", argv[argc++]);
+	DE_CONST("-f", argv[argc++]);
 	argv[argc++] = zp->z_source;
 #ifdef BIND_IXFR
 	if (supports_ixfr(zp) && zp->z_ixfr_tmp != NULL) {
-		argv[argc++] = "-i";
+		DE_CONST("-i", argv[argc++]);
 		argv[argc++] = zp->z_ixfr_tmp;
 	}
 #endif
 	if (zp->z_serial != 0) {
-		argv[argc++] = "-s";
+		DE_CONST("-s", argv[argc++]);
 		sprintf(serial_str, "%u", zp->z_serial);
 		argv[argc++] = serial_str;
 	}
 	if (zp->z_axfr_src.s_addr != 0 ||
 	    server_options->axfr_src.s_addr != 0) {
-		argv[argc++] = "-x";
+		DE_CONST("-x", argv[argc++]);
 		argv[argc++] = strcpy(src_str, inet_ntoa(
 			(zp->z_axfr_src.s_addr != 0) ? zp->z_axfr_src :
 			server_options->axfr_src));
 	}
-	argv[argc++] = "-C";
+	DE_CONST("-C", argv[argc++]);
 	sprintf(class_str, "%d", zp->z_class);
 	argv[argc++] = class_str;
  	if (zp->z_flags & Z_SYSLOGGED)
-		argv[argc++] = "-q";
-	argv[argc++] = "-P";
+		DE_CONST("-q", argv[argc++]);
+	DE_CONST("-P", argv[argc++]);
 	sprintf(port_str, "%d", ntohs(zp->z_port) != 0 ? zp->z_port : ns_port);
 	argv[argc++] = port_str;
 #ifdef STUBS
 	if (zp->z_type == Z_STUB)
-		argv[argc++] = "-S";
+		DE_CONST("-S", argv[argc++]);
 #endif
 #ifdef DEBUG
 	if (debug) {
-		argv[argc++] = "-d";
+		DE_CONST("-d", argv[argc++]);
 		sprintf(debug_str, "%d", debug);
 		argv[argc++] = debug_str;
-		argv[argc++] = "-l";
-		argv[argc++] = _PATH_XFERDDT;
+		DE_CONST("-l", argv[argc++]);
+		DE_CONST(_PATH_XFERDDT, argv[argc++]);
 		if (debug > 5) {
-			argv[argc++] = "-t";
-			argv[argc++] = _PATH_XFERTRACE;
+			DE_CONST("-t", argv[argc++]);
+			DE_CONST(_PATH_XFERTRACE, argv[argc++]);
 		}
 	}
 #endif
@@ -840,7 +860,7 @@ startxfer(struct zoneinfo *zp) {
 		return;
 	}
 	if (tsig_ret != 0) {
-		argv[argc++] = "-T";
+		DE_CONST("-T", argv[argc++]);
 		argv[argc++] = tsig_name;
 	}
 
@@ -867,9 +887,9 @@ startxfer(struct zoneinfo *zp) {
 
 			if (si != NULL &&
 			    (si->flags & SERVER_INFO_SUPPORT_IXFR) != 0)
-				argv[argc++] = "ixfr";
+				DE_CONST("ixfr", argv[argc++]);
 			else
-				argv[argc++] = "axfr";
+				DE_CONST("axfr", argv[argc++]);
 		}
 #endif
 	}
@@ -985,8 +1005,9 @@ printzoneinfo(int zonenum, int category, int level) {
 	if (zp->z_type == z_master && (zp->z_flags & Z_DYNAMIC) != 0) {
 		ns_debug(category, level,
 			 "\tdumpintvl %lu, soaincrintvl %lu deferupdcnt %lu",
-			 zp->z_dumpintvl, zp->z_soaincrintvl,
-			 zp->z_deferupdcnt);
+			 (unsigned long)zp->z_dumpintvl,
+			 (unsigned long)zp->z_soaincrintvl,
+			 (unsigned long)zp->z_deferupdcnt);
 		if (zp->z_soaincrtime)
 			ns_debug(category, level,
 				 "\tz_soaincrtime %lu (now %lu, left: %lu)",
@@ -1178,6 +1199,22 @@ remove_zone(struct zoneinfo *zp, const char *verb) {
 		xfers_deferred--;
 	}
 	ns_stopxfrs(zp);
+	if ((zp->z_flags & Z_XFER_RUNNING) != 0) {
+		int i;
+		/* Kill and abandon the current transfer. */
+		for (i = 0; i < MAX_XFERS_RUNNING; i++) {
+			if (xferstatus[i].xfer_pid == zp->z_xferpid) {
+				xferstatus[i].xfer_pid = 0;
+				xferstatus[i].xfer_state = XFER_IDLE;
+				xfers_running--;
+				break;
+			}
+		}
+		(void)kill(zp->z_xferpid, SIGTERM);
+		zp->z_flags &= ~(Z_XFER_RUNNING|Z_XFER_ABORTED|Z_XFER_GONE);
+		zp->z_xferpid = 0;
+		ns_need(main_need_tryxfer);
+	}
 	do_reload(zp->z_origin, zp->z_type, zp->z_class, 1);
 	ns_notice(ns_log_config, "%s zone \"%s\" (%s) %s",
 		  zoneTypeString(zp->z_type), zp->z_origin,
@@ -1240,9 +1277,8 @@ valid_glue(struct databuf *dp, char *name, int belowcut) {
 	    ns_samedomain((char*)dp->d_data, zones[dp->d_zone].z_origin))
 		return (1);
 
-	/* NOKEY is in parent zone otherwise child zone */
-	if (dp->d_type == T_KEY && dp->d_size == 4 &&
-	    (dp->d_data[0] & 0xc3) == 0xc1)
+	/* KEY RRset may be in the parent */
+	if (dp->d_type == T_KEY)
 		return (1);
 
 	/* NXT & KEY records may be signed */
@@ -1593,10 +1629,11 @@ endxfer() {
 					zp->z_xferpid = XFER_ISAXFR;
 					if (exitstatus == XFER_SUCCESSAXFRIXFRFILE) {
 						zp->z_xferpid = XFER_ISAXFRIXFR;
+						if (zp->z_ixfr_tmp != NULL)
+							isc_movefile(
+								zp->z_ixfr_tmp,
+								zp->z_source);
 					} 
-					if (zp->z_ixfr_tmp != NULL)
-						isc_movefile(zp->z_ixfr_tmp,
-							     zp->z_source);
 					/* XXX should incorporate loadxfer() */
 					zp->z_flags |= Z_NEED_RELOAD;
 					zp->z_flags &= ~Z_SYSLOGGED;
@@ -1644,6 +1681,17 @@ endxfer() {
 					sched_zone_maint(zp);
 					break;
 
+				case XFER_REFUSED:
+					if (!(zp->z_flags & Z_SYSLOGGED)) {
+						zp->z_flags |= Z_SYSLOGGED;
+						ns_error(ns_log_xfer_in,
+		      "zoneref: Masters for slave zone \"%s\" REFUSED transfer",
+							  zp->z_origin);
+					}
+					ns_retrytime(zp, tt.tv_sec);
+					sched_zone_maint(zp);
+					break;
+
 				default:
 					if (!(zp->z_flags & Z_SYSLOGGED)) {
 						zp->z_flags |= Z_SYSLOGGED;
@@ -1671,7 +1719,7 @@ endxfer() {
 /*
  * Try to start some xfers - new "fair scheduler" by Bob Halley @DEC (1995)
  */
-static void
+void
 tryxfer() {
 	static struct zoneinfo *zp = NULL;
 	static struct zoneinfo *lastzones = NULL;

contrib/bind/bin/named/ns_ncache.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_ncache.c,v 8.27 2000/04/21 06:54:09 vixie Exp $";
+static const char rcsid[] = "$Id: ns_ncache.c,v 8.29 2001/06/18 14:43:16 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -66,7 +66,7 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 	u_int16_t atype;
 	u_char *sp, *cp1;
 	u_char data[MAXDATA];
-	size_t len = sizeof data;
+	u_char *eod = data + sizeof(data);
 #endif
 
 	nameserIncr(from.sin_addr, nssRcvdNXD);
@@ -121,7 +121,7 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 
 	while (ancount--) {
 		u_int32_t ttl;
-		u_int atype, aclass;
+		int atype, aclass;
 
 		n = dn_skipname(cp, eom);
 		if (n < 0) {
@@ -186,7 +186,7 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 		rdatap = cp;
 
 		/* origin */
-		n = dn_expand(msg, msg + msglen, cp, (char*)data, len);
+		n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data);
 		if (n < 0) {
 			ns_debug(ns_log_ncache, 3,
 				 "ncache: origin form error");
@@ -195,9 +195,8 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 		cp += n;
 		n = strlen((char*)data) + 1;
 		cp1 = data + n;
-		len -= n;
 		/* mail */
-		n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len);
+		n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1);
 		if (n < 0) {
 			ns_debug(ns_log_ncache, 3, "ncache: mail form error");
 			return;
@@ -205,20 +204,20 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 		cp += n;
 		n = strlen((char*)cp1) + 1;
 		cp1 += n;
-		len -= n;
 		n = 5 * INT32SZ;
+		if (n > (eod - cp1))	/* Can't happen. See MAXDATA. */
+			return;
 		BOUNDS_CHECK(cp, n);
 		memcpy(cp1, cp, n);
 		/* serial, refresh, retry, expire, min */
 		cp1 += n;
-		len -= n;
 		cp += n;
 		if (cp != rdatap + dlen) {
 			ns_debug(ns_log_ncache, 3, "ncache: form error");
 			return;
 		}
 		/* store the zone of the soa record */
-		n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len);
+		n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1);
 		if (n < 0) {
 			ns_debug(ns_log_ncache, 3, "ncache: form error 2");
 			return;
@@ -257,14 +256,14 @@ cache_n_resp(u_char *msg, int msglen, struct sockaddr_in from,
 		flags = DB_NOTAUTH|DB_NOHINTS;
 	}
 
-	if ((n = db_update(dname, dp, dp, NULL, flags, hashtab, from)) != OK) {
+	n = db_update(dname, dp, dp, NULL, flags, hashtab, from);
+	if (n != OK)
 		ns_debug(ns_log_ncache, 1,
 			 "db_update failed (%d), cache_n_resp()", n);
-		db_freedata(dp);
-		return;
-	}
-	ns_debug(ns_log_ncache, 4,
-		 "ncache succeeded: [%s %s %s] rcode:%d ttl:%ld",
-		    dname, p_type(type), p_class(class),
-		    dp->d_rcode, (long)(dp->d_ttl - tt.tv_sec));
+	else
+		ns_debug(ns_log_ncache, 4,
+			 "ncache succeeded: [%s %s %s] rcode:%d ttl:%ld",
+			 dname, p_type(type), p_class(class),
+			 dp->d_rcode, (long)(dp->d_ttl - tt.tv_sec));
+	db_detach(&dp);
 }

contrib/bind/bin/named/ns_notify.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_notify.c,v 8.14 2001/04/01 18:38:36 vixie Exp $";
+static const char rcsid[] = "$Id: ns_notify.c,v 8.20 2002/04/25 05:27:12 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -56,12 +56,12 @@ static const char rcsid[] = "$Id: ns_notify.c,v 8.14 2001/04/01 18:38:36 vixie E
 
 /* Types. */
 
-struct notify {
+struct pnotify {
 	char *			name;
 	ns_class		class;
 	ns_type			type;
 	evTimerID		timer;
-	LINK(struct notify)	link;
+	LINK(struct pnotify)	link;
 };
 
 /* Forward. */
@@ -71,14 +71,14 @@ static void		sysnotify_slaves(const char *, const char *,
 					 ns_class, ns_type, int, int *, int *);
 static void		sysnotify_ns(const char *, const char *,
 				     ns_class, ns_type, int, int *, int *);
-static void		free_notify(struct notify *);
+static void		free_notify(struct pnotify *);
 static void		notify_timer(evContext, void *,
 				     struct timespec, struct timespec);
 
 /* Local. */
 
-static LIST(struct notify) pending_notifies;
-static LIST(struct notify) loading_notifies;
+static LIST(struct pnotify) pending_notifies;
+static LIST(struct pnotify) loading_notifies;
 
 /* Public. */
 
@@ -91,7 +91,7 @@ ns_notify(const char *dname, ns_class class, ns_type type) {
 	static const char no_room[] = "%s failed, cannot notify for zone %s";
 	int delay, max_delay;
 	struct zoneinfo *zp;
-	struct notify *ni;
+	struct pnotify *ni;
 
 	zp = find_auth_zone(dname, class);
 	if (zp == NULL) {
@@ -146,7 +146,7 @@ ns_notify(const char *dname, ns_class class, ns_type type) {
 		       evConsTime(0, 0), &ni->timer) < 0) {
 		ns_error(ns_log_notify, "evSetTimer() failed: %s",
 			 strerror(errno));
-		freestr(ni->name);
+		ni->name = freestr(ni->name);
 		memput(ni, sizeof *ni);
 		return;
 	}
@@ -162,13 +162,13 @@ ns_notify(const char *dname, ns_class class, ns_type type) {
 
 void
 notify_afterload() {
-	struct notify *ni;
+	struct pnotify *ni;
 
 	INSIST(loading == 0);
 	while ((ni = HEAD(loading_notifies)) != NULL) {
 		UNLINK(loading_notifies, ni, link);
 		ns_notify(ni->name, ni->class, ni->type);
-		freestr(ni->name);
+		ni->name = freestr(ni->name);
 		memput(ni, sizeof *ni);
 	}
 }
@@ -180,7 +180,7 @@ notify_afterload() {
 void
 ns_unnotify(void) {
 	while (!EMPTY(pending_notifies)) {
-		struct notify *ni = HEAD(pending_notifies);
+		struct pnotify *ni = HEAD(pending_notifies);
 
 		INSIST(LINKED(ni, link));
 		UNLINK(pending_notifies, ni, link);
@@ -194,7 +194,7 @@ ns_unnotify(void) {
  */
 void
 ns_stopnotify(const char *dname, ns_class class) {
-	struct notify *ni;
+	struct pnotify *ni;
 
 	ni = HEAD(pending_notifies);
 	while (ni != NULL &&
@@ -235,9 +235,9 @@ sysnotify(const char *dname, ns_class class, ns_type type) {
 			   dname);
 		return;
 	}
-	if (zp->z_notify == znotify_no ||
-	    (zp->z_notify == znotify_use_default &&    
-	     NS_OPTION_P(OPTION_NONOTIFY)))
+	if (zp->z_notify == notify_no ||
+	    (zp->z_notify == notify_use_default &&    
+	     server_options->notify == notify_no))
 		return;
 	if (zp->z_type != z_master && zp->z_type != z_slave) {
 		ns_warning(ns_log_notify, "sysnotify: %s not master or slave",
@@ -247,7 +247,11 @@ sysnotify(const char *dname, ns_class class, ns_type type) {
 	zname = zp->z_origin;
 	zserial = zp->z_serial;
 	nns = na = 0;
-	sysnotify_slaves(dname, zname, class, type, zp - zones, &nns, &na);
+	if (zp->z_notify == notify_yes ||
+	    (zp->z_notify == notify_use_default &&
+	     server_options->notify == notify_yes))
+		sysnotify_slaves(dname, zname, class, type,
+				 zp - zones, &nns, &na);
 
 	/*
 	 * Handle any global or zone-specific also-notify clauses
@@ -262,8 +266,8 @@ sysnotify(const char *dname, ns_class class, ns_type type) {
 		for (i = 0; i < zp->z_notify_count; i++) {
 			ns_debug(ns_log_notify, 4, "notifying %s",
 				 inet_ntoa(*also_addr));
-			sysquery(dname, class, type, also_addr, 1, ns_port,
-				 NS_NOTIFY_OP);
+			sysquery(dname, class, type, also_addr, NULL, 1,
+				 ns_port, NS_NOTIFY_OP, 0);
 			also_addr++;
 		}
 		nns += zp->z_notify_count;
@@ -275,8 +279,8 @@ sysnotify(const char *dname, ns_class class, ns_type type) {
 		for (i = 0; i < server_options->notify_count; i++) {
 			ns_debug(ns_log_notify, 3, "notifying %s",
 				 inet_ntoa(*also_addr));
-			sysquery(dname, class, type, also_addr,
-				 1, ns_port, ns_o_notify);
+			sysquery(dname, class, type, also_addr, NULL, 1,
+				 ns_port, ns_o_notify, 0);
 			also_addr++;
 		}
 		nns += server_options->notify_count;
@@ -351,18 +355,26 @@ sysnotify_ns(const char *dname, const char *aname,
 	const char *fname;
 	struct in_addr nss[NSMAX];
 	struct hashbuf *htp;
-	int is_us, nsc;
+	int is_us, nsc, auth6, neg;
 	int cname = 0;
 
 	htp = hashtab;
 	anp = nlookup(aname, &htp, &fname, 0);
 	nsc = 0;
 	is_us = 0;
+	auth6 = 0;
+	neg = 0;
 	if (anp != NULL)
 		for (adp = anp->n_data; adp; adp = adp->d_next) {
 			struct in_addr ina;
 
-			if (match(adp, class, T_CNAME)) {
+			if (adp->d_class != class)
+				continue;
+			if (adp->d_rcode == NXDOMAIN) {
+				neg = 1;
+				break;
+			}
+			if (adp->d_type == T_CNAME && adp->d_rcode == 0) {
 				cname = 1;
 				ns_error(ns_log_notify,
 					 "NS '%s' for '%s/%s' is a CNAME",
@@ -371,8 +383,18 @@ sysnotify_ns(const char *dname, const char *aname,
 					 p_class(class));
 				break;
 			}
+			if ((adp->d_type == T_AAAA || adp->d_type == ns_t_a6) &&
+			    (zones[adp->d_class].z_type == z_master ||
+			     zones[adp->d_class].z_type == z_slave)) {
+				auth6 = 1;
+				continue;
+			}
 			if (!match(adp, class, T_A))
 				continue;
+			if (adp->d_rcode) {
+				neg = 1;
+				continue;
+			}
 			if (adp->d_type == ns_t_sig)
 				continue;
 			ina = ina_get(adp->d_data);
@@ -384,23 +406,24 @@ sysnotify_ns(const char *dname, const char *aname,
 				nss[nsc++] = ina;
 		} /*next A*/
 	if (nsc == 0) {
-		if (!is_us && !cname && !NS_OPTION_P(OPTION_NOFETCHGLUE)) {
+		if (!is_us && !cname && !auth6 && !neg &&
+		    !NS_OPTION_P(OPTION_NOFETCHGLUE)) {
 			struct qinfo *qp;
 
-			qp = sysquery(aname, class, ns_t_a, 0, 0, ns_port,
-				      ns_o_query);
+			qp = sysquery(aname, class, ns_t_a, NULL, NULL, 0,
+				      ns_port, ns_o_query, 0);
 			if (qp != NULL)
 				qp->q_notifyzone = zn;
 		}
 		return;
 	}
-	sysquery(dname, class, type, nss, nsc, ns_port, ns_o_notify);
+	sysquery(dname, class, type, nss, NULL, nsc, ns_port, ns_o_notify, 0);
 	(*nns)++;
 	*na += nsc;
 }
 
 static void
-free_notify(struct notify *ni) {
+free_notify(struct pnotify *ni) {
 	struct zoneinfo *zp;
 
 	INSIST(!LINKED(ni, link));
@@ -413,7 +436,7 @@ free_notify(struct notify *ni) {
 		evClearTimer(ev, ni->timer);
 		evInitID(&ni->timer);
 	}
-	freestr(ni->name);
+	ni->name = freestr(ni->name);
 	memput(ni, sizeof *ni);
 }
 
@@ -422,7 +445,11 @@ notify_timer(evContext ctx, void *uap,
 	     struct timespec due,
 	     struct timespec inter)
 {
-	struct notify *ni = uap;
+	struct pnotify *ni = uap;
+
+	UNUSED(ctx);
+	UNUSED(due);
+	UNUSED(inter);
 
 	INSIST(evTestID(ni->timer));
 	evInitID(&ni->timer);

contrib/bind/bin/named/ns_parser.y

@@ -1,6 +1,6 @@
 %{
 #if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id: ns_parser.y,v 8.63.2.4 2001/04/30 08:03:02 marka Exp $";
+static char rcsid[] = "$Id: ns_parser.y,v 8.80 2002/05/24 03:05:01 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -65,6 +65,7 @@ static symbol_table symtab;
 
 #define AUTH_TABLE_SIZE 397		/* should always be prime */
 static symbol_table authtab = NULL;
+static symbol_table channeltab = NULL;
 
 static zone_config current_zone;
 static int should_install;
@@ -94,7 +95,7 @@ static int chan_versions;
 static u_long chan_max_size;
 
 static log_channel lookup_channel(char *);
-static void define_channel(char *, log_channel);
+static void define_channel(const char *, log_channel);
 static char *canonical_name(char *);
 
 int yyparse();
@@ -132,7 +133,7 @@ int yyparse();
 %token			T_DIRECTORY T_PIDFILE T_NAMED_XFER
 %token			T_DUMP_FILE T_STATS_FILE T_MEMSTATS_FILE
 %token			T_FAKE_IQUERY T_RECURSION T_FETCH_GLUE 
-%token			T_HITCOUNT
+%token			T_HITCOUNT T_PREFERRED_GLUE
 %token			T_QUERY_SOURCE T_LISTEN_ON T_PORT T_ADDRESS
 %token			T_RRSET_ORDER T_ORDER T_NAME T_CLASS
 %token			T_CONTROLS T_INET T_UNIX T_PERM T_OWNER T_GROUP T_ALLOW
@@ -143,14 +144,16 @@ int yyparse();
 %type	<ip_addr>	maybe_wild_addr
 %token			T_DATASIZE T_STACKSIZE T_CORESIZE
 %token			T_DEFAULT T_UNLIMITED
-%token			T_FILES T_VERSION
+%token			T_FILES T_VERSION T_HOSTNAME
 %token			T_HOSTSTATS T_HOSTSTATSMAX T_DEALLOC_ON_EXIT
 %token			T_TRANSFERS_IN T_TRANSFERS_OUT T_TRANSFERS_PER_NS
 %token			T_TRANSFER_FORMAT T_MAX_TRANSFER_TIME_IN
 %token			T_SERIAL_QUERIES T_ONE_ANSWER T_MANY_ANSWERS
 %type	<axfr_fmt>	transfer_format
-%token			T_NOTIFY T_AUTH_NXDOMAIN T_MULTIPLE_CNAMES T_USE_IXFR T_MAINTAIN_IXFR_BASE
-%token			T_CLEAN_INTERVAL T_INTERFACE_INTERVAL T_STATS_INTERVAL T_MAX_LOG_SIZE_IXFR
+%token			T_NOTIFY T_EXPLICIT T_NOTIFY_INITIAL T_AUTH_NXDOMAIN
+%token			T_MULTIPLE_CNAMES T_USE_IXFR T_MAINTAIN_IXFR_BASE
+%token			T_CLEAN_INTERVAL T_INTERFACE_INTERVAL T_STATS_INTERVAL
+%token			T_MAX_LOG_SIZE_IXFR
 %token			T_HEARTBEAT T_USE_ID_POOL
 %token			T_MAX_NCACHE_TTL T_HAS_OLD_CLIENTS T_RFC2308_TYPE1
 %token			T_LAME_TTL T_MIN_ROOTS
@@ -188,6 +191,7 @@ int yyparse();
 %token			T_TRANSFERS 
 %token			T_KEYS
 %token			T_SUPPORT_IXFR
+%token			T_EDNS
 
 /* Items used for "zone" statements: */
 %token			T_ZONE
@@ -268,7 +272,7 @@ statement: include_stmt
 include_stmt: T_INCLUDE L_QSTRING L_EOS
 	{
 		lexer_begin_file($2, NULL);
-		freestr($2);
+		(void)freestr($2);
 	}
 	;
 
@@ -298,48 +302,59 @@ options: option L_EOS
 	;
 
 option: /* Empty */
+	| T_HOSTNAME L_QSTRING
+	{
+		if (current_options->hostname != NULL)
+			(void)freestr(current_options->hostname);
+		current_options->hostname = $2;
+	}
 	| T_VERSION L_QSTRING
 	{
 		if (current_options->version != NULL)
-			freestr(current_options->version);
+			(void)freestr(current_options->version);
 		current_options->version = $2;
 	}
 	| T_DIRECTORY L_QSTRING
 	{
 		if (current_options->directory != NULL)
-			freestr(current_options->directory);
+			(void)freestr(current_options->directory);
 		current_options->directory = $2;
 	}
 	| T_NAMED_XFER L_QSTRING
 	{
 		if (current_options->named_xfer != NULL)
-			freestr(current_options->named_xfer);
+			(void)freestr(current_options->named_xfer);
 		current_options->named_xfer = $2;
 	}
 	| T_PIDFILE L_QSTRING
 	{
 		if (current_options->pid_filename != NULL)
-			freestr(current_options->pid_filename);
+			(void)freestr(current_options->pid_filename);
 		current_options->pid_filename = $2;
 	}
 	| T_STATS_FILE L_QSTRING
 	{
 		if (current_options->stats_filename != NULL)
-			freestr(current_options->stats_filename);
+			(void)freestr(current_options->stats_filename);
 		current_options->stats_filename = $2;
 	}
 	| T_MEMSTATS_FILE L_QSTRING
 	{
 		if (current_options->memstats_filename != NULL)
-			freestr(current_options->memstats_filename);
+			(void)freestr(current_options->memstats_filename);
 		current_options->memstats_filename = $2;
 	}
 	| T_DUMP_FILE L_QSTRING
 	{
 		if (current_options->dump_filename != NULL)
-			freestr(current_options->dump_filename);
+			(void)freestr(current_options->dump_filename);
 		current_options->dump_filename = $2;
 	}
+	| T_PREFERRED_GLUE L_STRING
+	{
+		current_options->preferred_glue =
+			strcasecmp($2, "aaaa") ? T_A : T_AAAA;
+	}
 	| T_FAKE_IQUERY yea_or_nay
 	{
 		set_global_boolean_option(current_options,
@@ -360,10 +375,24 @@ option: /* Empty */
 		set_global_boolean_option(current_options, 
 			OPTION_HITCOUNT, $2);
 	}
+	| T_NOTIFY T_EXPLICIT
+	{
+		current_options->notify = notify_explicit;
+	}
 	| T_NOTIFY yea_or_nay
 	{
+		if ($2)
+			current_options->notify = notify_yes;
+		else
+			current_options->notify = notify_no;
+	}
+	| T_NOTIFY_INITIAL yea_or_nay
+	{
+		if (initial_configuration && $2)
+			ns_notice(ns_log_default,
+				  "suppressing initial notifies");
 		set_global_boolean_option(current_options, 
-			OPTION_NONOTIFY, !$2);
+			OPTION_SUPNOTIFY_INITIAL, $2);
 	}
 	| T_HOSTSTATS yea_or_nay
 	{
@@ -428,8 +457,7 @@ option: /* Empty */
 		else {
 			add_listen_on(current_options, $2, $4);
 			value.pointer = NULL;
-			define_symbol(symtab, savestr(port_string, 1),
-				      SYM_PORT, value, SYMBOL_FREE_KEY);
+			define_symbol(symtab, port_string, SYM_PORT, value, 0);
 		}
 
 	}
@@ -600,6 +628,20 @@ control: /* Empty */
 	{
 		ns_ctl_add(&current_controls, ns_ctl_new_inet($2, $4, $7));
 	}
+	| T_INET maybe_wild_addr
+	  T_ALLOW '{' address_match_list '}'
+	  T_KEYS '{' dummy_key_list '}'
+	{
+		parser_warning(0, "Ignoring BIND 9 inet control clause");
+		free_ip_match_list($5);
+	}
+	| T_INET maybe_wild_addr T_PORT in_port
+	  T_ALLOW '{' address_match_list '}'
+	  T_KEYS '{' dummy_key_list '}'
+	{
+		parser_warning(0, "Ignoring BIND 9 inet control clause");
+		free_ip_match_list($7);
+	}
 	| T_UNIX L_QSTRING T_PERM L_NUMBER T_OWNER L_NUMBER T_GROUP L_NUMBER
 	{
 #ifndef NO_SOCKADDR_UN
@@ -644,7 +686,7 @@ ordering_class: /* nothing */
 			parser_error(0, "unknown class '%s'; using ANY", $2);
 			$$ = C_ANY;
 		}
-		freestr($2);
+		(void)freestr($2);
 	}
 	;
 
@@ -667,7 +709,7 @@ ordering_type: /* nothing */
 					     $2);
 			}
 		}
-		freestr($2);
+		(void)freestr($2);
 	}
 
 ordering_name: /* nothing */
@@ -678,7 +720,7 @@ ordering_name: /* nothing */
 	{
 		if (strcmp(".",$2) == 0 || strcmp("*.",$2) == 0) {
 			$$ = savestr("*", 1);
-			freestr($2);
+			(void)freestr($2);
 		} else {
 			$$ = $2 ;
 		}
@@ -702,7 +744,7 @@ rrset_ordering_element: ordering_class ordering_type ordering_name T_ORDER L_STR
 					     $5, p_order(o));
 			}
 			
-			freestr($5);
+			(void)freestr($5);
 			
 			$$ = new_rrset_order_element($1, $2, $3, o);
 		}
@@ -859,7 +901,7 @@ size_spec: any_string
 			/* 0 means "use default" */
 			$$ = 0;
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	| L_NUMBER
 	{	
@@ -966,7 +1008,6 @@ logging_opt: T_CATEGORY category
 
 		if (lookup_channel($2) != NULL) {
 			parser_error(0, "can't redefine channel '%s'", $2);
-			freestr($2);
 		} else {
 			switch (chan_type) {
 			case log_file:
@@ -978,8 +1019,7 @@ logging_opt: T_CATEGORY category
 							     chan_max_size);
 				log_set_file_owner(current_channel,
 						   user_id, group_id);
-				freestr(chan_name);
-				chan_name = NULL;
+				chan_name = freestr(chan_name);
 				break;
 			case log_syslog:
 				current_channel =
@@ -1000,6 +1040,7 @@ logging_opt: T_CATEGORY category
 					 "couldn't create channel");
 			define_channel($2, current_channel);
 		}
+		(void)freestr($2);
 	}
 	;
 
@@ -1013,7 +1054,7 @@ channel_severity: any_string
 			parser_error(0, "unknown severity '%s'", $1);
 			chan_level = log_debug(99);
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	| T_DEBUG
 	{
@@ -1087,7 +1128,7 @@ maybe_syslog_facility: /* nothing */ { $$ = LOG_DAEMON; }
 			parser_error(0, "unknown facility '%s'", $1);
 			$$ = LOG_DAEMON;
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1149,7 +1190,7 @@ channel: channel_name
 			} else
 				parser_error(0, "unknown channel '%s'", $1);
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1174,7 +1215,7 @@ category: category_name
 				     $1);
 			$$ = -1;
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1197,9 +1238,8 @@ server_stmt: T_SERVER L_IPADDR
 			parser_error(0, "cannot redefine server '%s'", 
 				     ip_printable);
 		else
-			define_symbol(symtab, savestr(ip_printable, 1),
-				      SYM_SERVER, value,
-				      SYMBOL_FREE_KEY);
+			define_symbol(symtab, ip_printable, SYM_SERVER, value,
+				      0);
 		current_server = begin_server($2);
 	}
 	'{' server_info_list '}'
@@ -1229,6 +1269,10 @@ server_info: T_BOGUS yea_or_nay
 		set_server_transfer_format(current_server, $2);
 	}
 	| T_KEYS '{' key_list '}'
+	| T_EDNS yea_or_nay
+	{
+		set_server_option(current_server, SERVER_INFO_EDNS, $2);
+	}
 	| error
 	;
 
@@ -1279,6 +1323,7 @@ address_match_element: address_match_simple
 		else
 			$$ = new_ip_match_key(dst_key);
 	        (void)freestr(key_name);
+		freestr($2);
 	}
 	;
 
@@ -1329,7 +1374,7 @@ address_match_simple: L_IPADDR
 		 * we give it a name and treat it like any other acl.
 		 */
 		sprintf(name, "__internal_%p", $2);
-		define_acl(savestr(name, 1), $2);
+		define_acl(name, $2);
   		$$ = new_ip_match_indirect($2);
 	}
 	;
@@ -1344,7 +1389,7 @@ address_name: any_string
 			$$ = NULL;
 		} else
 			$$ = new_ip_match_indirect(iml);
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1369,9 +1414,9 @@ key_ref: any_string
 				$$ = NULL;
 			} else
 				$$ = dst_key;
-			freestr(key_name);
+			key_name = freestr(key_name);
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1389,6 +1434,13 @@ key_list: key_list_element L_EOS
 	| error
 	;
 
+dummy_key_list_element: key_ref;
+
+dummy_key_list: dummy_key_list_element L_EOS
+	| dummy_key_list dummy_key_list_element L_EOS
+	| error
+	;
+
 key_stmt: T_SEC_KEY
 	{
 		current_algorithm = NULL;
@@ -1425,15 +1477,12 @@ key_stmt: T_SEC_KEY
 			}
 		}
 		if (key_name != NULL)
-			freestr(key_name);
-		key_name = NULL;
+			key_name = freestr(key_name);
 		if (current_algorithm != NULL)
-			freestr(current_algorithm);
-		current_algorithm = NULL;
+			current_algorithm = freestr(current_algorithm);
 		if (current_secret != NULL)
-			freestr(current_secret);
-		current_secret = NULL;
-		freestr($3);
+			current_secret = freestr(current_secret);
+		(void)freestr($3);
 	}
 	;
 	
@@ -1468,9 +1517,9 @@ acl_stmt: T_ACL any_string '{' address_match_list '}'
 	{
 		if (lookup_acl($2) != NULL) {
 			parser_error(0, "can't redefine ACL '%s'", $2);
-			freestr($2);
 		} else
 			define_acl($2, $4);
+		(void)freestr($2);
 	}
 	;
 
@@ -1506,12 +1555,11 @@ zone_stmt: T_ZONE L_QSTRING optional_class
 					     p_class($3));
 			} else {
 				should_install = 1;
-				define_symbol(symtab, savestr(zone_name, 1),
-					      sym_type, value,
-					      SYMBOL_FREE_KEY);
+				define_symbol(symtab, zone_name, sym_type,
+					      value, 0);
 			}
 		}
-		freestr($2);
+		(void)freestr($2);
 		current_zone = begin_zone(zone_name, $3); 
 	}
 	optional_zone_options_list
@@ -1538,7 +1586,7 @@ optional_class: /* Empty */
 			/* the zone validator will give the error */
 			$$ = C_NONE;
 		}
-		freestr($1);
+		(void)freestr($1);
 	}
 	;
 
@@ -1644,9 +1692,16 @@ zone_option: T_TYPE zone_type
 	{
 		set_zone_max_log_size_ixfr(current_zone, $2);
         }
+	| T_NOTIFY T_EXPLICIT
+	{
+		set_zone_notify(current_zone, notify_explicit);
+	}
 	| T_NOTIFY yea_or_nay
 	{
-		set_zone_notify(current_zone, $2);
+		if ($2)
+			set_zone_notify(current_zone, notify_yes);
+		else
+			set_zone_notify(current_zone, notify_no);
 	}
 	| T_MAINTAIN_IXFR_BASE yea_or_nay
 	{
@@ -1688,7 +1743,11 @@ master_in_addr_list: master_in_addr L_EOS
 
 master_in_addr: L_IPADDR
 	{
-	  	add_zone_master(current_zone, $1);
+	  	add_zone_master(current_zone, $1, NULL);
+	}
+	| L_IPADDR T_SEC_KEY key_ref
+	{
+		add_zone_master(current_zone, $1, $3);
 	}
 	;
 
@@ -1788,7 +1847,7 @@ in_port: L_NUMBER
 		if ($1 < 0 || $1 > 65535) {
 		  	parser_warning(0, 
 			  "invalid IP port number '%d'; setting port to 0",
-			               $1);
+			               (int)$1);
 			$1 = 0;
 		} else
 			$$ = htons($1);
@@ -1827,26 +1886,26 @@ init_acls() {
 	ime = new_ip_match_pattern(address, 0);
 	iml = new_ip_match_list();
 	add_to_ip_match_list(iml, ime);
-	define_acl(savestr("any", 1), iml);
+	define_acl("any", iml);
 
 	/* ACL "none" */
 	ime = new_ip_match_pattern(address, 0);
 	ip_match_negate(ime);
 	iml = new_ip_match_list();
 	add_to_ip_match_list(iml, ime);
-	define_acl(savestr("none", 1), iml);
+	define_acl("none", iml);
 
 	/* ACL "localhost" */
 	ime = new_ip_match_localhost();
 	iml = new_ip_match_list();
 	add_to_ip_match_list(iml, ime);
-	define_acl(savestr("localhost", 1), iml);
+	define_acl("localhost", iml);
 
 	/* ACL "localnets" */
 	ime = new_ip_match_localnets();
 	iml = new_ip_match_list();
 	add_to_ip_match_list(iml, ime);
-	define_acl(savestr("localnets", 1), iml);
+	define_acl("localnets", iml);
 }
 
 static void
@@ -1861,6 +1920,9 @@ free_sym_value(int type, void *value) {
 	case SYM_KEY:
 		free_key_info(value);
 		break;
+	case SYM_CHANNEL:
+		INSIST(log_free_channel(value) == 0);
+		break;
 	default:
 		ns_panic(ns_log_parser, 1,
 			 "unhandled case in free_sym_value()");
@@ -1873,25 +1935,26 @@ static log_channel
 lookup_channel(char *name) {
 	symbol_value value;
 
-	if (lookup_symbol(symtab, name, SYM_CHANNEL, &value))
+	if (lookup_symbol(channeltab, name, SYM_CHANNEL, &value))
 		return ((log_channel)(value.pointer));
 	return (NULL);
 }
 
 static void
-define_channel(char *name, log_channel channel) {
+define_channel(const char *name, log_channel channel) {
 	symbol_value value;
 
 	value.pointer = channel;  
-	define_symbol(symtab, name, SYM_CHANNEL, value, SYMBOL_FREE_KEY);
+	INSIST(log_inc_references(channel) == 0);
+	define_symbol(channeltab, name, SYM_CHANNEL, value, SYMBOL_FREE_VALUE);
 }
 
 static void
 define_builtin_channels() {
-	define_channel(savestr("default_syslog", 1), syslog_channel);
-	define_channel(savestr("default_debug", 1), debug_channel);
-	define_channel(savestr("default_stderr", 1), stderr_channel);
-	define_channel(savestr("null", 1), null_channel);
+	define_channel("default_syslog", syslog_channel);
+	define_channel("default_debug", debug_channel);
+	define_channel("default_stderr", stderr_channel);
+	define_channel("null", null_channel);
 }
 
 static void
@@ -1903,6 +1966,9 @@ parser_setup() {
 	if (authtab != NULL)
 		free_symbol_table(authtab);
 	authtab = new_symbol_table(AUTH_TABLE_SIZE, free_sym_value);
+	if (channeltab != NULL)
+		free_symbol_table(channeltab);
+	channeltab = new_symbol_table(AUTH_TABLE_SIZE, free_sym_value);
 	init_acls();
 	define_builtin_channels();
 	INIT_LIST(current_controls);
@@ -1924,7 +1990,7 @@ parser_cleanup() {
  */
 
 ip_match_list
-lookup_acl(char *name) {
+lookup_acl(const char *name) {
 	symbol_value value;
 
 	if (lookup_symbol(authtab, name, SYM_ACL, &value))
@@ -1933,15 +1999,14 @@ lookup_acl(char *name) {
 }
 
 void
-define_acl(char *name, ip_match_list iml) {
+define_acl(const char *name, ip_match_list iml) {
 	symbol_value value;
 
 	INSIST(name != NULL);
 	INSIST(iml != NULL);
 
 	value.pointer = iml;
-	define_symbol(authtab, name, SYM_ACL, value,
-		      SYMBOL_FREE_KEY|SYMBOL_FREE_VALUE);
+	define_symbol(authtab, name, SYM_ACL, value, SYMBOL_FREE_VALUE);
 	ns_debug(ns_log_parser, 7, "acl %s", name);
 	dprint_ip_match_list(ns_log_parser, iml, 2, "allow ", "deny ");
 }
@@ -1956,7 +2021,7 @@ lookup_key(char *name) {
 }
 
 void
-define_key(char *name, struct dst_key *dst_key) {
+define_key(const char *name, struct dst_key *dst_key) {
 	symbol_value value;
 
 	INSIST(name != NULL);
@@ -1996,5 +2061,7 @@ void
 parser_shutdown(void) {
 	if (authtab != NULL)
 		free_symbol_table(authtab);
+	if (channeltab != NULL)
+		free_symbol_table(channeltab);
 	lexer_shutdown();
 }

contrib/bind/bin/named/ns_parseutil.c

@@ -66,8 +66,7 @@ new_symbol_table(int size_guess, free_function free_value) {
 
 void
 free_symbol(symbol_table st, symbol_entry ste) {
-	if (ste->flags & SYMBOL_FREE_KEY)
-		freestr(ste->key);
+	ste->key = freestr(ste->key);
 	if (ste->flags & SYMBOL_FREE_VALUE)
 		(st->free_value)(ste->type, ste->value.pointer);
 }
@@ -147,7 +146,7 @@ lookup_symbol(symbol_table st, const char *key, int type,
 }
 
 void
-define_symbol(symbol_table st, char *key, int type, symbol_value value,
+define_symbol(symbol_table st, const char *key, int type, symbol_value value,
 	      unsigned int flags) {
 	int hash;
 	symbol_entry ste;
@@ -161,7 +160,7 @@ define_symbol(symbol_table st, char *key, int type, symbol_value value,
 		ste = (symbol_entry)memget(sizeof *ste);
 		if (ste == NULL)
 			panic("memget failed in define_symbol()", NULL);
-		ste->key = key;
+		ste->key = savestr(key, 1);
 		ste->type = type;
 		ste->value = value;
 		ste->flags = flags;
@@ -171,7 +170,7 @@ define_symbol(symbol_table st, char *key, int type, symbol_value value,
 		ns_debug(ns_log_parser, 7, "redefined symbol %s type %d",
 			 key, type);
 		free_symbol(st, ste);
-		ste->key = key;
+		ste->key = savestr(key, 1);
 		ste->value = value;
 		ste->flags = flags;
 	}

contrib/bind/bin/named/ns_parseutil.h

@@ -22,7 +22,6 @@
  * Symbol Table
  */
 
-#define SYMBOL_FREE_KEY		0x01
 #define SYMBOL_FREE_VALUE	0x02
 
 typedef union symbol_value {
@@ -52,8 +51,8 @@ void			free_symbol_table(symbol_table);
 void			dprint_symbol_table(int, symbol_table);
 int			lookup_symbol(symbol_table, const char *, int,
 				      symbol_value *);
-void			define_symbol(symbol_table, char *, int, symbol_value,
-				      unsigned int);
+void			define_symbol(symbol_table, const char *, int,
+				      symbol_value, unsigned int);
 void			undefine_symbol(symbol_table, char *, int type);
 
 /*

contrib/bind/bin/named/ns_req.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
-static const char rcsid[] = "$Id: ns_req.c,v 8.138.2.4 2001/08/10 03:00:14 marka Exp $";
+static const char rcsid[] = "$Id: ns_req.c,v 8.169 2002/05/12 23:41:52 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -153,17 +153,129 @@ static enum req_action	req_query(HEADER *hp, u_char **cpp, u_char *eom,
 				  int *buflenp, int *msglenp,
 				  u_char *msg, int dfd, int *ra,
 				  struct sockaddr_in from,
-				  struct tsig_record *in_tsig);
+				  struct tsig_record *in_tsig,
+				  u_int16_t udpsize);
 
 static enum req_action	req_iquery(HEADER *hp, u_char **cpp, u_char *eom,
-				   int *buflenp, u_char *msg,
-				   struct sockaddr_in from);
+				   int *buflenp, struct sockaddr_in from);
 
 #ifdef BIND_NOTIFY
 static enum req_action	req_notify(HEADER *hp, u_char **cpp, u_char *eom,
 				   u_char *msg,struct sockaddr_in from);
 #endif
 
+/*
+ * See if there is a OPT record at the end of the message.
+ *
+ * Results:
+ * -1	FORMERR
+ *  0	last RR is not a OPT record
+ * n>0	lenght of OPT record
+ */
+int
+ns_get_opt(u_char *msg, u_char *eom,
+	   u_int8_t *versionp, u_int16_t *rcodep, u_int16_t *flagp,
+	   u_int16_t *bufsizep, u_char **optionsp, size_t *optsizep)
+{
+	HEADER *hp = (HEADER *) msg;
+	u_char *start, *options, *cp;
+	u_int8_t version;
+	u_int16_t rdlen, type, bufsize, flags, optsize, rcode;
+	int i, n, root;
+
+	if (msg == NULL || eom == NULL || (msg + HFIXEDSZ) > eom)
+		return (-1);
+
+	if (ntohs(hp->arcount) == 0)
+		return (0);
+
+	cp = msg + HFIXEDSZ;
+	n = ns_skiprr(cp, eom, ns_s_qd, ntohs(hp->qdcount));
+	if (n < 0)
+		return (-1);
+	cp += n;
+	n = ns_skiprr(cp, eom, ns_s_an, ntohs(hp->ancount));
+	if (n < 0)
+		return (-1);
+	cp += n;
+	n = ns_skiprr(cp, eom, ns_s_ns, ntohs(hp->nscount));
+	if (n < 0)
+		return (-1);
+	cp += n;
+	i = ntohs(hp->arcount);
+	while (i-- > 0) {
+		start = cp;
+		if (cp >= eom)
+			return (-1);
+		root = (*cp == 0);
+		n = dn_skipname(cp, eom);
+		if (n < 0)
+			return (-1);
+		cp += n;
+		if (cp + (2 + 2 + 4 + 2) > eom)
+			return (-1);
+		GETSHORT(type, cp);
+		if (type != ns_t_opt) {
+			cp += INT16SZ + INT32SZ;	/* class, ttl */
+			GETSHORT(rdlen, cp);
+			if (cp + rdlen > eom)
+				return (-1);
+			cp += rdlen;
+			continue;
+		}
+		/* We have the OPT record.  Check it out in detail. */
+		if (!root)
+			return (-1);
+		GETSHORT(bufsize, cp);
+		rcode = (*cp++ <<4) + hp->rcode ;
+		version = *cp++;
+		GETSHORT(flags, cp);
+		GETSHORT(rdlen, cp);
+		if (cp + rdlen > eom)
+			return (-1);
+		options = cp;
+		optsize = rdlen;
+		if (versionp != NULL)
+			*versionp = version;
+		if (rcodep != NULL)
+			*rcodep = rcode;
+		if (flagp != NULL)
+			*flagp = flags;
+		if (bufsizep != NULL)
+			*bufsizep = bufsize;
+		if (optionsp != NULL)
+			*optionsp = options;
+		if (optsizep != NULL)
+			*optsizep = optsize;
+		return (cp - start);
+	}
+	/* OPT not found */
+	return (0);
+}
+
+int
+ns_add_opt(u_char *msg, u_char *cp, size_t buflen, u_int8_t version,
+	   u_int16_t rcode, u_int16_t size, u_int16_t flags,
+	   u_char *options, size_t optlen)
+{
+	HEADER *hp = (HEADER *) msg;
+
+	if ((cp + 1 + 2 + 2 + 4 + 2 + optlen) > (msg + buflen))
+		return (-1);
+
+	*cp++ = 0;			/* "." */
+	PUTSHORT(ns_t_opt, cp);		/* type */
+	PUTSHORT(size, cp);		/* class (udp size) */
+	*cp++ = (rcode >> 4) & 0xff;	/* ttl (rcode + version + flags) */
+	hp->rcode = rcode & 0xf;
+	*cp++ = version;
+	PUTSHORT(flags, cp);
+	PUTSHORT(optlen, cp);		/* rdlen */
+	memcpy(cp, options, optlen);	/* options */
+	hp->arcount = htons(ntohs(hp->arcount) + 1);
+	return (1 + 2 + 2 + 4 + 2 + optlen);
+}
+
 /*
  * Process request using database; assemble and send response.
  */
@@ -173,8 +285,8 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 {
 	HEADER *hp = (HEADER *) msg;
 	u_char *cp, *eom;
-	enum req_action action;
-	int n, ra, has_tsig, tsig_size, sig2len;
+	enum req_action action = Return;
+	int n, ra, has_tsig, tsig_size = 0, opt_size = 0, sig2len;
 	u_char *tsigstart;
 	u_char sig[TSIG_SIG_SIZE], sig2[TSIG_SIG_SIZE];
 	struct tsig_record *in_tsig = NULL;
@@ -182,8 +294,14 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	int msglen_orig = msglen;
 	int buflen_orig = buflen;
 	int siglen = sizeof sig;
-	DST_KEY *key;
+	DST_KEY *key = NULL;
 	time_t tsig_time;
+	int opt = 0;
+	u_int8_t version = 0;
+	u_int16_t rcode = ns_r_noerror;
+	u_int16_t udpsize = 0;
+	int drop;
+	int tsig_adjust = 0;
 
 #ifdef DEBUG
 	if (debug > 3) {
@@ -192,14 +310,27 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	}
 #endif
 	
+	drop = drop_port(ntohs(from.sin_port));
+	if (qsp == NULL && drop == 1)
+		return;
+
 	tsigstart = ns_find_tsig(msg, msg + msglen);
 	if (tsigstart == NULL)
 		has_tsig = 0;
 	else {
 		char buf[MAXDNAME];
+		u_char tmp[NS_MAXCDNAME];
 
 		has_tsig = 1;
-		n = dn_expand(msg, msg + msglen, tsigstart, buf, sizeof buf);
+		n = ns_name_unpack(msg, msg + msglen, tsigstart,
+				   tmp, sizeof tmp);
+		if (n > 0) {
+			tsig_adjust = dn_skipname(tmp, tmp + sizeof(tmp)) - n;
+			if (ns_name_ntop(tmp, buf, sizeof buf) == -1)
+				n = -1;
+			else if (buf[0] == '.')
+				buf[0] = '\0';
+		}
 		if (n < 0) {
 			ns_debug(ns_log_default, 1,
 				 "ns_req: bad TSIG key name");
@@ -260,6 +391,8 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 		in_tsig->siglen = siglen;
 		memcpy(in_tsig->sig, sig, siglen);
 		tsig_size = msglen_orig - msglen;
+		/* AXFR/IXFR need the uncompressed tsig size. */
+		in_tsig->tsig_size = tsig_size + tsig_adjust;
 	} else if (has_tsig) {
 		action = Finish;
 		in_tsig = memget(sizeof(struct tsig_record));
@@ -268,6 +401,7 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 		in_tsig->key = NULL;
 		in_tsig->siglen = 0;
 		tsig_size = msg + msglen - tsigstart;
+		in_tsig->tsig_size = tsig_size;
 		msglen = tsigstart - msg;
 	}
 
@@ -275,6 +409,30 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	nsid_hash((u_char *)&tt, sizeof(tt));
 	nsid_hash(msg, (msglen > 512) ? 512 : msglen);
 
+	if (error == NOERROR) {
+
+		opt = ns_get_opt(msg, msg + msglen, &version,
+				 NULL, NULL, &udpsize, NULL, NULL);
+		if (opt < 0) {
+			rcode = ns_r_formerr;
+			action = Finish;
+		} else if (opt == 0) {
+			if (qsp == NULL && buflen > PACKETSZ)
+				buflen_orig = buflen = PACKETSZ;
+		} else if (opt > 0) {
+			if (version != 0) {
+				rcode = ns_r_badvers;
+				action = Finish;
+			}
+			opt_size = 11;
+			if (udpsize < 512)
+				udpsize = 512;
+			if (qsp == NULL && buflen > udpsize)
+				buflen_orig = buflen = udpsize;
+		}
+	} else if (qsp == NULL && buflen > PACKETSZ)
+		buflen_orig = buflen = PACKETSZ;
+
 	/*
 	 * It's not a response so these bits have no business
 	 * being set. will later simplify work if we can
@@ -290,6 +448,8 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 
 	if (error == NOERROR)
 		hp->rcode = ns_r_noerror;
+	if (rcode == ns_r_noerror)
+		rcode = hp->rcode;
 	cp = msg + HFIXEDSZ;
 	eom = msg + msglen;
 	buflen -= HFIXEDSZ;
@@ -297,16 +457,17 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	free_addinfo();	/* sets addcount to zero */
 	dnptrs[0] = NULL;
 
-	if (error == NOERROR) {
+	if (error == NOERROR && rcode == ns_r_noerror) {
 		switch (hp->opcode) {
 		case ns_o_query:
 			action = req_query(hp, &cp, eom, qsp,
 					   &buflen, &msglen,
-					   msg, dfd, &ra, from, in_tsig);
+					   msg, dfd, &ra, from,
+					   in_tsig, udpsize);
 			break;
 
 		case ns_o_iquery:
-			action = req_iquery(hp, &cp, eom, &buflen, msg, from);
+			action = req_iquery(hp, &cp, eom, &buflen, from);
 			break;
 
 #ifdef BIND_NOTIFY
@@ -317,8 +478,7 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 
 #ifdef BIND_UPDATE
 		case ns_o_update:
-			action = req_update(hp, cp, eom, msg, qsp, dfd, from,
-					    in_tsig);
+			action = req_update(hp, cp, eom, msg, from, in_tsig);
 			break;
 #endif /* BIND_UPDATE */
 
@@ -334,6 +494,7 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 			hp->rcode = ns_r_notimpl;
 			action = Finish;
 		}
+		rcode = hp->rcode;
 	}
 
 	if (in_tsig != NULL) {
@@ -341,6 +502,13 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 		in_tsig = NULL;
 	}
 
+	/*
+	 * Loop advoidance.
+	 */
+	if (qsp == NULL && drop == 2 && 
+	    (hp->rcode == FORMERR || hp->rcode == NOTIMP))
+			action = Return;
+
 	/*
 	 * Vector via internal opcode.
 	 */
@@ -348,7 +516,7 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	case Return:
 		return;
 	case Refuse:
-		hp->rcode = ns_r_refused;
+		rcode = hp->rcode = ns_r_refused;
 		cp = eom;
 		/*FALLTHROUGH*/
 	case Finish:
@@ -365,13 +533,14 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	hp->qr = 1;		/* set Response flag */
 	hp->ra = ra;		/* init above, may be modified by req_query */
 
-	if (!hp->tc && has_tsig > 0 && buflen < tsig_size)
+	if (!hp->tc && (has_tsig > 0 || opt > 0) &&
+	    buflen < (tsig_size + opt_size))
 		hp->tc = 1;
 
 	/*
 	 * If there was a format error, then we don't know what the msg has.
 	 */
-	if (hp->rcode == ns_r_formerr) {
+	if (hp->rcode == ns_r_formerr || rcode == ns_r_badvers) {
 		hp->qdcount = htons(0);
 		hp->ancount = htons(0);
 		hp->nscount = htons(0);
@@ -380,46 +549,74 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 	}
 
 	/*
-	 * If the query had a TSIG and the message is truncated or there was
-	 * a TSIG error, build a new message with no data and a TSIG.
+	 * If the query had a TSIG / OPT and the message is truncated or
+	 * there was a TSIG error, build a new message with no data and a
+	 * TSIG / OPT.
 	 */
-	if ((hp->tc || error != NOERROR) && has_tsig > 0) {
+	if ((hp->tc || error != NOERROR) && (has_tsig > 0 || opt > 0)) {
  sign_again:
 		hp->ancount = htons(0);
 		hp->nscount = htons(0);
 		hp->arcount = htons(0);
 		cp = msg + HFIXEDSZ;
 		cp += ns_skiprr(cp, msg + msglen, ns_s_qd, ntohs(hp->qdcount));
-		sig2len = sizeof sig2;
-		msglen = cp - msg;
-		buflen = buflen_orig - msglen;
-		n = ns_sign(msg, &msglen, msglen + buflen, error, key,
-			    sig, siglen, sig2, &sig2len, tsig_time);
-		if (n == NS_TSIG_ERROR_NO_SPACE && ntohs(hp->qdcount) != 0) {
-			hp->qdcount = htons(0);
-			goto sign_again;
+		ns_name_rollback(cp, (const u_char **)dnptrs,
+				 (const u_char **)dnptrs_end);
+		if (opt > 0) {
+			n = ns_add_opt(msg, cp, buflen_orig, 0,
+				       rcode, EDNS_MESSAGE_SZ, 0, NULL, 0);
+			if (n < 0) {
+				hp->qdcount = htons(0);
+				goto sign_again;
+			}
+			cp += n;
+		}
+		if (has_tsig > 0) {
+			sig2len = sizeof sig2;
+			msglen = cp - msg;
+			buflen = buflen_orig - msglen;
+			n = ns_sign2(msg, &msglen, msglen + buflen, error, key,
+				     sig, siglen, sig2, &sig2len, tsig_time,
+				     dnptrs, dnptrs_end);
+			if (n == NS_TSIG_ERROR_NO_SPACE &&
+				ntohs(hp->qdcount) != 0) {
+				hp->qdcount = htons(0);
+				goto sign_again;
+			}
+			if (n != 0)
+				ns_info(ns_log_default,
+					"ns_req: unable to sign response");
+			cp = msg + msglen;
 		}
-		if (n != 0)
-			ns_info(ns_log_default,
-				"ns_req: unable to sign response");
-		cp = msg + msglen;
 	}
-	/* Either the message is not truncated or there was no TSIG */
+	/* Either the message is not truncated or there was no TSIG & OPT */
 	else {
 		/*
 		 * Reserve space for tsig if required.
 		 */
-		if (has_tsig > 0)
-			buflen -= tsig_size;
+		if (has_tsig > 0 || opt_size != 0)
+			buflen -= tsig_size + opt_size;
+		INSIST(buflen >= 0);
+		msglen = cp - msg;
 		n = doaddinfo(hp, cp, buflen);
 		cp += n;
 		buflen -= n;
+		msglen += n;
+		if (opt > 0) {
+			buflen += opt_size;
+			n = ns_add_opt(msg, cp, msglen + buflen, 0,
+				       rcode, EDNS_MESSAGE_SZ, 0, NULL, 0);
+			INSIST(n > 0);
+			cp += n;
+			buflen -= n;
+			msglen += n;
+		}
 		if (has_tsig > 0) {
 			buflen += tsig_size;
 			sig2len = sizeof sig2;
-			msglen = cp - msg;
-			n = ns_sign(msg, &msglen, msglen + buflen, error, key,
-				    sig, siglen, sig2, &sig2len, tsig_time);
+			n = ns_sign2(msg, &msglen, msglen + buflen, error, key,
+				     sig, siglen, sig2, &sig2len, tsig_time,
+				     dnptrs, dnptrs_end);
 			if (n != 0) {
 				INSIST(0);
 			}
@@ -608,16 +805,42 @@ req_notify(HEADER *hp, u_char **cpp, u_char *eom, u_char *msg,
 }
 #endif /*BIND_NOTIFY*/
 
+static int
+add_bind(HEADER *hp, u_char **cpp, u_char *msg, int *msglenp,
+	 const char *label, const char *data)
+{
+	u_char *tp;
+
+	hp->ancount = htons(1);
+	hp->nscount = htons(0);
+	hp->arcount = htons(0);
+	hp->rcode = ns_r_noerror;
+	hp->aa = 1;
+	hp->ra = 0;
+	copyCharString(cpp, label);	/* Name */
+	copyCharString(cpp, "BIND");
+	*(*cpp)++ = 0x00;
+	PUTSHORT(T_TXT, *cpp);		/* Type */
+	PUTSHORT(C_CHAOS, *cpp);	/* Class */
+	PUTLONG(0, *cpp);		/* TTL */
+	tp = *cpp;			/* Temp RdLength */
+	PUTSHORT(0, *cpp);
+	copyCharString(cpp, data);
+	PUTSHORT((*cpp) - (tp + INT16SZ), tp);	/* Real RdLength */
+	*msglenp = *cpp - msg;		/* Total message length */
+	return (Finish);
+}
 
 static enum req_action
 req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	  int *buflenp, int *msglenp, u_char *msg, int dfd, int *ra,
-	  struct sockaddr_in from, struct tsig_record *in_tsig)
+	  struct sockaddr_in from, struct tsig_record *in_tsig,
+	  u_int16_t udpsize)
 {
 	int n, class, type, count, zone, foundname, founddata, omsglen, cname;
 	int recursion_blocked_by_acl;
 	u_int16_t id;
-	u_int32_t serial_ixfr;
+	u_int32_t serial_ixfr = 0;
 	int ixfr_found;
 	int ixfr_error = 0;
 	char dnbuf2[MAXDNAME];
@@ -631,6 +854,8 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	struct zoneinfo *zp;
 	struct databuf *dp;
 	DST_KEY *in_key = (in_tsig != NULL) ? in_tsig->key : NULL;
+	int access_class;
+	int adjustlen = 0;
 
 	nameserIncr(from.sin_addr, nssRcvdQ);
 
@@ -648,14 +873,19 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 
 	/* valid queries have one question and zero answers */
 	if ((ntohs(hp->qdcount) != 1)
-	    || ntohs(hp->ancount) != 0
-	    || ntohs(hp->arcount) != 0) {
+	    || ntohs(hp->ancount) != 0) {
 		ns_debug(ns_log_default, 1,
 			 "FORMERR Query header counts wrong");
 		hp->rcode = ns_r_formerr;
 		return (Finish);
 	}
 
+	if (ntohs(hp->arcount) != 0) {
+		ns_debug(ns_log_default, 1, "Ignoring addition section");
+		hp->arcount = htons(0);
+		adjustlen = 1;
+	}
+
 	/*
 	 * Get domain name, class, and type.
 	 */
@@ -680,8 +910,9 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	GETSHORT(type, *cpp);
 	GETSHORT(class, *cpp);
 	if (*cpp < eom && type != ns_t_ixfr) {
-		ns_debug(ns_log_default, 6,
-			 "message length > received message");
+		if (!adjustlen)
+			ns_debug(ns_log_default, 6,
+				 "message length > received message");
 		*msglenp = *cpp - msg;
 	}
 
@@ -748,7 +979,7 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 		}
 		GETLONG(serial_ixfr, *cpp);
 		/* ignore other soa counters */
-		if ((*cpp + (4 * INT32SZ)) < eom)
+		if ((*cpp + (4 * INT32SZ)) < eom && !adjustlen)
 			ns_debug(ns_log_default, 6,
 				 "ixfr: message length > received message");
 		/* Reset msglenp to cover just the question. */
@@ -838,9 +1069,15 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	/*
 	 * Begin Access Control Point
 	 */
-
 	zone = DB_Z_CACHE;
+
+	/*
+	 * Map class ANY to to class IN for the purpose of access control.
+	 */
+	access_class = (class == C_ANY && !ns_t_xfr_p(type)) ? C_IN : class;
+
 	if (np) {
+#ifndef FORWARD_ALLOWS
 		struct namebuf *access_np;
 
 		/*
@@ -855,13 +1092,35 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 		for (access_np = np; access_np != NULL;
 		     access_np = np_parent(access_np)) {
 			dp = access_np->n_data;
-			while (dp && dp->d_class != class)
+			while (dp && dp->d_class != access_class)
 				dp = dp->d_next;
 			if (dp != NULL) {
 				zone = dp->d_zone;
 				break;
 			}
 		}
+#else
+		/*
+		 * Try looking for forward zone.  It can be deeper than
+		 * any entry in the cache.
+		 */
+		if (zone == DB_Z_CACHE) {
+			char *s = dname;
+			int escape = 0;
+			while ((zp = find_zone(s, access_class)) == NULL) {
+				if (*s == '\0')
+					break;
+				while (*s != '\0' && (escape || *s != '.')) {
+					escape = escape ? 0 : (*s == '\\');
+					s++;
+				}   
+				if (*s == '.')
+					s++;
+			}
+			if (zp != NULL)
+				zone = zp - zones;
+		}
+#endif
 	}
 
 	zp = &zones[zone];
@@ -941,8 +1200,9 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 				for (access_np = np; access_np != NULL;
 				     access_np = np_parent(access_np)) {
 					dp = access_np->n_data;
-					while (dp && (dp->d_class != class ||
-					       dp->d_zone == DB_Z_CACHE))
+					while (dp &&
+					       (dp->d_class != access_class ||
+					        dp->d_zone == DB_Z_CACHE))
 						dp = dp->d_next;
 					if (dp != NULL) {
 						zone = dp->d_zone;
@@ -960,12 +1220,17 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 					goto fetchns;
 				}
 			}
+#ifdef NXDOMAIN_ON_DENIAL
+			hp->rcode = ns_r_nxdomain;
+			return (Finish);
+#else
 			ns_notice(ns_log_security,
-				  "denied query from %s for \"%s\" %s",
+				  "denied query from %s for \"%s\" %s/%s",
 				  sin_ntoa(from), *dname ? dname : ".",
-				  p_class(class));
+				  p_type(type), p_class(class));
 			nameserIncr(from.sin_addr, nssRcvdUQ);
 			return (Refuse);
+#endif
 		}
 	} else {
 		ip_match_list transfer_acl;
@@ -1054,28 +1319,18 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	 * Yow!
 	 */
 	if (class == ns_c_chaos && type == ns_t_txt &&
-	    ns_samename(dnbuf, "VERSION.BIND") == 1) {
-		u_char *tp;
+	    ns_samename(dnbuf, "VERSION.BIND") == 1 &&
+	    server_options->version != NULL &&
+	    server_options->version[0] != '\0')
+		return (add_bind(hp, cpp, msg, msglenp,
+			"VERSION", server_options->version));
 
-		hp->ancount = htons(1);
-		hp->nscount = htons(0);
-		hp->arcount = htons(0);
-		hp->rcode = ns_r_noerror;
-		hp->aa = 1;
-		hp->ra = 0;
-		copyCharString(cpp, "VERSION");	/* Name */
-		copyCharString(cpp, "BIND");
-		*(*cpp)++ = 0x00;
-		PUTSHORT(T_TXT, *cpp);		/* Type */
-		PUTSHORT(C_CHAOS, *cpp);	/* Class */
-		PUTLONG(0, *cpp);		/* TTL */
-		tp = *cpp;			/* Temp RdLength */
-		PUTSHORT(0, *cpp);
-		copyCharString(cpp, server_options->version);
-		PUTSHORT((*cpp) - (tp + INT16SZ), tp);	/* Real RdLength */
-		*msglenp = *cpp - msg;		/* Total message length */
-		return (Finish);
-	}
+	if (class == ns_c_chaos && type == ns_t_txt &&
+	    ns_samename(dnbuf, "HOSTNAME.BIND") == 1 &&
+	    server_options->hostname != NULL &&
+	    server_options->hostname[0] != '\0')
+		return (add_bind(hp, cpp, msg, msglenp,
+			"HOSTNAME", server_options->hostname));
 
 	/*
 	 * If we don't know anything about the requested name,
@@ -1365,8 +1620,9 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 		if (n < 0) {
 			ns_info(ns_log_default, "res_mkquery(%s) failed",
 				dname);
-			hp->rcode = ns_r_servfail;
+			memcpy(msg, omsg, omsglen);
 			memput(omsg, omsglen);
+			hp->rcode = ns_r_servfail;
 			free_nsp(nsp);
 			return (Finish);
 		}
@@ -1375,7 +1631,9 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 	n = ns_forw(nsp, msg, *msglenp, from, qsp, dfd, &qp,
 		    dname, class, type, np, 0, in_tsig);
 	if (n != FW_OK && cname) {
+		memcpy(msg, omsg, omsglen);
 		memput(omsg, omsglen);
+		*msglenp = omsglen;
 		omsg = NULL;
 	}
 	switch (n) {
@@ -1387,6 +1645,11 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 			qp->q_cmsgsize = omsglen;
 			qp->q_id = id;
 		}
+		if (udpsize != 0) {
+			qp->q_flags |= Q_EDNS;
+			qp->q_udpsize = udpsize;
+		} else
+			qp->q_udpsize = PACKETSZ;
 		break;
 	case FW_DUP:
 		break;		/* Duplicate request dropped */
@@ -1441,7 +1704,7 @@ req_query(HEADER *hp, u_char **cpp, u_char *eom, struct qstream *qsp,
 
 static enum req_action
 req_iquery(HEADER *hp, u_char **cpp, u_char *eom, int *buflenp,
-	   u_char *msg, struct sockaddr_in from)
+	   struct sockaddr_in from)
 {
 	u_int rdata_offset;
 	size_t alen;
@@ -1561,7 +1824,7 @@ req_iquery(HEADER *hp, u_char **cpp, u_char *eom, int *buflenp,
 	*buflenp -= INT16SZ;
 
 	hp->qdcount = htons(1);
-	if (alen > *buflenp) {
+	if ((int)alen > *buflenp) {
 		hp->tc = 1;
 		return (Finish);
 	}
@@ -1578,6 +1841,10 @@ int
 stale(struct databuf *dp) {
 	struct zoneinfo *zp = &zones[dp->d_zone];
 
+#ifdef CHECK_MAGIC
+	INSIST(dp->d_magic == DATABUF_MAGIC);
+#endif
+
 	switch (zp->z_type) {
 
 	case z_master:
@@ -1662,6 +1929,7 @@ make_rr(const char *name, struct databuf *dp, u_char *buf,
 	int32_t n;
 	int16_t type = dp->d_type;
 	u_int32_t ttl;
+	u_char naptr_flag;
 
 	ns_debug(ns_log_default, 5,
 		 "make_rr(%s, %lx, %lx, %d, %d) %d zone %d ttl %lu",
@@ -1801,6 +2069,7 @@ make_rr(const char *name, struct databuf *dp, u_char *buf,
 		buflen -= n + 1;
 		if (buflen < 0)
 			goto cleanup;
+		naptr_flag = (n == 1) ? *cp1 : 0;
 		*cp++ = n;
 		memcpy(cp, cp1, n);
 		cp += n;
@@ -1839,6 +2108,14 @@ make_rr(const char *name, struct databuf *dp, u_char *buf,
 		if (n < 0)
 			goto cleanup;
 		cp += n;
+		if (doadd && *cp1 != 0) {
+			if (naptr_flag == 's' || naptr_flag == 'S')
+				addname((char*)cp1, name, type, T_SRV,
+					dp->d_class);
+			if (naptr_flag == 'a' || naptr_flag == 'A')
+				addname((char*)cp1, name, type, T_A,
+					dp->d_class);
+		}
 
 		/* save data length */
 		n = (u_int16_t)((cp - sp) - INT16SZ);
@@ -1918,7 +2195,7 @@ make_rr(const char *name, struct databuf *dp, u_char *buf,
 
 		/* first just copy over the type_covered, algorithm, */
 		/* labels, orig ttl, two timestamps, and the footprint */
-		if ((dp->d_size - 18) > buflen)
+		if (buflen < 18)
 			goto cleanup;  /* out of room! */
 		memcpy(cp, cp1, 18);
 		cp  += 18;
@@ -2022,8 +2299,9 @@ doaddinfo(HEADER *hp, u_char *msg, int msglen) {
 	const char *fname;
 	register int n, count;
 	register int ns_logging;
-	int finishedA = 0;
-	int save_addcount = addcount;
+	int pass = 0;
+	int i, doadd;
+	
 
 	if (!addcount)
 		return (0);
@@ -2043,15 +2321,21 @@ doaddinfo(HEADER *hp, u_char *msg, int msglen) {
 	count = 0;
 	cp = msg;
 loop:
-	for (ap = addinfo; --addcount >= 0; ap++) {
-		int     foundany = 0,
+	for (ap = addinfo, i = 0; i < addcount; ap++, i++) {
+		int     auth = 0,
+			founda = 0,
+			foundaaaa = 0,
+			founda6 = 0,
 			foundcname = 0,
 			save_count = count,
 			save_msglen = msglen;
 		u_char	*save_cp = cp;
 
-		if ((finishedA == 1 && ap->a_type == T_A) ||
-		    (finishedA == 0 && ap->a_type == T_KEY))
+		if ((pass != 0 &&
+	             (pass != 1 || server_options->preferred_glue == 0) &&
+		     ap->a_type == T_A) ||
+		    (pass != 0 && ap->a_type == T_SRV) ||
+		    (pass != 2 && ap->a_type == T_KEY))
 			continue;
 		if (ns_logging)
 			ns_debug(ns_log_default, 3,
@@ -2066,35 +2350,61 @@ loop:
 		/* look for the data */
 		(void)delete_stale(np);
 		for (dp = np->n_data; dp != NULL; dp = dp->d_next) {
-			if (dp->d_rcode)
+			if (dp->d_class != ap->a_class)
 				continue;
-			if ((match(dp, (int)ap->a_class, T_CNAME) &&
-			     dp->d_type == T_CNAME) ||
-			    (match(dp, C_IN, T_CNAME) &&
-			     dp->d_type == T_CNAME)) {
+			if (dp->d_rcode == NXDOMAIN) {
+				founda = founda6 = foundaaaa = 1;
+				continue;
+			}
+			switch (dp->d_type) {
+			case ns_t_a: founda = 1; break;
+			case ns_t_a6: founda6 = 1; break;
+			case ns_t_aaaa: foundaaaa = 1; break;
+			}
+			if (!dp->d_rcode && dp->d_type == T_CNAME) {
 				foundcname++;
 				break;
 			}
+			if (auth == 0 && ap->a_type == T_A &&
+			    (dp->d_type == ns_t_a || dp->d_type == ns_t_a6 ||
+			     dp->d_type == ns_t_aaaa) &&
+			    (zones[dp->d_zone].z_type == z_master ||
+			     zones[dp->d_zone].z_type == z_slave))
+				auth = 1;
+			if (pass == 0 && ap->a_type == T_A && 
+			    server_options->preferred_glue != 0 &&
+			    !match(dp, (int)ap->a_class,
+				   server_options->preferred_glue)) {
+				continue;
+			} 
+			if (pass != 0 && ap->a_type == T_A &&
+			    server_options->preferred_glue != 0 &&
+			    match(dp, (int)ap->a_class,
+				   server_options->preferred_glue)) {
+				continue;
+			} 
 			if (ap->a_type == T_A &&
 			    !match(dp, (int)ap->a_class, T_A) &&
-			    !match(dp, C_IN, T_A) &&
 			    !match(dp, (int)ap->a_class, T_AAAA) &&
-			    !match(dp, C_IN, T_AAAA) &&
-			    !match(dp, (int)ap->a_class, ns_t_a6) &&
-			    !match(dp, C_IN, ns_t_a6)) {
+			    !match(dp, (int)ap->a_class, ns_t_a6)) {
 				continue;
 			}
 			if (ap->a_type == T_KEY &&
-			    !match(dp, (int)ap->a_class, T_KEY) &&
-			    !match(dp, C_IN, T_KEY))
+			    !match(dp, (int)ap->a_class, T_KEY))
+				continue;
+			if (ap->a_type == T_SRV &&
+			    !match(dp, (int)ap->a_class, T_SRV))
+				continue;
+			if (dp->d_rcode)
 				continue;
-
-			foundany++;
 			/*
 			 *  Should be smart and eliminate duplicate
 			 *  data here.	XXX
 			 */
-			if ((n = make_rr(ap->a_dname, dp, cp, msglen, 0,
+			doadd = 0;
+			if (ap->a_type == T_SRV)
+				doadd = 1;
+			if ((n = make_rr(ap->a_dname, dp, cp, msglen, doadd,
 					 dnptrs, dnptrs_end, 0)) < 0) {
 				/* truncation in the additional-data section
 				 * is not all that serious.  we do not set TC,
@@ -2126,11 +2436,20 @@ loop:
 		}
  next_rr:
 		if (!NS_OPTION_P(OPTION_NOFETCHGLUE) && 
-		    !foundcname && !foundany &&
-		    (ap->a_type == T_A || ap->a_type == T_AAAA)) {
+		    !foundcname && ap->a_type == T_A) {
 			/* ask a real server for this info */
-			(void) sysquery(ap->a_dname, (int)ap->a_class,
-					ap->a_type, NULL, 0, ns_port, QUERY);
+			if (!founda && !auth)
+				(void) sysquery(ap->a_dname, (int)ap->a_class,
+						ns_t_a, NULL, NULL, 0, ns_port,
+						QUERY, 0);
+			if (!foundaaaa && !auth)
+				(void) sysquery(ap->a_dname, (int)ap->a_class,
+						ns_t_aaaa, NULL, NULL, 0,
+						ns_port, QUERY, 0);
+			if (!founda6 && !auth)
+				(void) sysquery(ap->a_dname, (int)ap->a_class,
+						ns_t_a6, NULL, NULL, 0, ns_port,
+						QUERY, 0);
 		}
 		if (foundcname) {
 			if (!haveComplained(nhash(ap->a_dname),
@@ -2141,15 +2460,15 @@ loop:
 					p_type(ap->a_rtype), ap->a_dname);
 			}
 		}
-		freestr(ap->a_dname);
-		freestr(ap->a_rname);
 	}
-	if (finishedA == 0) {
-		finishedA = 1;
-		addcount = save_addcount;
+	if (pass++ < 2)
 		goto loop; /* now do the KEYs... */
-	}
 	hp->arcount = htons((u_int16_t)count);
+	for (ap = addinfo, i = 0; i < addcount; ap++, i++) {
+		ap->a_dname = freestr(ap->a_dname);
+		ap->a_rname = freestr(ap->a_rname);
+	}
+	addcount = 0;
 	return (cp - msg);
 }
 
@@ -2188,27 +2507,16 @@ free_addinfo() {
 	struct addinfo *ap;
 
 	for (ap = addinfo; --addcount >= 0; ap++) {
-		freestr(ap->a_dname);
-		freestr(ap->a_rname);
+		ap->a_dname = freestr(ap->a_dname);
+		ap->a_rname = freestr(ap->a_rname);
 	}
 	addcount = 0;
 }
 
 void
 free_nsp(struct databuf **nsp) {
-	while (*nsp) {
-		DRCNTDEC(*nsp);
-		if ((*nsp)->d_rcnt)
-			ns_debug(ns_log_default, 3, "free_nsp: %s rcnt %d",
-				 (*nsp)->d_data, (*nsp)->d_rcnt);
-		else {
-			ns_debug(ns_log_default, 3,
-				 "free_nsp: %s rcnt %d delayed",
-				 (*nsp)->d_data, (*nsp)->d_rcnt);
-			db_freedata(*nsp);	/* delayed free */
-		}
-		*nsp++ = NULL;
-	}
+	while (*nsp)
+		db_detach(nsp++);
 }
 
 static void
@@ -2218,3 +2526,20 @@ copyCharString(u_char **dst, const char *src) {
 	memcpy(*dst, src, len);
 	*dst += len;
 }
+
+/*
+ * Questionable source ports for queries / responses.
+ */
+int
+drop_port(u_int16_t port) {
+	switch (port) {
+	case 7: /* echo */
+	case 13: /* daytime */
+	case 19: /* chargen */
+	case 37: /* time */
+		return (1);
+	case 464: /* kpasswd */
+		return (2);
+	}
+	return (0);
+}

contrib/bind/bin/named/ns_signal.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_main.c	4.55 (Berkeley) 7/1/91";
-static const char rcsid[] = "$Id: ns_signal.c,v 8.13 2000/07/11 07:10:12 vixie Exp $";
+static const char rcsid[] = "$Id: ns_signal.c,v 8.15 2002/05/18 01:39:15 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -87,8 +87,10 @@ static const char rcsid[] = "$Id: ns_signal.c,v 8.13 2000/07/11 07:10:12 vixie E
 #ifdef SVR4	/* XXX */
 # include <sys/sockio.h>
 #else
+#ifndef __hpux
 # include <sys/mbuf.h>
 #endif
+#endif
 
 #include <netinet/in.h>
 #include <net/route.h>
@@ -162,28 +164,43 @@ static int blocked = 0;
 
 static SIG_FN
 onhup(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_reload);
 }
 
 static SIG_FN
 onintr(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_exit);
 }
 
 static SIG_FN
 setdumpflg(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_dump);
 }
 
 #ifdef DEBUG
 static SIG_FN
 setIncrDbgFlg(int sig) {
+
+	UNUSED(sig);
+
 	desired_debug++;
 	ns_need_unsafe(main_need_debug);
 }
 
 static SIG_FN
 setNoDbgFlg(int sig) {
+
+	UNUSED(sig);
+
 	desired_debug = 0;
 	ns_need_unsafe(main_need_debug);
 }
@@ -192,12 +209,18 @@ setNoDbgFlg(int sig) {
 #if defined(QRYLOG) && defined(SIGWINCH)
 static SIG_FN
 setQrylogFlg(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_qrylog);
 }
 #endif /*QRYLOG && SIGWINCH*/
 
 static SIG_FN
 setstatsflg(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_statsdump);
 }
 
@@ -207,6 +230,8 @@ discard_pipe(int sig) {
 	int saved_errno = errno;
 	struct sigaction sa;
 
+	UNUSED(sig);
+
 	memset(&sa, 0, sizeof sa);
 	sa.sa_mask = mask;
 	sa.sa_handler = discard_pipe;
@@ -214,11 +239,16 @@ discard_pipe(int sig) {
 		ns_error(ns_log_os, "sigaction failed in discard_pipe: %s",
 			 strerror(errno));
 	errno = saved_errno;
+#else
+	UNUSED(sig);
 #endif
 }
 
 static SIG_FN
 setreapflg(int sig) {
+
+	UNUSED(sig);
+
 	ns_need_unsafe(main_need_reap);
 }
 
@@ -226,7 +256,7 @@ setreapflg(int sig) {
 
 void
 init_signals(void) {
-	int sh;
+	size_t sh;
 
 	/* The mask of all our handlers will block all our other handlers. */
 	(void)sigemptyset(&mask);

contrib/bind/bin/named/ns_sort.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_sort.c	4.10 (Berkeley) 3/3/91";
-static const char rcsid[] = "$Id: ns_sort.c,v 8.6 2000/04/21 06:54:13 vixie Exp $";
+static const char rcsid[] = "$Id: ns_sort.c,v 8.8 2001/09/25 04:50:22 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -183,6 +183,7 @@ static const char rcsid[] = "$Id: ns_sort.c,v 8.6 2000/04/21 06:54:13 vixie Exp
 #include <stdio.h>
 #include <syslog.h>
 #include <resolv.h>
+#include <string.h>
 
 #include <isc/eventlib.h>
 #include <isc/logging.h>
@@ -240,6 +241,7 @@ sort_response(u_char *cp, u_char *eom, int ancount, struct sockaddr_in *from) {
 			indirect = 1;
 			break;
 		default:
+			indirect = 0;
 			panic("unexpected ime type in ip_match_address()",
 			      NULL);
 		}
@@ -282,6 +284,7 @@ sort_response(u_char *cp, u_char *eom, int ancount, struct sockaddr_in *from) {
 				iml = imematch->next->u.indirect.list;
 				break;
 			default:
+				iml = NULL;
 				panic("unexpected ime type in ip_match_address()",
 				      NULL);
 			}
@@ -303,9 +306,9 @@ sort_response(u_char *cp, u_char *eom, int ancount, struct sockaddr_in *from) {
 
 static int
 sort_rr(u_char *cp, u_char *eom, int ancount, ip_match_list iml) {
-	int type, class, dlen, n, c, distance, closest;
+	int type, class, dlen, n, c, distance, closest = 0;
 	struct in_addr inaddr;
-	u_char *rr1 = NULL, *rrbest, *cpstart;
+	u_char *rr1 = NULL, *rrbest = NULL, *cpstart;
 
 	rr1 = NULL;
 	cpstart = cp;
@@ -384,6 +387,7 @@ ip_match_address_elt(ip_match_list iml, struct in_addr address,
 			indirect = 1;
 			break;
 		default:
+			indirect = 0;
 			panic("unexpected ime type in ip_match_address()",
 			      NULL);
 		}

contrib/bind/bin/named/ns_stats.c

@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_stats.c	4.10 (Berkeley) 6/27/90";
-static const char rcsid[] = "$Id: ns_stats.c,v 8.32.2.1 2001/08/09 14:04:49 marka Exp $";
+static const char rcsid[] = "$Id: ns_stats.c,v 8.34 2001/08/09 13:17:21 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -381,6 +381,11 @@ ns_logstats(evContext ctx, void *uap, struct timespec due,
 #ifdef HAVE_GETRUSAGE
 # define tv_float(tv) ((tv).tv_sec + ((tv).tv_usec / 1000000.0))
 
+	UNUSED(ctx);
+	UNUSED(uap);
+	UNUSED(due);
+	UNUSED(inter);
+
 	getrusage(RUSAGE_SELF, &usage);
 	getrusage(RUSAGE_CHILDREN, &childu);
 

contrib/bind/bin/named/ns_update.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_update.c,v 8.91.2.2 2001/04/30 03:20:46 marka Exp $";
+static const char rcsid[] = "$Id: ns_update.c,v 8.104 2002/05/18 01:02:59 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -105,7 +105,7 @@ static struct map m_opcode[] = {
 #define M_CLASS_CNT m_class_cnt
 #define M_TYPE_CNT m_type_cnt
 
-static char *opcodes[] = {
+static const char *opcodes[] = {
 	"delete",
 	"add",
 	"",
@@ -734,53 +734,59 @@ prescan_nameok(ns_updrec *ur, int *rcodep, u_int16_t zclass,
 	u_int16_t type = ur->r_type;
 	char *cp = (char *)ur->r_dp->d_data;
 	enum context context;
+	enum transport transport;
 
 	/* We don't care about deletes */
 	if (ur->r_class != zclass)
 		return (1);
 
-	context = ns_ownercontext(type, primary_trans);
-	if (!ns_nameok(NULL, owner, class, zp, primary_trans, context, owner,
+	if (zp->z_type == Z_PRIMARY)
+		transport = primary_trans;
+	else
+		transport = secondary_trans;
+
+	context = ns_ownercontext(type, transport);
+	if (!ns_nameok(NULL, owner, class, zp, transport, context, owner,
 		       inaddr_any))
 		goto refused;
 
 	switch (type) {
 	case ns_t_soa:
 		context = hostname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		cp += strlen(cp) + 1;
 		context = mailname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_rp:
 		context = mailname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		cp += strlen(cp) + 1;
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_minfo:
 		context = mailname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		cp += strlen(cp) + 1;
 		context = mailname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_ns:
 		context = hostname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
@@ -789,13 +795,13 @@ prescan_nameok(ns_updrec *ur, int *rcodep, u_int16_t zclass,
 	case ns_t_mg:
 	case ns_t_mr:
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_ptr:
 		context = ns_ptrcontext(owner);
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
@@ -812,7 +818,7 @@ prescan_nameok(ns_updrec *ur, int *rcodep, u_int16_t zclass,
 		/* Pattern (txt) */
 		cp += (*cp&0xff) + 1;
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans,
+		if (!ns_nameok(NULL, cp, class, zp, transport,
 			       context, owner, inaddr_any))
 			goto refused;
 		break;
@@ -825,18 +831,18 @@ prescan_nameok(ns_updrec *ur, int *rcodep, u_int16_t zclass,
 	case ns_t_kx:
 		cp += 2;
 		context = hostname_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_px:
 		cp += 2;
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		cp += strlen(cp) + 1;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
@@ -852,13 +858,13 @@ prescan_nameok(ns_updrec *ur, int *rcodep, u_int16_t zclass,
 		 */
 		cp += 18;
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
 	case ns_t_nxt:
 		context = domain_ctx;
-		if (!ns_nameok(NULL, cp, class, zp, primary_trans, context, owner,
+		if (!ns_nameok(NULL, cp, class, zp, transport, context, owner,
 			       inaddr_any))
 			goto refused;
 		break;
@@ -977,7 +983,7 @@ process_updates(const ns_updque *updlist, int *rcodep,
 
 		ns_debug(ns_log_update, 3,
 "process_update: record section=%s, dname=%s, \
-class=%s, type=%s, ttl=%d, dp=0x%0x",
+class=%s, type=%s, ttl=%d, dp=%p",
 			 p_section(section, ns_o_update), dname,
 			 p_class(class), p_type(type), ttl, rdp);
 
@@ -1048,7 +1054,7 @@ class=%s, type=%s, ttl=%d, dp=0x%0x",
 					 n);
 			} else {
 				ns_debug(ns_log_update, 3,
-				      "process_updates: added databuf 0x%0x",
+				      "process_updates: added databuf %p",
 					 dp);
 				dp->d_mark = D_MARK_ADDED;
 				numupdated++;
@@ -1135,8 +1141,8 @@ class=%s, type=%s, ttl=%d, dp=0x%0x",
 
 static enum req_action
 req_update_private(HEADER *hp, u_char *cp, u_char *eom, u_char *msg, 
-		   struct qstream *qsp, int dfd, struct sockaddr_in from,
-		   struct tsig_record *in_tsig, ns_updque *curupd)
+		   struct sockaddr_in from, struct tsig_record *in_tsig,
+		   ns_updque *curupd)
 {
 	char dnbuf[MAXDNAME], *dname;
 	u_int zocount, prcount, upcount, adcount, class, type, dlen;
@@ -1340,7 +1346,6 @@ req_update_private(HEADER *hp, u_char *cp, u_char *eom, u_char *msg,
 		dp->d_secure = DB_S_INSECURE; /* should be UNCHECKED */
 		dp->d_clev = nlabels(zp->z_origin);
 		/* XXX - also record in dp->d_ns, which host this came from */
-		DRCNTINC(dp);
 		rrecp->r_dp = dp;
 		/* Append the current record to the end of list of records. */
 		APPEND(*curupd, rrecp, r_link);
@@ -1380,7 +1385,8 @@ void
 free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 	ns_updrec *rrecp, *first_rrecp, *next_rrecp;
 	struct databuf *dp, *tmpdp;
-	char *dname, *msg;
+	char *dname;
+	const char *msg;
 
 	if (rcode == NOERROR) {
 		first_rrecp = HEAD(*updlist);
@@ -1389,7 +1395,7 @@ free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 		first_rrecp = TAIL(*updlist);
 		msg = "free_rrecp: update transaction aborted, rolling back";
 	}
-	ns_debug(ns_log_update, 1, msg);
+	ns_debug(ns_log_update, 1, "%s", msg);
 	for (rrecp = first_rrecp; rrecp != NULL; rrecp = next_rrecp) {
 		if (rcode == NOERROR)
 			next_rrecp = NEXT(rrecp, r_link);
@@ -1397,12 +1403,8 @@ free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 			next_rrecp = PREV(rrecp, r_link);
 		UNLINK(*updlist, rrecp, r_link);
 		if (rrecp->r_section != S_UPDATE) {
-			if (rrecp->r_dp) {
-				DRCNTDEC(rrecp->r_dp);
-				if (rrecp->r_dp->d_rcnt == 0)
-					db_freedata(rrecp->r_dp);
-				rrecp->r_dp = NULL;
-			}
+			if (rrecp->r_dp)
+				db_detach(&rrecp->r_dp);
 			INSIST(rrecp->r_deldp == NULL);
 			res_freeupdrec(rrecp);
 			continue;
@@ -1428,24 +1430,12 @@ free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 						 dname, p_type(dp->d_type));
 				} else {
 					ns_debug(ns_log_update, 3,
-				         "free_rrecp: deleted databuf 0x%0x",
+				         "free_rrecp: deleted databuf %p",
 						 dp);
-					/* 
-					 * XXXRTH 
-					 *
-					 * We used to db_freedata() here,
-					 * but I removed it because 'dp' was
-					 * part of a hashtab before we called
-					 * db_update(), and since our delete
-					 * has succeeded, it should have been
-					 * freed.
-					 */
 				}
 			}
 		}
-		DRCNTDEC(dp);
-		if (dp->d_rcnt == 0)
-			db_freedata(dp);
+		db_detach(&dp);
 
 		/* Process deleted databuf's. */
 		dp = rrecp->r_deldp;
@@ -1464,13 +1454,11 @@ free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 						 dname, p_type(tmpdp->d_type));
 				} else {
 					ns_debug(ns_log_update, 3,
-				      "free_rrecp: added back databuf 0x%0x",
+				      "free_rrecp: added back databuf %p",
 						 tmpdp);
 				}
 			}
-			DRCNTDEC(tmpdp);
-			if (tmpdp->d_rcnt == 0)
-				db_freedata(tmpdp);
+			db_detach(&tmpdp);
 		}
 		res_freeupdrec(rrecp);
 	}
@@ -1478,15 +1466,13 @@ free_rrecp(ns_updque *updlist, int rcode, struct sockaddr_in from) {
 
 enum req_action
 req_update(HEADER *hp, u_char *cp, u_char *eom, u_char *msg, 
-	   struct qstream *qsp, int dfd, struct sockaddr_in from,
-	   struct tsig_record *in_tsig)
+	   struct sockaddr_in from, struct tsig_record *in_tsig)
 {
 	enum req_action ret;
 	ns_updque curupd;
 
 	INIT_LIST(curupd);
-	ret = req_update_private(hp, cp, eom, msg, qsp, dfd, from,
-				 in_tsig, &curupd);
+	ret = req_update_private(hp, cp, eom, msg, from, in_tsig, &curupd);
 	free_rrecp(&curupd, ret == Refuse ? ns_r_refused : hp->rcode, from);
 	if (ret == Finish) {
 		hp->qdcount = hp->ancount = hp->nscount = hp->arcount = 0;
@@ -1628,13 +1614,13 @@ rdata_expand(const u_char *msg, const u_char *eom, const u_char *cp,
 		cp += SIG_HDR_SIZE;
 		cp1 += SIG_HDR_SIZE;
 		n = dn_expand(msg, eom, cp, (char *)cp1, size);
-		if (n < 0 || n + SIG_HDR_SIZE > dlen)
+		if (n < 0 || n + SIG_HDR_SIZE > (int)dlen)
 			return (0);
 		cp += n;
 		n1 = dlen - n - SIG_HDR_SIZE;
 		n = strlen((char *)cp1) + 1;
 		cp1 += n;
-		if (size < n1)
+		if ((int)size < n1)
 			return (0);
 		memcpy(cp1, cp, n1);
 		cp1 += n1;
@@ -1665,14 +1651,16 @@ rdata_expand(const u_char *msg, const u_char *eom, const u_char *cp,
 			if (n1 < 4 || n1 > 16)
 				return (0);
 		}
-		if (n1 > size)
+		if (n1 > (int)size)
 			return (0);
 		memcpy(cp1, cp, n1);
 		cp1 += n1;
 		return (cp1 - cp1init);
 	default:
-		ns_debug(ns_log_update, 3, "unknown type %d", type);
-		return (0);
+		if (size < dlen)
+			return (0);
+		memcpy(cp1, cp, dlen);
+		return (dlen);
 	}
 }
 
@@ -1917,7 +1905,13 @@ rdata_dump(struct databuf *dp, FILE *fp) {
 		break;
 	}
 	default:
-		fprintf(fp, "\t;?d_type=%d?", dp->d_type);
+		fprintf(fp, "\\# %u", dp->d_size);
+		if (dp->d_size) {
+			fputs(" ( ", fp);
+			isc_puthexstring(fp, dp->d_data, dp->d_size,	
+					 28, 48, "\n\t\t\t\t");
+			fputs(" )", fp);
+		}
 	}
 }
 
@@ -1937,7 +1931,7 @@ findzone(const char *dname, int class, int depth, int *zonelist, int maxzones){
 	int escaped, found, done;
 
 	ns_debug(ns_log_update, 4, "findzone(dname=%s, class=%d, depth=%d, \
-zonelist=0x%x, maxzones=%d)",
+zonelist=%p, maxzones=%d)",
 		 dname, class, depth, zonelist, maxzones);
 #ifdef DEBUG
 	if (debug >= 5) {
@@ -2068,7 +2062,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 	u_int32_t serial, ttl, old_serial, new_serial;
 	char *dname, *cp, *cp1;
 	int type, class;
-	int i, c, section, opcode, matches, zonenum, err, multiline;
+	int i, c, section, opcode, matches, zonenum = 0, err, multiline;
 	int nonempty_lineno = -1, prev_pktdone = 0, cont = 0, inside_next = 0;
 	int id, rcode = NOERROR;
 	u_int32_t n;
@@ -2082,6 +2076,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 	int datasize;
 	unsigned long l;
 	ns_updque curupd;
+	unsigned long lutmp;
 
 	empty_from.sin_family = AF_INET;
 	empty_from.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -2151,6 +2146,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 	INIT_LIST(curupd);
 	for (;;) {
 		err = 0;
+		dname = NULL;
 		if (!getword(buf, sizeof buf, fp, 0)) {
 			if (lineno == (nonempty_lineno + 1) && !(feof(fp))) {
 				/*
@@ -2223,6 +2219,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 			if (!EMPTY(curupd)) {
 				n = process_updates(&curupd, &rcode,
 						    empty_from);
+				free_rrecp(&curupd, rcode, empty_from);
 				if (n > 0)
 					ns_info(ns_log_update,
 			   "successfully merged update id %d from log file %s",
@@ -2234,7 +2231,6 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 					fclose(fp);
 					return(-1);
 				}
-				free_rrecp(&curupd, rcode, empty_from);
 			}
 			prev_pktdone = 0;
 			if (feof(fp))
@@ -2270,7 +2266,8 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 			if (!cp)
 				*buf = '\0';
 			n = sscanf(cp, "origin %s class %s serial %lu",
-				   origin, sclass, &serial);
+				   origin, sclass, &lutmp);
+			serial = lutmp;
 			if (n != 3 || ns_samename(origin, zp->z_origin) != 1)
 				err++;
 			if (cp)
@@ -2288,8 +2285,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 
 				dname = origin;
 				type = T_SOA;
-				class = sym_ston(__p_class_syms, sclass,
-						 &success);
+				class = res_nametoclass(sclass, &success);
 				if (!success) {
 				        err++;
 					break;
@@ -2355,9 +2351,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 				int success;
 				int maybe_class;
 				
-				maybe_class = sym_ston(__p_class_syms,
-						       buf,
-						       &success);
+				maybe_class = res_nametoclass(buf, &success);
 				if (success) {
 					class = maybe_class;
 					(void) getword(buf,
@@ -2370,9 +2364,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 				int success;
 				int maybe_type;
 
-				maybe_type = sym_ston(__p_type_syms,
-						      buf,
-						      &success);
+				maybe_type = res_nametotype(buf, &success);
 
 				if (success) {
 					type = maybe_type;
@@ -2618,7 +2610,7 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 				case ns_t_nxt:
 				case ns_t_cert:
 				    {
-					char * errmsg = NULL;
+					const char * errmsg = NULL;
 					int s;
 
 					s = parse_sec_rdata(buf, sizeof(buf),
@@ -2637,7 +2629,40 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 					break;
 				    }
 				default:
-					err++;
+					if (strcmp(buf, "\\#") != 0) {
+						err++;
+						break;
+					}
+					if (!getword(buf, sizeof buf, fp, 0) ||
+					    !isdigit((unsigned char)buf[0])) {
+						err++;
+						break;
+					}
+					n = strtoul(buf, &cp, 10);
+					if (n > 0xffff || *cp != '\0') {
+						err++;
+						break;
+					}
+					multiline = 0;
+					i = isc_gethexstring((u_char *)data,
+							     sizeof(data),
+							     n, fp, &multiline);
+					if (i == -1) {
+						err++;
+						break;
+					}
+					if (multiline) {
+						c = getnonblank(fp,
+								zp->z_updatelog,
+								1);
+						if (c != ')') {
+							ungetc(c, fp);
+							err++;
+							break;
+						}
+						multiline = 0;
+					}
+					endline(fp);
 				}
 			if (section == S_PREREQ) {
 				ttl = 0;
@@ -2687,12 +2712,12 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 			err++;
 		}
 		if (err) {
-			inside_next = 0;
 			ns_debug(ns_log_update, 1, 
 		      "merge of update id %d failed due to error at line %d",
 				 id, lineno);
 			free_rrecp(&curupd, FORMERR, empty_from);
-			continue;
+			fclose(fp);
+			return(-1);
 		}
 		rrecp = res_mkupdrec(section, dname, class, type, ttl);
 		if (section != S_ZONE) {
@@ -2701,7 +2726,6 @@ merge_logs(struct zoneinfo *zp, char *logname) {
 			dp->d_cred = DB_C_ZONE;
 			dp->d_clev = nlabels(zp->z_origin);
 			dp->d_secure = DB_S_INSECURE; /* should be UNCHECKED */
-			DRCNTINC(dp);
 			rrecp->r_dp = dp;
 		} else {
 			rrecp->r_zone = zonenum;
@@ -2986,9 +3010,9 @@ incr_serial(struct zoneinfo *zp) {
 			return (-1);
 		dp = findzonesoa(zp);
 		if (dp) {
-			olddp = memget(DATASIZE(dp->d_size));
+			olddp = memget(BIND_DATASIZE(dp->d_size));
 			if (olddp != NULL) {
-				memcpy(olddp, dp, DATASIZE(dp->d_size));
+				memcpy(olddp, dp, BIND_DATASIZE(dp->d_size));
 				cp = findsoaserial(olddp->d_data);
 				PUTLONG(old_serial, cp);
 				fprintf(ifp, "update: {delete} %s. %u %s %s ",
@@ -2997,7 +3021,7 @@ incr_serial(struct zoneinfo *zp) {
 					p_type(dp->d_type));
 				(void) rdata_dump(olddp, ifp);
 				fprintf(ifp, "\n");
-				memput(olddp, DATASIZE(dp->d_size));
+				memput(olddp, BIND_DATASIZE(dp->d_size));
 			}
 			fprintf(ifp, "update: {add} %s. %u %s %s ",
 				zp->z_origin, dp->d_ttl,

contrib/bind/bin/named/ns_xfr.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_xfr.c,v 8.64 2001/02/15 00:18:46 marka Exp $";
+static const char rcsid[] = "$Id: ns_xfr.c,v 8.69 2002/06/05 03:53:49 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -82,15 +82,21 @@ ns_xfr(struct qstream *qsp, struct namebuf *znp,
 	ns_deltalist	*changes;
 
 	switch (type) {
-	case ns_t_axfr: /*FALLTHROUGH*/
 	case ns_t_ixfr:
+		ns_info(ns_log_xfer_out,
+			"zone transfer (%s) of \"%s\" (%s) to %s serial %u -> %u",
+			p_type(type), zones[zone].z_origin, p_class(class),
+			sin_ntoa(qsp->s_from), serial_ixfr,
+			zones[zone].z_serial);
+		break;
+	case ns_t_axfr: /*FALLTHROUGH*/
 #ifdef BIND_ZXFR
 	case ns_t_zxfr:
 #endif
 		ns_info(ns_log_xfer_out,
-			"zone transfer (%s) of \"%s\" (%s) to %s",
+			"zone transfer (%s) of \"%s\" (%s) to %s serial %u",
 			p_type(type), zones[zone].z_origin, p_class(class),
-			sin_ntoa(qsp->s_from));
+			sin_ntoa(qsp->s_from), zones[zone].z_serial);
 		break;
 	default:
 		ns_warning(ns_log_xfer_out,
@@ -107,7 +113,7 @@ ns_xfr(struct qstream *qsp, struct namebuf *znp,
 	 * write() data from us.
 	 */
 	(void) setsockopt(qsp->s_rfd, SOL_SOCKET, SO_SNDBUF,
-			  (char *)&sndbuf, sizeof sndbuf);
+			  (const char *)&sndbuf, sizeof sndbuf);
 #endif
 #ifdef SO_SNDLOWAT
 	/*
@@ -115,7 +121,7 @@ ns_xfr(struct qstream *qsp, struct namebuf *znp,
 	 * an XFER_BUFSIZE block of data.
 	 */
 	(void) setsockopt(qsp->s_rfd, SOL_SOCKET, SO_SNDLOWAT,
-			  (char *)&sndlowat, sizeof sndlowat);
+			  (const char *)&sndlowat, sizeof sndlowat);
 #endif
 	if (sq_openw(qsp, 64*1024) == -1) {
 		ns_error(ns_log_xfer_out, "ns_xfr: out of memory");
@@ -180,13 +186,15 @@ ns_xfr(struct qstream *qsp, struct namebuf *znp,
 		qsp->xfr.transfer_format = si->transfer_format;
 	else	
 		qsp->xfr.transfer_format = server_options->transfer_format;
-	if (in_tsig == NULL)
+	if (in_tsig == NULL) {
 		qsp->xfr.tsig_state = NULL;
-	else {
+		qsp->xfr.tsig_size = 0;
+	} else {
 		qsp->xfr.tsig_state = memget(sizeof(ns_tcp_tsig_state));
 		ns_sign_tcp_init(in_tsig->key, in_tsig->sig, in_tsig->siglen,
 				 qsp->xfr.tsig_state);
 		qsp->xfr.tsig_skip = 0;
+		qsp->xfr.tsig_size = in_tsig->tsig_size;
 	}
 
 	if (type == ns_t_ixfr) {
@@ -263,8 +271,7 @@ ns_freexfr(struct qstream *qsp) {
 			while ((rp = HEAD(dp->d_changes)) != NULL) {
 				UNLINK(dp->d_changes, rp, r_link);
 				if (rp->r_dp != NULL)
-					db_freedata(rp->r_dp);
-				rp->r_dp = NULL;
+					db_detach(&rp->r_dp);
 				res_freeupdrec(rp);
 			} 
 			memput(dp, sizeof *dp);
@@ -274,6 +281,10 @@ ns_freexfr(struct qstream *qsp) {
 	}
 	while (qsp->xfr.lev)
 		qsp->xfr.lev = sx_freelev(qsp->xfr.lev);
+	if (qsp->xfr.tsig_state != NULL) {
+		memput(qsp->xfr.tsig_state, sizeof(ns_tcp_tsig_state));
+		qsp->xfr.tsig_state = NULL;
+	}
 	zones[qsp->xfr.zone].z_numxfrs--;
 	qsp->flags &= ~(STREAM_AXFR | STREAM_AXFRIXFR);
 }
@@ -390,14 +401,15 @@ sx_addrr(struct qstream *qsp, const char *dname, struct databuf *dp) {
 		}
 	}
 
-	n = make_rr(dname, dp, qsp->xfr.cp, qsp->xfr.eom - qsp->xfr.cp,
-		    0, qsp->xfr.ptrs, edp, 0);
+	n = make_rr(dname, dp, qsp->xfr.cp, qsp->xfr.eom - qsp->xfr.cp -
+		    qsp->xfr.tsig_size, 0, qsp->xfr.ptrs, edp, 0);
 	if (n < 0) {
 		if (sx_flush(qsp) < 0)
 			return (-1);
 		if (qsp->xfr.cp == NULL)
 			sx_newmsg(qsp);
-		n = make_rr(dname, dp, qsp->xfr.cp, qsp->xfr.eom - qsp->xfr.cp,
+		n = make_rr(dname, dp, qsp->xfr.cp, qsp->xfr.eom - 
+			    qsp->xfr.cp - qsp->xfr.tsig_size,
 			    0, qsp->xfr.ptrs, edp, 0);
 		INSIST(n >= 0);
 	}
@@ -416,7 +428,7 @@ sx_addrr(struct qstream *qsp, const char *dname, struct databuf *dp) {
  * side effects:
  *	if progress was made, header and pointers will be advanced.
  */
-int
+static int
 sx_soarr(struct qstream *qsp) {
 	struct databuf *dp;
 	int added_soa = 0;
@@ -840,11 +852,8 @@ static struct qs_x_lev *
 sx_freelev(struct qs_x_lev *lev) {
 	struct qs_x_lev *next = lev->next;
 
-	if (lev->dp) {
-		DRCNTDEC(lev->dp);
-		if (lev->dp->d_rcnt == 0)
-			db_freedata(lev->dp);
-	}
+	if (lev->dp)
+		db_detach(&lev->dp);
 	memput(lev, sizeof *lev);
 	return (next);
 }
@@ -853,10 +862,7 @@ static struct databuf *
 db_next(struct databuf *dp) {
 	struct databuf *next = dp->d_next;
 
-	DRCNTDEC(dp);
-	if (dp->d_rcnt == 0)
-		db_freedata(dp);
-
+	db_detach(&dp);
 	if (next)
 		DRCNTINC(next);
 

contrib/bind/bin/ndc/ndc.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ndc.c,v 1.16.2.1 2001/04/26 02:56:10 marka Exp $";
+static const char rcsid[] = "$Id: ndc.c,v 1.22 2002/06/24 07:28:55 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -60,7 +60,7 @@ typedef void (*closure)(void *, const char *, int);
 
 static const char *	program = "amnesia";
 static enum { e_channel, e_signals } mode = e_channel;
-static char *	channel = _PATH_NDCSOCK;
+static const char *	channel = _PATH_NDCSOCK;
 static const char	helpfmt[] = "\t%-16s\t%s\n";
 static const char *	pidfile = _PATH_PIDFILE;
 static sockaddr_t	client, server;
@@ -77,23 +77,23 @@ static int		builtincmd(void);
 static void		command(void);
 static int		running(int, pid_t *);
 static void		command_channel(void);
-static void		channel_loop(char *, int, closure, void *);
+static void		channel_loop(const char *, int, closure, void *);
 static void		getpid_closure(void *, const char *, int);
 static void		banner(struct ctl_cctx *, void *, const char *, u_int);
 static void		done(struct ctl_cctx *, void *, const char *, u_int);
-static void		logger(enum ctl_severity, const char *fmt, ...);
+static void		logger(enum ctl_severity, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
 static void		command_signals(void);
 static void		stop_named(pid_t);
 static void		start_named(const char *, int);
 static int		fgetpid(const char *, pid_t *);
-static int		get_sockaddr(char *, sockaddr_t *);
+static int		get_sockaddr(const char *, sockaddr_t *);
 static size_t		impute_addrlen(const struct sockaddr *);
 static void		vtrace(const char *, va_list);
-static void		trace(const char *, ...);
-static void		result(const char *, ...);
-static void		fatal(const char *, ...);
-static void		verror(const char *, va_list);
-static void		error(const char *, ...);
+static void		trace(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
+static void		result(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
+static void		fatal(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
+static void		verror(const char *, va_list) ISC_FORMAT_PRINTF(1, 0);
+static void		error(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
 
 static void
 usage(const char *fmt, ...) {
@@ -114,7 +114,7 @@ usage(const char *fmt, ...) {
 /* Public. */
 
 int
-main(int argc, char *argv[], char *envp[]) {
+main(int argc, char *argv[]) {
 	char *p;
 	int ch;
 
@@ -250,6 +250,179 @@ slashhelp(void) {
 	       "toggle silence (suppresses nonfatal errors)");
 }
 
+struct argv {
+	int argc;
+	char **argv;
+	int error;
+};
+
+static char hexdigits[] = "0123456789abcdef";
+
+static void
+getargs_closure(void *arg, const char *msg, int flags) {
+	struct argv *argv = arg;
+	int len;
+	int i;
+	const char *cp, *cp2;
+	char *tp, c;
+
+	UNUSED(flags);
+
+	if (argv->error)
+		return;
+
+	if (argv->argc == -1) {
+		i = atoi(msg + 4);
+		if (i < 1) {
+			argv->error = 1;
+			return;
+		}
+		argv->argc = i;
+		argv->argv = calloc((i+1), sizeof(char*));
+		return;
+	}
+	len = 0;
+	cp = msg + 4;
+	while (*cp != NULL) {
+		c = *cp;
+		if (c == '%') {
+			cp2 = strchr(hexdigits, cp[1]);
+			if (cp2 == NULL) {
+				argv->error = 1;
+				return;
+			}
+			c = (cp2-hexdigits) << 4;
+			cp2 = strchr(hexdigits, cp[2]);
+			if (cp2 == NULL) {
+				argv->error = 1;
+				return;
+			}
+			c += (cp2-hexdigits);
+			cp += 2;
+		}
+		if (!isalnum((unsigned)c)) {
+			switch (c) {
+			case '+': case '-': case '=': case '/': case '.':
+				break;
+			default:
+				len++;
+			}
+		}
+		len++;
+		cp++;
+	}
+	i = 0;
+	while (argv->argv[i] != NULL)
+		i++;
+	if (i >= argv->argc) {
+		argv->error = 1;
+		return;
+	}
+	argv->argv[i] = malloc(len + 1);
+	if (argv->argv[i] == NULL) {
+		argv->error = 1;
+		return;
+	}
+	cp = msg + 4;
+	tp = argv->argv[i];
+	while (*cp != NULL) {
+		c = *cp;
+		if (c == '%') {
+			cp2 = strchr(hexdigits, cp[1]);
+			if (cp2 == NULL) {
+				argv->error = 1;
+				return;
+			}
+			c = (cp2-hexdigits) << 4;
+			cp2 = strchr(hexdigits, cp[2]);
+			if (cp2 == NULL) {
+				argv->error = 1;
+				return;
+			}
+			c += (cp2-hexdigits);
+			cp += 2;
+		}
+		if (!isalnum((unsigned)c)) {
+			switch (c) {
+			case '+': case '-': case '=': case '/': case '.':
+				break;
+			default:
+				*tp = '\\';
+			}
+		}
+		*tp++ = c;
+		cp++;
+	}
+}
+
+static int
+get_args(char **restp) {
+	struct argv argv;
+	int len, i;
+	char *rest, *p;
+	int result = 1;
+
+	argv.argc = -1;
+	argv.argv = NULL;
+	argv.error = 0;
+
+	channel_loop("args", 1, getargs_closure, &argv);
+	if (argv.error) {
+		result = 0;
+		goto err;
+	}
+	len = 0;
+	for (i = 1 ; i < argv.argc && argv.argv[i] != NULL; i++)
+		len += strlen(argv.argv[i]) + 1;
+	rest = malloc(len);
+	if (rest == NULL) {
+		result = 0;
+		goto err;
+	}
+	p = rest;
+	for (i = 1 ; i < argv.argc && argv.argv[i] != NULL; i++) {
+		strcpy(p, argv.argv[i]);
+		p += strlen(argv.argv[i]);
+		*p++ = ' ';
+	}
+	if (p != rest)
+		p[-1] = '\0';
+	*restp = rest;
+
+ err:
+	if (argv.argv) {
+		for (i = 0 ; i < argv.argc && argv.argv[i] != NULL; i++)
+			free(argv.argv[i]);
+		free(argv.argv);
+	}
+	return (result);
+}
+
+static void
+exec_closure(void *arg, const char *msg, int flags) {
+	int *result = arg;
+	UNUSED(flags);
+	if (atoi(msg) == 250)
+		*result = 1;
+}
+
+static int
+try_exec(int local_quiet) {
+	int good = 0;
+	pid_t pid;
+
+	channel_loop("exec", 1, exec_closure, &good);
+
+	if (good) {
+		sleep(3);
+		if (!running(0, &pid))
+			error("name server has not restarted (yet?)");
+		else if (!local_quiet)
+			result("new pid is %ld", (long)pid);
+	}
+	return (good);
+}
+
 static int
 builtincmd(void) {
 	static const char spaces[] = " \t";
@@ -257,14 +430,18 @@ builtincmd(void) {
 	pid_t pid;
 	int save_quiet = quiet;
 	int len;
+	int freerest = 0;
 
 	quiet = 1;
 
 	len = strcspn(cmd, spaces);
 	rest = cmd + len;
-	if (*rest != '\0') {
-		rest++;
+	if (*rest != '\0')
 		rest += strspn(rest, spaces);
+	if (*rest == '\0' && !strncasecmp(cmd, "restart", len)) {
+		if (try_exec(save_quiet))
+			return (1);
+		freerest = get_args(&rest);
 	}
 	syscmd = malloc(strlen(named_path) + sizeof " " + strlen(rest));
 	if (syscmd == NULL)
@@ -274,6 +451,8 @@ builtincmd(void) {
 		strcat(syscmd, " ");
 		strcat(syscmd, rest);
 	}
+	if (freerest)
+		free(rest);
 	if (strncasecmp(cmd, "start", len) == 0) {
 		if (running(debug, &pid))
 			error("name server already running? (pid %ld)",
@@ -402,7 +581,7 @@ struct args {
 };
 
 static void
-channel_loop(char *cmdtext, int show, closure cl, void *ua) {
+channel_loop(const char *cmdtext, int show, closure cl, void *ua) {
 	struct ctl_cctx *ctl;
 	struct sockaddr *client_addr;
 	struct args a;
@@ -417,6 +596,7 @@ channel_loop(char *cmdtext, int show, closure cl, void *ua) {
 	a.cl = cl;
 	a.ua = ua;
 	logger_show = show;
+	trace("command '%s'", cmdtext);
 	ctl = ctl_client(ev, client_addr, impute_addrlen(client_addr),
 			 (struct sockaddr *)&server,
 			 impute_addrlen((struct sockaddr *)&server),
@@ -457,6 +637,8 @@ static void
 done(struct ctl_cctx *ctl, void *uap, const char *msg, u_int flags) {
 	struct args *a = uap;
 
+	UNUSED(ctl);
+
 	if (msg == NULL) {
 		trace("EOF");
 		doneflag = 1;
@@ -488,6 +670,7 @@ logger(enum ctl_severity ctlsev, const char *format, ...) {
 			verror(format, args);
 		break;
 	default:
+		va_end(args);
 		abort();
 	}
 	va_end(args);
@@ -507,7 +690,7 @@ static struct cmdsig {
 	{ "querylog", SIGWINCH, "toggle query logging" },
 	{ "qrylog", SIGWINCH, "alias for querylog" },
 #endif
-	{ NULL, 0 }
+	{ NULL, 0, NULL }
 };
 
 static void
@@ -599,15 +782,15 @@ fgetpid(const char *f, pid_t *pid) {
 	long t;
 
 	for (try = 0; try < 5; try++) {
-		trace("pidfile is \"%s\" (try #%d)", pidfile, try + 1);
-		if ((fp = fopen(pidfile, "r")) == NULL)
+		trace("pidfile is \"%s\" (try #%d)", f, try + 1);
+		if ((fp = fopen(f, "r")) == NULL)
 			trace("pid file (%s) unavailable - %s",
-			      pidfile, strerror(errno));
+			      f, strerror(errno));
 		else if (fscanf(fp, "%ld\n", &t) != 1)
-			trace("pid file (%s) format is bad", pidfile);
+			trace("pid file (%s) format is bad", f);
 		else if (*pid = (pid_t)t, fclose(fp), kill(*pid, 0) < 0)
 			trace("pid file (%s) contains unusable pid (%d) - %s",
-			      pidfile, *pid, strerror(errno));
+			      f, *pid, strerror(errno));
 		else {
 			trace("pid is %ld", (long)*pid);
 			return (1);
@@ -619,7 +802,7 @@ fgetpid(const char *f, pid_t *pid) {
 }
 
 static int
-get_sockaddr(char *name, sockaddr_t *addr) {
+get_sockaddr(const char *name, sockaddr_t *addr) {
 	char *slash;
 
 #ifndef NO_SOCKADDR_UN
@@ -651,7 +834,7 @@ get_sockaddr(char *name, sockaddr_t *addr) {
 
 static size_t
 impute_addrlen(const struct sockaddr *sa) {
-	if (sa == 0)
+	if (sa == NULL)
 		return (0);
 	switch (sa->sa_family) {
 	case AF_INET:
@@ -663,6 +846,7 @@ impute_addrlen(const struct sockaddr *sa) {
 	default:
 		abort();
 	}
+	/*NOTREACHED*/
 }
 
 static void

contrib/bind/bin/nslookup/Makefile

@@ -13,7 +13,7 @@
 ## ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 ## SOFTWARE.
 
-# $Id: Makefile,v 8.27 2001/01/31 08:44:43 marka Exp $
+# $Id: Makefile,v 8.28 2002/05/21 00:44:59 marka Exp $
 
 DESTDIR=
 CC= cc
@@ -31,7 +31,8 @@ A=a
 O=o
 EXE=
 LEX = lex -I
-SYSLIBS = -ll -lutil
+SYSLIBS =-lutil
+LIBL=-ll
 DESTBIN = /usr/local/bin
 DESTSBIN = /usr/local/sbin
 DESTEXEC = /usr/local/libexec
@@ -56,7 +57,7 @@ all: ${PROG}${EXE}
 
 ${PROG}${EXE}: ${OBJS} ${LIBBIND} Makefile
 	${CC} ${CDEBUG} ${LDFLAGS} ${BOUNDS} -o ${PROG}${EXE} ${OBJS} \
-		${LIBBIND} ${SYSLIBS}
+		${LIBBIND} ${LIBL} ${SYSLIBS}
 
 .c.${O}:
 	${CC} ${CPPFLAGS} ${CFLAGS} ${BOUNDS} -c $*.c

contrib/bind/bin/nslookup/commands.l

@@ -98,6 +98,7 @@ static char sccsid[] = "@(#)commands.l	5.13 (Berkeley) 7/24/90";
 #include <netinet/in.h>
 #include <histedit.h>
 #include "port_after.h"
+#include <resolv.h>
 #include "res.h"
 
 extern char rootServerName[];
@@ -159,9 +160,9 @@ nslookup_yy_input(buf, result, max_size, intr)
 
 %}
 WS	[ \t]
-FLET	[A-Za-z0-9.*\\_]
-LET	[A-Za-z0-9.*_]
-NAME	[A-Za-z0-9.*=_/-]
+FLET	[:A-Za-z0-9.*\\_]
+LET	[:A-Za-z0-9.*_]
+NAME	[:A-Za-z0-9.*=_/-]
 %%
 ^{WS}*server{WS}+{LET}{NAME}*{WS}*$	{
 					    /*
@@ -170,11 +171,11 @@ NAME	[A-Za-z0-9.*=_/-]
 					     * 1 == use original server to find
 					     *	    the new one.
 					     */
-					    SetDefaultServer(yytext, 0);
+					    SetDefaultServer((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*lserver{WS}+{LET}{NAME}*{WS}*$	{
-					    SetDefaultServer(yytext, 1);
+					    SetDefaultServer((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*exit{WS}*$			{
@@ -190,11 +191,11 @@ NAME	[A-Za-z0-9.*=_/-]
 					     *  0 == output to stdout
 					     *  1 == output to file
 					     */
-					    Finger(yytext, 1);
+					    Finger((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*finger({WS}+{LET}{NAME}*)?{WS}*$	{
-					    Finger(yytext, 0);
+					    Finger((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*ls{WS}+(("-a"|"-d"|"-h"|"-m"|"-s"){WS}+)?{LET}{NAME}*{WS}+>>?{WS}+{NAME}+{WS}*$	{
@@ -203,11 +204,11 @@ NAME	[A-Za-z0-9.*=_/-]
 					     *  0 == output to stdout
 					     *  1 == output to file
 					     */
-					    ListHosts(yytext, 1);
+					    ListHosts((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*ls{WS}+(("-a"|"-d"|"-h"|"-m"|"-s"){WS}+)?{LET}{NAME}*{WS}*$	{
-					    ListHosts(yytext, 0);
+					    ListHosts((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*ls{WS}+-t{WS}+({LET}{NAME}*{WS}+)?{LET}{NAME}*{WS}+>>?{WS}+{NAME}+{WS}*$ {
@@ -216,15 +217,15 @@ NAME	[A-Za-z0-9.*=_/-]
 					     *  0 == output to stdout
 					     *  1 == output to file
 					     */
-					    ListHostsByType(yytext, 1);
+					    ListHostsByType((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*ls{WS}+-t{WS}+({LET}{NAME}*{WS}+)?{LET}{NAME}*{WS}*$ {
-					    ListHostsByType(yytext, 0);
+					    ListHostsByType((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*set{WS}+{NAME}+{WS}*$		{
-					    SetOption(yytext);
+					    SetOption((char*)yytext);
 					    return(1);
 					}
 ^{WS}*help{WS}*$			{
@@ -242,11 +243,11 @@ NAME	[A-Za-z0-9.*=_/-]
 					     * 0 == output to stdout
 					     * 1 == output to file
 					     */
-					    LookupHost(yytext, 1);
+					    LookupHost((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*{FLET}{NAME}*{WS}*$		{
-					    LookupHost(yytext, 0);
+					    LookupHost((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*{FLET}{NAME}*{WS}+{LET}{NAME}*{WS}+>>?{WS}*{NAME}+{WS}*$	{
@@ -254,11 +255,11 @@ NAME	[A-Za-z0-9.*=_/-]
 					     * 0 == output to stdout
 					     * 1 == output to file
 					     */
-					    LookupHostWithServer(yytext, 1);
+					    LookupHostWithServer((char*)yytext, 1);
 					    return(1);
 					}
 ^{WS}*{FLET}{NAME}*{WS}+{LET}{NAME}*{WS}*$	{
-					    LookupHostWithServer(yytext, 0);
+					    LookupHostWithServer((char*)yytext, 0);
 					    return(1);
 					}
 ^{WS}*\n				{
@@ -266,7 +267,7 @@ NAME	[A-Za-z0-9.*=_/-]
 					}
 ^.*\n					{
 					    printf("Unrecognized command: %s",
-							yytext);
+							(char*)yytext);
 					    return(1);
 					}
 \n					{ ; }

contrib/bind/bin/nslookup/debug.c

@@ -54,7 +54,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)debug.c	5.26 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: debug.c,v 8.17 2000/11/08 06:47:31 marka Exp $";
+static const char rcsid[] = "$Id: debug.c,v 8.19 2001/09/25 04:50:26 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -115,12 +115,12 @@ Fprint_query(const u_char *msg, const u_char *eom, int printHeader, FILE *file)
 	const u_char *cp;
 	const HEADER *hp;
 	int n;
-	u_int class, type;
+	u_int class, type = 0;
 
 	/*
 	 * Print header fields.
 	 */
-	hp = (HEADER *)msg;
+	hp = (const HEADER *)msg;
 	cp = msg + HFIXEDSZ;
 	if (printHeader || (res.options & RES_DEBUG2)) {
 		fprintf(file,"    HEADER:\n");
@@ -164,9 +164,9 @@ Fprint_query(const u_char *msg, const u_char *eom, int printHeader, FILE *file)
 			cp = Print_cdname(cp, msg, eom, file);
 			if (cp == NULL)
 				return;
-			type = ns_get16((u_char*)cp);
+			type = ns_get16((const u_char*)cp);
 			cp += INT16SZ;
-			class = ns_get16((u_char*)cp);
+			class = ns_get16((const u_char*)cp);
 			cp += INT16SZ;
 			fprintf(file,", type = %s", p_type(type));
 			fprintf(file,", class = %s\n", p_class(class));
@@ -219,7 +219,7 @@ Fprint_query(const u_char *msg, const u_char *eom, int printHeader, FILE *file)
 	fprintf(file,"\n------------\n");
 }
 
-const u_char *
+static const u_char *
 Print_cdname_sub(const u_char *cp, const u_char *msg, const u_char *eom,
 		 FILE *file, int format)
 {
@@ -325,16 +325,16 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
 
 	case T_MX:
 		BOUNDS_CHECK(cp, INT16SZ);
-		fprintf(file,"\tpreference = %u",ns_get16((u_char*)cp));
+		fprintf(file,"\tpreference = %u",ns_get16((const u_char*)cp));
 		cp += INT16SZ;
 		fprintf(file,", mail exchanger = ");
 		goto doname;
 
 	case T_NAPTR:
 		BOUNDS_CHECK(cp, 2 * INT16SZ);
-		fprintf(file, "\torder = %u",ns_get16((u_char*)cp));
+		fprintf(file, "\torder = %u",ns_get16((const u_char*)cp));
 		cp += INT16SZ;
-		fprintf(file,", preference = %u\n", ns_get16((u_char*)cp));
+		fprintf(file,", preference = %u\n", ns_get16((const u_char*)cp));
 		cp += INT16SZ;
 		/* Flags */
 		BOUNDS_CHECK(cp, 1);
@@ -366,11 +366,11 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
 
 	case T_SRV: 
 		BOUNDS_CHECK(cp, 3 * INT16SZ);
-		fprintf(file, "\tpriority = %u",ns_get16((u_char*)cp));
+		fprintf(file, "\tpriority = %u",ns_get16((const u_char*)cp));
 		cp += INT16SZ;
-		fprintf(file,", weight = %u", ns_get16((u_char*)cp));
+		fprintf(file,", weight = %u", ns_get16((const u_char*)cp));
 		cp += INT16SZ;
-		fprintf(file,", port= %u\n", ns_get16((u_char*)cp));
+		fprintf(file,", port= %u\n", ns_get16((const u_char*)cp));
 		cp += INT16SZ;
 
 		fprintf(file,"\thost = ");
@@ -378,7 +378,7 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
 
         case T_PX:
 		BOUNDS_CHECK(cp, INT16SZ);
-                fprintf(file,"\tpreference = %u",ns_get16((u_char*)cp));
+                fprintf(file,"\tpreference = %u",ns_get16((const u_char*)cp));
                 cp += INT16SZ;
                 fprintf(file,", RFC 822 = ");
                 cp = Print_cdname(cp, msg, eom, file);
@@ -397,14 +397,14 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
 
 	case T_RT:
 		BOUNDS_CHECK(cp, INT16SZ);
-		fprintf(file,"\tpreference = %u",ns_get16((u_char*)cp));
+		fprintf(file,"\tpreference = %u",ns_get16((const u_char*)cp));
 		cp += INT16SZ;
 		fprintf(file,", router = ");
 		goto doname;
 
 	case T_AFSDB:
 		BOUNDS_CHECK(cp, INT16SZ);
-		fprintf(file,"\tsubtype = %d",ns_get16((u_char*)cp));
+		fprintf(file,"\tsubtype = %d",ns_get16((const u_char*)cp));
 		cp += INT16SZ;
 		fprintf(file,", DCE/AFS server = ");
 		goto doname;
@@ -471,18 +471,18 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
 			return (NULL);			/* compression error */
 		}
 		BOUNDS_CHECK(cp, 5 * INT32SZ);
-		fprintf(file,"\n\tserial = %lu", ns_get32((u_char*)cp));
+		fprintf(file,"\n\tserial = %lu", ns_get32((const u_char*)cp));
 		cp += INT32SZ;
-		ttl = ns_get32((u_char*)cp);
+		ttl = ns_get32((const u_char*)cp);
 		fprintf(file,"\n\trefresh = %lu (%s)", ttl, p_time(ttl));
 		cp += INT32SZ;
-		ttl = ns_get32((u_char*)cp);
+		ttl = ns_get32((const u_char*)cp);
 		fprintf(file,"\n\tretry   = %lu (%s)", ttl, p_time(ttl));
 		cp += INT32SZ;
-		ttl = ns_get32((u_char*)cp);
+		ttl = ns_get32((const u_char*)cp);
 		fprintf(file,"\n\texpire  = %lu (%s)", ttl, p_time(ttl));
 		cp += INT32SZ;
-		ttl = ns_get32((u_char*)cp);
+		ttl = ns_get32((const u_char*)cp);
 		fprintf(file,
 		    "\n\tminimum ttl = %lu (%s)\n", ttl, p_time(ttl));
 		cp += INT32SZ;

contrib/bind/bin/nslookup/getinfo.c

@@ -54,7 +54,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)getinfo.c	5.26 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: getinfo.c,v 8.18 2001/02/27 06:03:40 vixie Exp $";
+static const char rcsid[] = "$Id: getinfo.c,v 8.27 2002/05/22 04:06:57 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -80,18 +80,19 @@ static const char rcsid[] = "$Id: getinfo.c,v 8.18 2001/02/27 06:03:40 vixie Exp
 #include <arpa/inet.h>
 
 #include <ctype.h>
-#include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "port_after.h"
 
+#include <resolv.h>
+
 #include "res.h"
 
-extern char *res_skip();
-
 static char *addr_list[MAXADDRS + 1];
+static int addr_len[MAXADDRS + 1];
+static int addr_type[MAXADDRS + 1];
 
 static char *host_aliases[MAXALIASES];
 static int   host_aliases_len[MAXALIASES];
@@ -102,6 +103,8 @@ typedef struct {
     char *domain[MAXDOMAINS];
     int   numDomains;
     char *address[MAXADDRS];
+    char len[MAXADDRS];
+    char type[MAXADDRS];
     int   numAddresses;
 } ServerTable;
 
@@ -139,41 +142,45 @@ typedef union {
  */
 
 static int
-GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
-    struct in_addr	*nsAddrPtr;
-    char		*msg;
-    int			queryType;
-    int			msglen;
-    Boolean		iquery;
-    register HostInfo	*hostPtr;
-    Boolean		isServer;
+GetAnswer(union res_sockaddr_union *nsAddrPtr, int queryType,
+	  char *msg, int msglen, Boolean iquery, HostInfo *hostPtr,
+	  Boolean isServer, Boolean merge)
 {
     register HEADER	*headerPtr;
-    register u_char	*cp;
+    register const u_char	*cp;
     querybuf		answer;
     char		**aliasPtr;
     u_char		*eom, *bp;
     char		**addrPtr;
+    int			*lenPtr;
+    int			*typePtr;
     char		*namePtr;
     char		*dnamePtr;
     int			type, class;
     int			qdcount, ancount, arcount, nscount, buflen;
-    int			origClass;
+    int			origClass = 0;
     int			numAliases = 0;
     int			numAddresses = 0;
-    int			n, i, j;
+    int			n, i, j, k, l, m;
     int			dlen;
     int			status;
     int			numServers;
     size_t		s;
     Boolean		haveAnswer;
     Boolean		printedAnswers = FALSE;
+    int			oldAliases;
+    char		**newAliases;
+    int			oldServers;
+    ServerInfo		**newServers;
+    int			oldAddresses;
+    AddrInfo	 	**newAddresses;
 
 
     /*
      *  If the hostPtr was used before, free up the calloc'd areas.
      */
-    FreeHostInfoPtr(hostPtr);
+    if (!merge)
+	    FreeHostInfoPtr(hostPtr);
 
     status = SendRequest(nsAddrPtr, (u_char *)msg, msglen, (u_char *) &answer,
 			 sizeof(answer), &n);
@@ -221,6 +228,8 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 
     aliasPtr	= host_aliases;
     addrPtr	= addr_list;
+    lenPtr	= addr_len;
+    typePtr	= addr_type;
     haveAnswer	= FALSE;
 
     /*
@@ -237,10 +246,11 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 	    printf("Non-authoritative answer:\n");
 	}
 
-	if (queryType != T_A && !(iquery && queryType == T_PTR)) {
+	if (queryType != T_A && queryType != T_AAAA &&	/* A6? */
+	    !(iquery && queryType == T_PTR)) {
 	    while (--ancount >= 0 && cp < eom) {
-		if ((cp = (u_char *)Print_rr(cp,
-		    (u_char *)&answer, eom, stdout)) == NULL) {
+		if ((cp = Print_rr(cp, (u_char *)&answer,
+				   eom, stdout)) == NULL) {
 		    return(ERROR);
 		}
 	    }
@@ -289,36 +299,34 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 		    memcpy(hostPtr->name, bp, s);
 		    haveAnswer = TRUE;
 		    break;
-		} else if (type != T_A) {
+		} else if (type != T_A && type != T_AAAA) {
 		    cp += dlen;
 		    continue;
 		}
-		if (dlen != INADDRSZ)
+		if (type == T_A && dlen != INADDRSZ)
+			return (ERROR);
+		if (type == T_AAAA && dlen != 16)
 			return (ERROR);
 		if (haveAnswer) {
 		    /*
 		     * If we've already got 1 address, we aren't interested
-		     * in addresses with a different length or class.
+		     * in addresses with a different class.
 		     */
-		    if (dlen != hostPtr->addrLen) {
-			cp += dlen;
-			continue;
-		    }
 		    if (class != origClass) {
 			cp += dlen;
 			continue;
 		    }
 		} else {
 		    /*
-		     * First address: record its length and class so we
-		     * only save additonal ones with the same attributes.
+		     * First address: record its class so we only save
+		     * additonal ones with the same attributes.
 		     */
-		    hostPtr->addrLen = dlen;
 		    origClass = class;
-		    hostPtr->addrType = (class == C_IN) ? AF_INET : AF_UNSPEC;
-		    s = strlen((char *)bp) + 1;
-		    hostPtr->name = Calloc(1, s);
-		    memcpy(hostPtr->name, bp, s);
+		    if (hostPtr->name == NULL) {
+			s = strlen((char *)bp) + 1;
+			hostPtr->name = Calloc(1, s);
+			memcpy(hostPtr->name, bp, s);
+		    }
 		}
 		bp += (((u_long)bp) % sizeof(align));
 
@@ -334,6 +342,10 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 			continue;
 		}
 		memcpy(*addrPtr++ = (char *)bp, cp, dlen);
+		*lenPtr++ = dlen;
+		*typePtr++ = (class == C_IN) ?
+				      ((type == T_A) ? AF_INET : AF_INET6) :
+				      AF_UNSPEC;
 		bp += dlen;
 		cp += dlen;
 		numAddresses++;
@@ -342,31 +354,74 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 	}
     }
 
-    if ((queryType == T_A || queryType == T_PTR) && haveAnswer) {
+    if ((queryType == T_A || queryType == T_AAAA || queryType == T_PTR) &&
+	 haveAnswer) {
 
 	/*
 	 *  Go through the alias and address lists and return them
 	 *  in the hostPtr variable.
 	 */
 
+	oldAliases = 0;
+	if (merge && hostPtr->aliases != NULL) {
+		while (hostPtr->aliases[oldAliases] != NULL)
+			oldAliases++;
+	}
 	if (numAliases > 0) {
-	    hostPtr->aliases =
-		(char **) Calloc(1 + numAliases, sizeof(char *));
-	    for (i = 0; i < numAliases; i++) {
-		hostPtr->aliases[i] = Calloc(1, host_aliases_len[i]);
-		memcpy(hostPtr->aliases[i], host_aliases[i],
-		       host_aliases_len[i]);
+	    newAliases =
+		(char **) Calloc(1 + numAliases + oldAliases, sizeof(char *));
+	    if (merge && hostPtr->aliases != NULL) {
+		memcpy(newAliases, hostPtr->aliases,
+		       oldAliases * sizeof(char *)); 
+		free(hostPtr->aliases);
 	    }
-	    hostPtr->aliases[i] = NULL;
+	    hostPtr->aliases = newAliases;
+	    k = oldAliases;
+	    for (i = 0; i < numAliases; i++) {
+		for (l = 0; l < k; l++)
+		    if (!strcasecmp(hostPtr->aliases[l], host_aliases[i]))
+			break;
+		if (l < k)
+		    continue;
+		hostPtr->aliases[k] = Calloc(1, host_aliases_len[i]);
+		memcpy(hostPtr->aliases[k], host_aliases[i],
+		       host_aliases_len[i]);
+		k++;
+	    }
+	    hostPtr->aliases[k] = NULL;
+	}
+	oldAddresses = 0;
+	if (merge && hostPtr->addrList != NULL) {
+		while (hostPtr->addrList[oldAddresses] != NULL)
+			oldAddresses++;
 	}
 	if (numAddresses > 0) {
-	    hostPtr->addrList =
-		(char **)Calloc(1+numAddresses, sizeof(char *));
-	    for (i = 0; i < numAddresses; i++) {
-		hostPtr->addrList[i] = Calloc(1, hostPtr->addrLen);
-		memcpy(hostPtr->addrList[i], addr_list[i], hostPtr->addrLen);
+	    newAddresses =
+		(AddrInfo **)Calloc(1+numAddresses, sizeof(AddrInfo *));
+	    if (merge && hostPtr->addrList != NULL) {
+		memcpy(newAddresses, hostPtr->addrList,
+		       oldAddresses * sizeof(char *)); 
+		free(hostPtr->addrList);
 	    }
-	    hostPtr->addrList[i] = NULL;
+	    hostPtr->addrList = newAddresses;
+	    k = oldAddresses;
+	    for (i = 0; i < numAddresses; i++) {
+		for (l = 0; l < k; l++)
+		    if (hostPtr->addrList[l]->addrType == addr_type[i] &&
+			hostPtr->addrList[l]->addrLen == addr_len[i] &&
+			!memcmp(hostPtr->addrList[l]->addr, addr_list[i],
+				addr_len[i]))
+			break;
+		if (l < k)
+		    continue;
+		hostPtr->addrList[k] = (AddrInfo*)Calloc(1, sizeof(AddrInfo));
+		hostPtr->addrList[k]->addr = Calloc(1, addr_len[i]);
+		hostPtr->addrList[k]->addrType = addr_type[i];
+		hostPtr->addrList[k]->addrLen = addr_len[i];
+		memcpy(hostPtr->addrList[k]->addr, addr_list[i], addr_len[i]);
+		k++;
+	    }
+	    hostPtr->addrList[k] = NULL;
 	}
 #ifdef verbose
 	if (headerPtr->aa || nscount == 0) {
@@ -385,23 +440,24 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
      * in the additional resource records part.
      */
 
-    if (!headerPtr->aa && (queryType != T_A) && (nscount > 0 || arcount > 0)) {
+    if (!headerPtr->aa && (queryType != T_A) && (queryType != T_AAAA) &&
+	(nscount > 0 || arcount > 0)) {
 	if (printedAnswers) {
 	    putchar('\n');
 	}
 	printf("Authoritative answers can be found from:\n");
     }
 
-    cp = (u_char *)res_skip((char *) &answer, 2, eom);
+    cp = res_skip((u_char *)&answer, 2, eom);
 
     numServers = 0;
-    if (queryType != T_A) {
+    if (queryType != T_A && queryType != T_AAAA) {
 	/*
 	 * If we don't need to save the record, just print it.
 	 */
 	while (--nscount >= 0 && cp < eom) {
-	    if ((cp = (u_char *)Print_rr(cp,
-		(u_char *) &answer, eom, stdout)) == NULL) {
+	    if ((cp = Print_rr(cp, (u_char *) &answer, 
+			       eom, stdout)) == NULL) {
 		return(ERROR);
 	    }
 	}
@@ -449,7 +505,7 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 		 */
 		found = FALSE;
 		for (j = 0; j < numServers; j++) {
-		    if (strcmp(namePtr, server[j].name) == 0) {
+		    if (strcasecmp(namePtr, server[j].name) == 0) {
 			found = TRUE;
 			free(namePtr);
 			break;
@@ -477,15 +533,15 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
     /*
      * Additional resource records contain addresses of servers.
      */
-    cp = (u_char *)res_skip((char *) &answer, 3, eom);
+    cp = res_skip((u_char*)&answer, 3, eom);
 
-    if (queryType != T_A) {
+    if (queryType != T_A && queryType != T_AAAA) {
 	/*
 	 * If we don't need to save the record, just print it.
 	 */
 	while (--arcount >= 0 && cp < eom) {
-	    if ((cp = (u_char *)Print_rr(cp,
-		(u_char *) &answer, eom, stdout)) == NULL) {
+	    if ((cp = Print_rr(cp, (u_char *) &answer,
+			       eom, stdout)) == NULL) {
 		return(ERROR);
 	    }
 	}
@@ -505,20 +561,25 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 	    if (cp + dlen > eom)
 		    return (ERROR);
 
-	    if (type != T_A)  {
+	    if (type != T_A && type != T_AAAA)  {
 		cp += dlen;
 		continue;
 	    } else {
-		if (dlen != INADDRSZ)
+		if (type == T_A && dlen != INADDRSZ)
+			return (ERROR);
+		if (type == T_AAAA && dlen != 16)
 			return (ERROR);
 		for (j = 0; j < numServers; j++) {
-		    if (strcmp((char *)bp, server[j].name) == 0) {
+		    if (strcasecmp((char *)bp, server[j].name) == 0) {
 			server[j].numAddresses++;
 			if (server[j].numAddresses <= MAXADDRS) {
 			    server[j].address[server[j].numAddresses-1] = 
 				    				Calloc(1,dlen);
 			    memcpy(server[j].address[server[j].numAddresses-1],
 				   cp, dlen);
+			    server[j].len[server[j].numAddresses-1] = dlen;
+			    server[j].type[server[j].numAddresses-1] =
+					   (type == T_A) ? AF_INET : AF_INET6;
 			    break;
 			}
 		    }
@@ -531,35 +592,88 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
     /*
      * If we are returning name server info, transfer it to the hostPtr.
      */
+    oldServers = 0;
+    if (merge && hostPtr->servers != NULL) {
+	while (hostPtr->servers[oldServers] != NULL)
+	    oldServers++;
+    }
     if (numServers > 0) {
-	hostPtr->servers = (ServerInfo **)
-				Calloc(numServers+1, sizeof(ServerInfo *));
-
-	for (i = 0; i < numServers; i++) {
-	    hostPtr->servers[i] = (ServerInfo *) Calloc(1, sizeof(ServerInfo));
-	    hostPtr->servers[i]->name = server[i].name;
-
-
-	    hostPtr->servers[i]->domains = (char **)
-				Calloc(server[i].numDomains+1,sizeof(char *));
-	    for (j = 0; j < server[i].numDomains; j++) {
-		hostPtr->servers[i]->domains[j] = server[i].domain[j];
-	    }
-	    hostPtr->servers[i]->domains[j] = NULL;
-
-
-	    hostPtr->servers[i]->addrList = (char **)
-				Calloc(server[i].numAddresses+1,sizeof(char *));
-	    for (j = 0; j < server[i].numAddresses; j++) {
-		hostPtr->servers[i]->addrList[j] = server[i].address[j];
-	    }
-	    hostPtr->servers[i]->addrList[j] = NULL;
-
+	newServers = (ServerInfo **) Calloc(numServers+oldServers+1,
+				       sizeof(ServerInfo *));
+	if (merge && hostPtr->servers != NULL) {
+		memcpy(newServers, hostPtr->servers,
+		       oldServers * sizeof(ServerInfo *));
+		free(hostPtr->servers);
 	}
-	hostPtr->servers[i] = NULL;
+	hostPtr->servers = newServers;
+	k = oldServers;
+	for (i = 0; i < numServers; i++) {
+	    for (l = 0; l < k; l++)
+		if (!strcasecmp(hostPtr->servers[l]->name, server[i].name))
+		    break;
+	    if (l < k) { 
+		free(server[i].name);
+		for (j = 0; j < server[i].numDomains; j++)
+		     free(server[i].domain[j]);
+	    } else {
+		hostPtr->servers[l] = (ServerInfo *)
+				 Calloc(1, sizeof(ServerInfo));
+		hostPtr->servers[l]->name = server[i].name;
+		k++;
+
+		hostPtr->servers[l]->domains = (char **)
+				Calloc(server[i].numDomains+1,sizeof(char *));
+		for (j = 0; j < server[i].numDomains; j++) {
+		    hostPtr->servers[l]->domains[j] = server[i].domain[j];
+		}
+		hostPtr->servers[l]->domains[j] = NULL;
+	    }
+
+
+	    oldAddresses = 0;
+	    if (merge && hostPtr->servers[l]->addrList != NULL)
+		while (hostPtr->servers[l]->addrList[oldAddresses] != NULL)
+			oldAddresses++;
+	    newAddresses = (AddrInfo **)
+			Calloc(server[i].numAddresses+oldAddresses+1,
+			       sizeof(AddrInfo *));
+	    if (merge && hostPtr->servers[l]->addrList != NULL) {
+		memcpy(newAddresses, hostPtr->servers[l]->addrList,
+		       sizeof(AddrInfo *) * oldAddresses);
+		free(hostPtr->servers[l]->addrList);
+	    }
+	    hostPtr->servers[l]->addrList = newAddresses;
+	    m = oldAddresses;
+	    for (j = 0; j < server[l].numAddresses; j++) {
+		for (n = 0; n < m; n++)
+		    if (hostPtr->servers[l]->addrList[n]->addrType ==
+			server[i].type[j] &&
+			hostPtr->servers[l]->addrList[n]->addrLen ==
+			server[i].len[j] &&
+			!memcmp(hostPtr->servers[l]->addrList[n]->addr,
+				server[i].address[j], server[i].len[j]))
+			break;
+		if (n < m) {
+		    free(server[i].address[j]);
+		    continue;
+		}
+		hostPtr->servers[l]->addrList[m] =
+				 (AddrInfo*)Calloc(1, sizeof(AddrInfo));
+		hostPtr->servers[l]->addrList[m]->addr =
+					 server[i].address[j];
+		hostPtr->servers[l]->addrList[m]->addrType =
+					 server[i].type[j];
+		hostPtr->servers[l]->addrList[m]->addrLen =
+					 server[i].len[j];
+		m++;
+	    }
+	    hostPtr->servers[l]->addrList[m] = NULL;
+	}
+	hostPtr->servers[k] = NULL;
     }
 
     switch (queryType) {
+	case T_AAAA:
 	case T_A:
 		return NONAUTH;
 	case T_PTR:
@@ -589,20 +703,22 @@ GetAnswer(nsAddrPtr, queryType, msg, msglen, iquery, hostPtr, isServer)
 */
 
 int
-GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
-    struct in_addr	*nsAddrPtr;
+GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer,
+		  merge)
+    union res_sockaddr_union *nsAddrPtr;
     int			queryClass;
     int			queryType;
-    char		*name;
+    const char		*name;
     HostInfo		*hostPtr;
     Boolean		isServer;
+    Boolean		merge;
 {
     int			n;
     register int	result;
     register char	**domain;
     const char		*cp;
     Boolean		got_nodata = FALSE;
-    struct in_addr	ina;
+    union res_sockaddr_union ina;
     Boolean		tried_as_is = FALSE;
     char		tmp[NS_MAXDNAME];
 
@@ -610,14 +726,30 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
     if ((queryType == T_A) && IsAddr(name, &ina)) {
 	hostPtr->name = Calloc(strlen(name)+3, 1);
 	(void)sprintf(hostPtr->name,"[%s]",name);
-	hostPtr->aliases = NULL;
-	hostPtr->servers = NULL;
-	hostPtr->addrType = AF_INET;
-	hostPtr->addrLen = INADDRSZ;
-	hostPtr->addrList = (char **)Calloc(2, sizeof(char *));
-	hostPtr->addrList[0] = Calloc(INT32SZ, sizeof(char));
-	memcpy(hostPtr->addrList[0], &ina, INADDRSZ);
-	hostPtr->addrList[1] = NULL;
+	switch (ina.sin.sin_family) {
+	case AF_INET:
+	    hostPtr->aliases = NULL;
+	    hostPtr->servers = NULL;
+	    hostPtr->addrList = (AddrInfo **)Calloc(2, sizeof(AddrInfo *));
+	    hostPtr->addrList[0] = (AddrInfo *)Calloc(1, sizeof(AddrInfo));
+	    hostPtr->addrList[0]->addr = Calloc(INT32SZ, sizeof(char));
+	    memcpy(hostPtr->addrList[0]->addr, &ina.sin.sin_addr, INADDRSZ);
+	    hostPtr->addrList[0]->addrType = AF_INET;
+	    hostPtr->addrList[0]->addrLen = INADDRSZ;
+	    hostPtr->addrList[1] = NULL;
+	    break;
+	case AF_INET6:
+	    hostPtr->aliases = NULL;
+	    hostPtr->servers = NULL;
+	    hostPtr->addrList = (AddrInfo **)Calloc(2, sizeof(AddrInfo *));
+	    hostPtr->addrList[0] = (AddrInfo *)Calloc(1, sizeof(AddrInfo));
+	    hostPtr->addrList[0]->addr = Calloc(1, 16);
+	    memcpy(hostPtr->addrList[0]->addr, &ina.sin6.sin6_addr, 16);
+	    hostPtr->addrList[0]->addrType = AF_INET6;
+	    hostPtr->addrList[0]->addrLen = 16;
+	    hostPtr->addrList[1] = NULL;
+	    break;
+	}
 	return(SUCCESS);
     }
 
@@ -628,7 +760,7 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
     if (n == 0 && (cp = res_hostalias(&res, name, tmp, sizeof tmp))) {
 	    printf("Aliased to \"%s\"\n\n", cp);
 	    return (GetHostDomain(nsAddrPtr, queryClass, queryType,
-		    cp, (char *)NULL, hostPtr, isServer));
+		    cp, (char *)NULL, hostPtr, isServer, merge));
     }
 
     /*
@@ -637,7 +769,8 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
      */
     if (n >= (int)res.ndots) {
 	    result = GetHostDomain(nsAddrPtr, queryClass, queryType,
-				   name, (char *)NULL, hostPtr, isServer);
+				   name, (char *)NULL, hostPtr, isServer,
+				   merge);
             if (result == SUCCESS)
 	        return (result);
 	    if (result == NO_INFO)
@@ -655,7 +788,8 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
        (n != 0 && *--cp != '.' && (res.options & RES_DNSRCH) != 0))
 	 for (domain = res.dnsrch; *domain != NULL; domain++) {
 	    result = GetHostDomain(nsAddrPtr, queryClass, queryType,
-				   name, *domain, hostPtr, isServer);
+				   name, *domain, hostPtr, isServer,
+				   merge);
 	    /*
 	     * If no server present, give up.
 	     * If name isn't found in this domain,
@@ -682,7 +816,7 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
      */
     if (!tried_as_is &&
 	(result = GetHostDomain(nsAddrPtr, queryClass, queryType,
-				name, (char *)NULL, hostPtr, isServer)
+				name, (char *)NULL, hostPtr, isServer, merge)
 	 ) == SUCCESS)
 	    return (result);
     if (got_nodata)
@@ -695,17 +829,20 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
  * removing a trailing dot from name if domain is NULL.
  */
 int
-GetHostDomain(nsAddrPtr, queryClass, queryType, name, domain, hostPtr, isServer)
-    struct in_addr	*nsAddrPtr;
+GetHostDomain(nsAddrPtr, queryClass, queryType, name, domain, hostPtr,
+	      isServer, merge)
+    union res_sockaddr_union	*nsAddrPtr;
     int			queryClass;
     int			queryType;
-    char		*name, *domain;
+    const char		*name;
+    char		*domain;
     HostInfo		*hostPtr;
     Boolean		isServer;
+    Boolean		merge;
 {
     querybuf buf;
     char nbuf[2*MAXDNAME+2];
-    char *longname = nbuf;
+    const char *longname = nbuf;
     int n;
 
     if (domain == NULL) {
@@ -714,7 +851,7 @@ GetHostDomain(nsAddrPtr, queryClass, queryType, name, domain, hostPtr, isServer)
 	     * copy without '.' if present.
 	     */
 	    n = strlen(name) - 1;
-	    if (name[n] == '.' && n < sizeof(nbuf) - 1) {
+	    if (name[n] == '.' && n < (int)sizeof(nbuf) - 1) {
 		    memcpy(nbuf, name, n);
 		    nbuf[n] = '\0';
 	    } else
@@ -733,7 +870,8 @@ GetHostDomain(nsAddrPtr, queryClass, queryType, name, domain, hostPtr, isServer)
 	return (ERROR);
     }
 
-    n = GetAnswer(nsAddrPtr, queryType, (char *)&buf, n, 0, hostPtr, isServer);
+    n = GetAnswer(nsAddrPtr, queryType, (char *)&buf, n, 0, hostPtr,
+		  isServer, merge);
 
     /*
      * GetAnswer didn't find a name, so set it to the specified one.
@@ -766,21 +904,76 @@ GetHostDomain(nsAddrPtr, queryClass, queryType, name, domain, hostPtr, isServer)
 */
 
 int
-GetHostInfoByAddr(nsAddrPtr, address, hostPtr)
-    struct in_addr	*nsAddrPtr;
-    struct in_addr	*address;
-    HostInfo		*hostPtr;
+GetHostInfoByAddr(union res_sockaddr_union *nsAddrPtr,
+		  union res_sockaddr_union *address,
+		  HostInfo * hostPtr)
 {
     int		n;
     querybuf	buf;
     char	qbuf[MAXDNAME];
-    char	*p = (char *) &address->s_addr;
+    char	qbuf2[MAXDNAME];
+    char	*p = NULL;
+    int		ismapped = 0;
 
-    (void)sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-	    ((unsigned)p[3] & 0xff),
-	    ((unsigned)p[2] & 0xff),
-	    ((unsigned)p[1] & 0xff),
-	    ((unsigned)p[0] & 0xff));
+    switch (address->sin.sin_family) {
+    case AF_INET:
+        p = (char *) &address->sin.sin_addr.s_addr;
+    mapped:
+	(void)sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
+		      ((unsigned)p[3 + (ismapped ? 12 : 0)] & 0xff),
+		      ((unsigned)p[2 + (ismapped ? 12 : 0)] & 0xff),
+		      ((unsigned)p[1 + (ismapped ? 12 : 0)] & 0xff),
+		      ((unsigned)p[0 + (ismapped ? 12 : 0)] & 0xff));
+	break;
+    case AF_INET6:
+	p = (char *)address->sin6.sin6_addr.s6_addr;
+	if (IN6_IS_ADDR_V4MAPPED(&address->sin6.sin6_addr) ||
+	    IN6_IS_ADDR_V4COMPAT(&address->sin6.sin6_addr)) {
+		ismapped = 1;
+		goto mapped;
+	}
+	(void)sprintf(qbuf,
+		      "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		      "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		      "ip6.arpa",
+		      p[15] & 0xf, (p[15] >> 4) & 0xf,
+		      p[14] & 0xf, (p[14] >> 4) & 0xf,
+		      p[13] & 0xf, (p[13] >> 4) & 0xf,
+		      p[12] & 0xf, (p[12] >> 4) & 0xf,
+		      p[11] & 0xf, (p[11] >> 4) & 0xf,
+		      p[10] & 0xf, (p[10] >> 4) & 0xf,
+		      p[9] & 0xf, (p[9] >> 4) & 0xf,
+		      p[8] & 0xf, (p[8] >> 4) & 0xf,
+		      p[7] & 0xf, (p[7] >> 4) & 0xf,
+		      p[6] & 0xf, (p[4] >> 4) & 0xf,
+		      p[5] & 0xf, (p[5] >> 4) & 0xf,
+		      p[4] & 0xf, (p[4] >> 4) & 0xf,
+		      p[3] & 0xf, (p[3] >> 4) & 0xf,
+		      p[2] & 0xf, (p[2] >> 4) & 0xf,
+		      p[1] & 0xf, (p[1] >> 4) & 0xf,
+		      p[0] & 0xf, (p[0] >> 4) & 0xf);
+	(void)sprintf(qbuf2,
+		      "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		      "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		      "ip6.int",
+		      p[15] & 0xf, (p[15] >> 4) & 0xf,
+		      p[14] & 0xf, (p[14] >> 4) & 0xf,
+		      p[13] & 0xf, (p[13] >> 4) & 0xf,
+		      p[12] & 0xf, (p[12] >> 4) & 0xf,
+		      p[11] & 0xf, (p[11] >> 4) & 0xf,
+		      p[10] & 0xf, (p[10] >> 4) & 0xf,
+		      p[9] & 0xf, (p[9] >> 4) & 0xf,
+		      p[8] & 0xf, (p[8] >> 4) & 0xf,
+		      p[7] & 0xf, (p[7] >> 4) & 0xf,
+		      p[6] & 0xf, (p[4] >> 4) & 0xf,
+		      p[5] & 0xf, (p[5] >> 4) & 0xf,
+		      p[4] & 0xf, (p[4] >> 4) & 0xf,
+		      p[3] & 0xf, (p[3] >> 4) & 0xf,
+		      p[2] & 0xf, (p[2] >> 4) & 0xf,
+		      p[1] & 0xf, (p[1] >> 4) & 0xf,
+		      p[0] & 0xf, (p[0] >> 4) & 0xf);
+	break;
+    }
     n = res_nmkquery(&res, QUERY, qbuf, C_IN, T_PTR, NULL, 0, NULL,
 		     buf.qb2, sizeof buf);
     if (n < 0) {
@@ -789,13 +982,47 @@ GetHostInfoByAddr(nsAddrPtr, address, hostPtr)
 	}
 	return (ERROR);
     }
-    n = GetAnswer(nsAddrPtr, T_PTR, (char *) &buf, n, 1, hostPtr, 1);
+    n = GetAnswer(nsAddrPtr, T_PTR, (char *) &buf, n, 1, hostPtr, 1, 0);
     if (n == SUCCESS) {
-	hostPtr->addrType = AF_INET;
-	hostPtr->addrLen = 4;
-	hostPtr->addrList = (char **)Calloc(2, sizeof(char *));
-	hostPtr->addrList[0] = Calloc(INT32SZ, sizeof(char));
-	memcpy(hostPtr->addrList[0], p, INADDRSZ);
+	switch (address->sin.sin_family) {
+	case AF_INET:
+	    hostPtr->addrList = (AddrInfo **)Calloc(2, sizeof(AddrInfo *));
+	    hostPtr->addrList[0] = (AddrInfo *)Calloc(1, sizeof(AddrInfo));
+	    hostPtr->addrList[0]->addr = Calloc(INT32SZ, sizeof(char));
+	    memcpy(hostPtr->addrList[0]->addr, p, INADDRSZ);
+	    hostPtr->addrList[0]->addrType = AF_INET;
+	    hostPtr->addrList[0]->addrLen = 4;
+	    hostPtr->addrList[1] = NULL;
+	    break;
+	case AF_INET6:
+	    hostPtr->addrList = (AddrInfo **)Calloc(2, sizeof(AddrInfo *));
+	    hostPtr->addrList[0] = (AddrInfo *)Calloc(1, sizeof(AddrInfo));
+	    hostPtr->addrList[0]->addr = Calloc(16, sizeof(char));
+	    memcpy(hostPtr->addrList[0]->addr, p, 16);
+	    hostPtr->addrList[0]->addrType = AF_INET6;
+	    hostPtr->addrList[0]->addrLen = 16;
+	    hostPtr->addrList[1] = NULL;
+	    break;
+	}
+    }
+    if (n == SUCCESS || ismapped || address->sin.sin_family != AF_INET6)
+	    return n;
+    n = res_nmkquery(&res, QUERY, qbuf2, C_IN, T_PTR, NULL, 0, NULL,
+		     buf.qb2, sizeof buf);
+    if (n < 0) {
+	if (res.options & RES_DEBUG) {
+	    printf("res_nmkquery() failed\n");
+	}
+	return (ERROR);
+    }
+    n = GetAnswer(nsAddrPtr, T_PTR, (char *) &buf, n, 1, hostPtr, 1, 0);
+    if (n == SUCCESS) {
+	hostPtr->addrList = (AddrInfo **)Calloc(2, sizeof(AddrInfo *));
+	hostPtr->addrList[0] = (AddrInfo *)Calloc(1, sizeof(AddrInfo *));
+	hostPtr->addrList[0]->addr = Calloc(16, sizeof(char));
+	memcpy(hostPtr->addrList[0]->addr, p, 16);
+	hostPtr->addrList[0]->addrType = AF_INET6;
+	hostPtr->addrList[0]->addrLen = 16;
 	hostPtr->addrList[1] = NULL;
     }
     return n;
@@ -835,6 +1062,7 @@ FreeHostInfoPtr(hostPtr)
     if (hostPtr->addrList != NULL) {
 	i = 0;
 	while (hostPtr->addrList[i] != NULL) {
+	    free(hostPtr->addrList[i]->addr);
 	    free(hostPtr->addrList[i]);
 	    i++;
 	}
@@ -862,6 +1090,7 @@ FreeHostInfoPtr(hostPtr)
 	    if (hostPtr->servers[i]->addrList != NULL) {
 		j = 0;
 		while (hostPtr->servers[i]->addrList[j] != NULL) {
+		    free(hostPtr->servers[i]->addrList[j]->addr);
 		    free(hostPtr->servers[i]->addrList[j]);
 		    j++;
 		}

contrib/bind/bin/nslookup/list.c

@@ -53,7 +53,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)list.c	5.23 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: list.c,v 8.25 2000/12/23 08:14:46 vixie Exp $";
+static const char rcsid[] = "$Id: list.c,v 8.27 2002/04/09 05:55:17 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -258,7 +258,9 @@ ListSubr(int qtype, char *domain, char *cmd) {
 
 	ns_msg handle;
 	querybuf buf;
-	struct sockaddr_in sin;
+	struct sockaddr_storage	sa;
+	struct sockaddr_in	*sin;
+	struct sockaddr_in6	*sin6;
 	HEADER *headerPtr;
 	int msglen, amtToRead, numRead, soacnt;
 	u_int len;
@@ -269,6 +271,8 @@ ListSubr(int qtype, char *domain, char *cmd) {
 	enum { NO_ERRORS, ERR_READING_LEN, ERR_READING_MSG, ERR_PRINTING }
 		error = NO_ERRORS;
 	struct iovec iov[2];
+	AddrInfo *AddrPtr;
+	int salen = 0;
 
 	/*
 	 * Create a query packet for the requested domain name.
@@ -281,10 +285,6 @@ ListSubr(int qtype, char *domain, char *cmd) {
 		return (ERROR);
 	}
 
-	memset(&sin, 0, sizeof sin);
-	sin.sin_family = AF_INET;
-	sin.sin_port = htons(nsport);
-
 	/*
 	 * Check to see if we have the address of the server or the
 	 * address of a server who knows about this domain.
@@ -293,20 +293,44 @@ ListSubr(int qtype, char *domain, char *cmd) {
 	 */
 
 	if (defaultPtr->addrList != NULL)
-		sin.sin_addr = *(struct in_addr *) defaultPtr->addrList[0];
+		AddrPtr = defaultPtr->addrList[0];
 	else
-		sin.sin_addr = *(struct in_addr *)
-			defaultPtr->servers[0]->addrList[0];
+		AddrPtr = defaultPtr->servers[0]->addrList[0];
+
+	memset(&sa, 0, sizeof sa);
+	switch (AddrPtr->addrType) {
+	case AF_INET:
+		sin = (struct sockaddr_in *)&sa;
+		sin->sin_family	= AddrPtr->addrType;
+		sin->sin_port = htons(nsport);
+		memcpy(&sin->sin_addr, AddrPtr->addr, AddrPtr->addrLen);
+#ifdef HAVE_SA_LEN
+		sin->sin_len = sizeof(*sin);
+#endif
+		salen = sizeof(struct sockaddr_in);
+		break;
+
+	case AF_INET6:
+		sin6 = (struct sockaddr_in6 *)&sa;
+		sin6->sin6_family = AddrPtr->addrType;
+		sin6->sin6_port	= htons(nsport);
+		memcpy(&sin6->sin6_addr, AddrPtr->addr, AddrPtr->addrLen);
+#ifdef HAVE_SA_LEN
+		sin6->sin6_len = sizeof(*sin6);
+#endif
+		salen = sizeof(struct sockaddr_in6);
+		break;
+	}
 
 	/*
 	 *  Set up a virtual circuit to the server.
 	 */
-	sockFD = socket(AF_INET, SOCK_STREAM, 0);
+	sockFD = socket(AddrPtr->addrType, SOCK_STREAM, 0);
 	if (sockFD < 0) {
 		perror("ls: socket");
 		return (ERROR);
 	}
-	if (connect(sockFD, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(sockFD, (struct sockaddr *)&sa, salen) < 0) {
 		int e;
 
 		if (errno == ECONNREFUSED)
@@ -434,7 +458,7 @@ ListSubr(int qtype, char *domain, char *cmd) {
 					strcpy(origin, name);
 				strcpy(name_ctx, "@");
 			}
-			if (qtype == T_ANY || ns_rr_type(rr) == qtype) {
+			if (qtype == T_ANY || (int)ns_rr_type(rr) == qtype) {
 				if (ns_sprintrr(&handle, &rr, name_ctx, origin,
 						buf, sizeof buf) < 0) {
 					perror("ns_sprintrr");
@@ -530,13 +554,16 @@ Finger(string, putToFile)
     int  putToFile;
 {
 	struct servent		*sp;
-	struct sockaddr_in	sin;
+	struct sockaddr_storage	sa;
+	struct sockaddr_in	*sin;
+	struct sockaddr_in6	*sin6;
 	FILE		*f;
 	int		c;
 	int		lastc;
 	char			name[NAME_LEN];
 	char			file[PATH_MAX];
 	int		i;
+	int		salen = 0;
 
 	/*
 	 *  We need a valid current host info to get an inet address.
@@ -573,23 +600,45 @@ Finger(string, putToFile)
 	    return (ERROR);
 	}
 
-	memset(&sin, 0, sizeof sin);
-	sin.sin_family	= curHostInfo.addrType;
-	sin.sin_port	= sp->s_port;
-	memcpy(&sin.sin_addr, curHostInfo.addrList[0], curHostInfo.addrLen);
+	memset(&sa, 0, sizeof sa);
+	switch (curHostInfo.addrList[0]->addrType) {
+	case AF_INET:
+		sin = (struct sockaddr_in *)&sa;
+		sin->sin_family	= curHostInfo.addrList[0]->addrType;
+		sin->sin_port	= sp->s_port;
+		memcpy(&sin->sin_addr, curHostInfo.addrList[0]->addr,
+		       curHostInfo.addrList[0]->addrLen);
+#ifdef HAVE_SA_LEN
+		sin->sin_len = sizeof(*sin);
+#endif
+		salen = sizeof(struct sockaddr_in);
+		break;
+
+	case AF_INET6:
+		sin6 = (struct sockaddr_in6 *)&sa;
+		sin6->sin6_family = curHostInfo.addrList[0]->addrType;
+		sin6->sin6_port	= sp->s_port;
+		memcpy(&sin6->sin6_addr, curHostInfo.addrList[0]->addr,
+		       curHostInfo.addrList[0]->addrLen);
+#ifdef HAVE_SA_LEN
+		sin6->sin6_len = sizeof(*sin6);
+#endif
+		salen = sizeof(struct sockaddr_in6);
+		break;
+	}
 
 	/*
 	 *  Set up a virtual circuit to the host.
 	 */
 
-	sockFD = socket(curHostInfo.addrType, SOCK_STREAM, 0);
+	sockFD = socket(curHostInfo.addrList[0]->addrType, SOCK_STREAM, 0);
 	if (sockFD < 0) {
 	    fflush(stdout);
 	    perror("finger: socket");
 	    return (ERROR);
 	}
 
-	if (connect(sockFD, (struct sockaddr *)&sin, sizeof (sin)) < 0) {
+	if (connect(sockFD, (struct sockaddr *)&sa, salen) < 0) {
 	    fflush(stdout);
 	    perror("finger: connect");
 	    close(sockFD);

contrib/bind/bin/nslookup/main.c

@@ -78,7 +78,7 @@ char copyright[] =
 
 #ifndef lint
 static const char sccsid[] = "@(#)main.c	5.42 (Berkeley) 3/3/91";
-static const char rcsid[] = "$Id: main.c,v 8.16 2000/12/23 08:14:47 vixie Exp $";
+static const char rcsid[] = "$Id: main.c,v 8.24 2002/05/26 03:12:20 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -109,7 +109,6 @@ static const char rcsid[] = "$Id: main.c,v 8.16 2000/12/23 08:14:47 vixie Exp $"
 #include <errno.h>
 #include <limits.h>
 #include <netdb.h>
-#include <resolv.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
@@ -119,6 +118,8 @@ static const char rcsid[] = "$Id: main.c,v 8.16 2000/12/23 08:14:47 vixie Exp $"
 
 #include "port_after.h"
 
+#include <resolv.h>
+
 #include "res.h"
 #include "pathnames.h"
 
@@ -155,7 +156,7 @@ int		curHostValid = FALSE;
 
 HostInfo	*defaultPtr = NULL;
 char		defaultServer[NAME_LEN];
-struct in_addr	defaultAddr;
+union res_sockaddr_union defaultAddr;
 
 
 /*
@@ -169,7 +170,7 @@ int		queryClass = C_IN;
  * Stuff for Interrupt (control-C) signal handler.
  */
 
-extern SIG_FN	IntrHandler();
+extern SIG_FN	IntrHandler(int);
 FILE		*filePtr;
 jmp_buf		env;
 
@@ -177,10 +178,10 @@ jmp_buf		env;
 /*
  * Browser command for help.
  */
-char		*pager;
+const char		*pager;
 
-static void CvtAddrToPtr();
-static void ReadRC();
+static void CvtAddrToPtr(char *name);
+static void ReadRC(void);
 
 /*
  * Forward declarations.
@@ -189,6 +190,32 @@ static void LocalServer(HostInfo *defaultPtr);
 static void res_re_init(void);
 static void res_dnsrch(char *cp);
 static void Usage(void);
+static void ShowOptions(void);
+
+static void
+UnionFromAddr(union res_sockaddr_union *u, int family, void *addr) {
+    memset(u, 0, sizeof *u);
+    switch (family) {
+    case AF_INET:
+	u->sin.sin_family = AF_INET;
+	u->sin.sin_port = htons(nsport);
+	memcpy(&u->sin.sin_addr, addr, 4);
+#ifdef HAVE_SA_LEN
+	u->sin.sin_len = sizeof(u->sin);
+#endif
+	break;
+    case AF_INET6:
+	u->sin6.sin6_family = AF_INET6;
+	u->sin6.sin6_port = htons(nsport);
+	memcpy(&u->sin6.sin6_addr, addr, 16);
+#ifdef HAVE_SA_LEN
+	u->sin6.sin6_len = sizeof(u->sin6);
+#endif
+	break;
+    default:
+	abort();
+    }
+}
 
 /*
  ******************************************************************************
@@ -208,7 +235,6 @@ main(int argc, char **argv) {
     Boolean	useLocalServer;
     int		result;
     int		i;
-    struct hostent	*hp;
 
     /*
      *  Initialize the resolver library routines.
@@ -264,30 +290,38 @@ main(int argc, char **argv) {
 
     useLocalServer = FALSE;
     if (argc == 2) {
-	struct in_addr addr;
+	int nscount = 0;
+	union res_sockaddr_union u[MAXNS];
+	struct addrinfo *answer = NULL;
+	struct addrinfo *cur = NULL;
+	struct addrinfo hint;
 
 	/*
 	 * Use an explicit name server. If the hostname lookup fails,
 	 * default to the server(s) in resolv.conf.
 	 */ 
 
-	if (inet_aton(*++argv, &addr)) {
-	    res.nscount = 1;
-	    res.nsaddr.sin_addr = addr;
-	} else {
-	    hp = gethostbyname(*argv);
-	    if (hp == NULL) {
-		fprintf(stderr, "*** Can't find server address for '%s': ", 
-			*argv);
-		herror((char *)NULL);
-		fputc('\n', stderr);
-	    } else {
-		for (i = 0; i < MAXNS && hp->h_addr_list[i] != NULL; i++) {
-		    memcpy(&res.nsaddr_list[i].sin_addr, hp->h_addr_list[i],
-			   hp->h_length);
+	memset(u, 0, sizeof(u));
+	memset(&hint, 0, sizeof(hint));
+	hint.ai_socktype = SOCK_DGRAM;
+	if (!getaddrinfo(*++argv, NULL, &hint, &answer)) {
+	    for (cur = answer; cur != NULL; cur = cur->ai_next) {
+		if (nscount == MAXNS)
+		    break;
+		switch (cur->ai_addr->sa_family) {
+		case AF_INET6:
+		    u[nscount].sin6 = *(struct sockaddr_in6*)cur->ai_addr;
+		    u[nscount++].sin6.sin6_port = htons(nsport);
+		    break;
+		case AF_INET:
+		    u[nscount].sin = *(struct sockaddr_in*)cur->ai_addr;
+		    u[nscount++].sin.sin_port = htons(nsport);
+		    break;
 		}
-		res.nscount = i;
-	    } 
+	    }
+	    if (nscount != 0)
+		res_setservers(&res, u, nscount);
+	    freeaddrinfo(answer);;
 	}
     }
 
@@ -295,21 +329,35 @@ main(int argc, char **argv) {
     if (res.nscount == 0 || useLocalServer) {
 	LocalServer(defaultPtr);
     } else {
-	for (i = 0; i < res.nscount; i++) {
-	    if (res.nsaddr_list[i].sin_addr.s_addr == INADDR_ANY) {
+	int nscount = 0;
+	union res_sockaddr_union u[MAXNS];
+
+	nscount = res_getservers(&res, u, MAXNS);
+	for (i = 0; i < nscount; i++) {
+	    if (u[i].sin.sin_family == AF_INET &&
+		u[i].sin.sin_addr.s_addr == INADDR_ANY) {
 	        LocalServer(defaultPtr);
 		break;
 	    } else {
-		result = GetHostInfoByAddr(&(res.nsaddr_list[i].sin_addr), 
-					   &(res.nsaddr_list[i].sin_addr), 
-					   defaultPtr);
+		result = GetHostInfoByAddr(&u[i], &u[i], defaultPtr);
 		if (result != SUCCESS) {
+		    char t[80];
+		    switch (u[i].sin.sin_family) {
+		    case AF_INET:
+			inet_ntop(AF_INET, &u[i].sin.sin_addr, t, sizeof(t));
+			break;
+		    case AF_INET6:
+			inet_ntop(AF_INET6, &u[i].sin6.sin6_addr, t, sizeof(t));
+			break;
+		    default:
+			strcpy(t, "<UNKNOWN>");
+			break;
+		    }
 		    fprintf(stderr,
-		    "*** Can't find server name for address %s: %s\n", 
-		       inet_ntoa(res.nsaddr_list[i].sin_addr), 
-		       DecodeError(result));
+		            "*** Can't find server name for address %s: %s\n", 
+			    t, DecodeError(result));
 		} else {
-		    defaultAddr = res.nsaddr_list[i].sin_addr;
+		    defaultAddr = u[i];
 		    break;
 		}
 	    }
@@ -377,7 +425,7 @@ main(int argc, char **argv) {
 }
 
 
-void
+static void
 LocalServer(defaultPtr)
     HostInfo *defaultPtr;
 {
@@ -385,9 +433,15 @@ LocalServer(defaultPtr)
 
     (void) gethostname(hostName, sizeof(hostName));
 
-    defaultAddr.s_addr = htonl(INADDR_ANY);
+    memset(&defaultAddr, 0, sizeof(defaultAddr));
+    defaultAddr.sin.sin_addr.s_addr = htonl(INADDR_ANY);
+    defaultAddr.sin.sin_family = AF_INET;
+    defaultAddr.sin.sin_port = htons(nsport);
+#ifdef HAVE_SA_LEN
+    defaultAddr.sin.sin_len = sizeof(defaultAddr.sin);
+#endif
     (void) GetHostInfoByName(&defaultAddr, C_IN, T_A,
-			     "0.0.0.0", defaultPtr, 1);
+			     "0.0.0.0", defaultPtr, 1, 0);
     free(defaultPtr->name);
     defaultPtr->name = Calloc(1, sizeof(hostName)+1);
     strcpy(defaultPtr->name, hostName);
@@ -432,23 +486,25 @@ Usage(void) {
 
 Boolean
 IsAddr(host, addrPtr)
-    char *host;
-    struct in_addr *addrPtr;	/* If return TRUE, contains IP address */
+    const char *host;
+    union res_sockaddr_union *addrPtr;
+    /* If return TRUE, contains IP address */
 {
-    register char *cp;
-
-    if (isdigit(host[0])) {
-	    /* Make sure it has only digits and dots. */
-	    for (cp = host; *cp; ++cp) {
-		if (!isdigit(*cp) && *cp != '.') 
-		    return FALSE;
-	    }
-	    /* If it has a trailing dot, don't treat it as an address. */
-	    if (*--cp != '.') { 
-		return inet_aton(host, addrPtr);
-	    }
-    }
-    return FALSE;
+    if (inet_pton(AF_INET6, host, &addrPtr->sin6.sin6_addr) == 1) {
+	addrPtr->sin6.sin6_family = AF_INET6;
+	addrPtr->sin6.sin6_port = htons(nsport);
+#ifdef HAVE_SA_LEN
+	addrPtr->sin6.sin6_len = sizeof(addrPtr->sin6);
+#endif
+    } else if (inet_pton(AF_INET, host, &addrPtr->sin.sin_addr) == 1) {
+	addrPtr->sin.sin_family = AF_INET;
+	addrPtr->sin.sin_port = htons(nsport);
+#ifdef HAVE_SA_LEN
+	addrPtr->sin.sin_len = sizeof(addrPtr->sin);
+#endif
+    } else
+	return FALSE;
+    return TRUE;
 }
 
 
@@ -482,10 +538,11 @@ SetDefaultServer(string, local)
     Boolean	local;
 {
     register HostInfo	*newDefPtr;
-    struct in_addr	*servAddrPtr;
-    struct in_addr	addr;
+    union res_sockaddr_union servAddr;
+    union res_sockaddr_union addr;
     char		newServer[NAME_LEN];
     int			result;
+    int			tresult;
     int			i;
     int			j;
 
@@ -545,21 +602,28 @@ SetDefaultServer(string, local)
      */
 
     if (local) {
-	servAddrPtr = &defaultAddr;
+	servAddr = defaultAddr;
     } else if (defaultPtr->addrList != NULL) {
-	servAddrPtr = (struct in_addr *) defaultPtr->addrList[0];
+	UnionFromAddr(&servAddr, defaultPtr->addrList[0]->addrType,
+		      defaultPtr->addrList[0]->addr);
     } else {
-	servAddrPtr = (struct in_addr *) defaultPtr->servers[0]->addrList[0];
+	UnionFromAddr(&servAddr, defaultPtr->addrList[0]->addrType,
+		      defaultPtr->servers[0]->addrList[0]->addr);
     }
 
     result = ERROR;
     if (IsAddr(newServer, &addr)) {
-	result = GetHostInfoByAddr(servAddrPtr, &addr, newDefPtr);
+	result = GetHostInfoByAddr(&servAddr, &addr, newDefPtr);
 	/* If we can't get the name, fall through... */
     } 
     if (result != SUCCESS && result != NONAUTH) {
-	result = GetHostInfoByName(servAddrPtr, C_IN, T_A, 
-			newServer, newDefPtr, 1);
+	result = GetHostInfoByName(&servAddr, C_IN, T_A, 
+			newServer, newDefPtr, 1, 0);
+	if (result == SUCCESS || result == NONAUTH || result == NO_INFO)
+		tresult = GetHostInfoByName(&servAddr, C_IN, T_AAAA,
+			newServer, newDefPtr, 1, 1);
+	if (result == NO_INFO)
+		result = tresult;
     }
 
     /* If we ask for an A record and get none back, but get an NS
@@ -611,8 +675,8 @@ DoLookup(host, servPtr, serverName)
     char	*serverName;
 {
     int result;
-    struct in_addr *servAddrPtr;
-    struct in_addr addr; 
+    union res_sockaddr_union servAddr;
+    union res_sockaddr_union addr; 
 
     /* Skip escape character */
     if (host[0] == '\\')
@@ -629,23 +693,25 @@ DoLookup(host, servPtr, serverName)
      */
 
     if (servPtr->addrList != NULL) {
-	servAddrPtr = (struct in_addr *) servPtr->addrList[0];
+	UnionFromAddr(&servAddr, servPtr->addrList[0]->addrType,
+		      servPtr->addrList[0]->addr);
     } else {
-	servAddrPtr = (struct in_addr *) servPtr->servers[0]->addrList[0];
+	UnionFromAddr(&servAddr, servPtr->servers[0]->addrList[0]->addrType,
+		      servPtr->servers[0]->addrList[0]->addr);
     }
 
     /* 
      * RFC1123 says we "SHOULD check the string syntactically for a 
      * dotted-decimal number before looking it up [...]" (p. 13).
      */
-    if (queryType == T_A && IsAddr(host, &addr)) {
-	result = GetHostInfoByAddr(servAddrPtr, &addr, &curHostInfo);
+    if ((queryType == T_A || queryType == T_AAAA) && IsAddr(host, &addr)) {
+	result = GetHostInfoByAddr(&servAddr, &addr, &curHostInfo);
     } else {
 	if (queryType == T_PTR) {
 	    CvtAddrToPtr(host);
 	} 
-	result = GetHostInfoByName(servAddrPtr, queryClass, queryType, host, 
-			&curHostInfo, 0);
+	result = GetHostInfoByName(&servAddr, queryClass, queryType, host, 
+			&curHostInfo, 0, 0);
     }
 
     switch (result) {
@@ -656,7 +722,7 @@ DoLookup(host, servPtr, serverName)
 	     *  There's no need to print anything for other query types
 	     *  because the info has already been printed.
 	     */
-	    if (queryType == T_A) {
+	    if (queryType == T_A || queryType == T_AAAA) {
 		curHostValid = TRUE;
 		PrintHostInfo(filePtr, "Name:", &curHostInfo);
 	    }
@@ -787,6 +853,7 @@ LookupHostWithServer(char *string, Boolean putToFile) {
     static HostInfo serverInfo;
     int		i;
     int		j;
+    union res_sockaddr_union u;
 
     curHostValid = FALSE;
 
@@ -813,11 +880,16 @@ LookupHostWithServer(char *string, Boolean putToFile) {
 	fprintf(filePtr,"> %s\n", string);
     }
     
-    result = GetHostInfoByName(
-		defaultPtr->addrList ?
-		    (struct in_addr *) defaultPtr->addrList[0] :
-		    (struct in_addr *) defaultPtr->servers[0]->addrList[0], 
-		C_IN, T_A, server, &serverInfo, 1);
+    if (defaultPtr->addrList != NULL)
+	UnionFromAddr(&u, defaultPtr->addrList[0]->addrType,
+		      defaultPtr->addrList[0]->addr);
+    else
+	UnionFromAddr(&u, defaultPtr->servers[0]->addrList[0]->addrType,
+		      defaultPtr->servers[0]->addrList[0]->addr);
+    result = GetHostInfoByName(&u, C_IN, T_A, server, &serverInfo, 1, 0);
+    if (result == NO_INFO)
+	    result = GetHostInfoByName(&u, C_IN, T_AAAA, server,
+				       &serverInfo, 1, 1);
 
     if (result != SUCCESS) {
 	fprintf(stderr,"*** Can't find address for server %s: %s\n", server,
@@ -1024,7 +1096,7 @@ SetOption(option)
 /*
  * Fake a reinitialization when the domain is changed.
  */
-void
+static void
 res_re_init(void) {
     register char *cp, **pp;
     int n;
@@ -1046,7 +1118,7 @@ res_re_init(void) {
 
 #define SRCHLIST_SEP '/'
 
-void
+static void
 res_dnsrch(char *cp) {
     char **pp;
     int n;
@@ -1089,8 +1161,8 @@ res_dnsrch(char *cp) {
  ******************************************************************************
  */
 
-void
-ShowOptions()
+static void
+ShowOptions(void)
 {
     register char **cp;
 
@@ -1140,7 +1212,7 @@ ShowOptions()
  */
 
 void
-PrintHelp()
+PrintHelp(void)
 {
 	char cmd[PATH_MAX];
 
@@ -1167,13 +1239,54 @@ CvtAddrToPtr(name)
 {
     const char *p;
     int ip[4];
-    struct in_addr addr;
+    union res_sockaddr_union addr;
 
     if (IsAddr(name, &addr)) {
-	p = inet_ntoa(addr);
-	if (sscanf(p, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3]) == 4) {
-	    sprintf(name, "%d.%d.%d.%d.in-addr.arpa.", 
-		ip[3], ip[2], ip[1], ip[0]);
+	switch (addr.sin.sin_family) {
+	case AF_INET:
+	    p = inet_ntoa(addr.sin.sin_addr);
+	    if (sscanf(p, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3]) == 4)
+		sprintf(name, "%d.%d.%d.%d.in-addr.arpa.",
+			ip[3], ip[2], ip[1], ip[0]);
+	   break;
+	case AF_INET6:
+	   sprintf(name,
+		  "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		  "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
+		  "ip6.arpa",
+		  addr.sin6.sin6_addr.s6_addr[15] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[15] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[14] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[14] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[13] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[13] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[12] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[12] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[11] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[11] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[10] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[10] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[9] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[9] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[8] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[8] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[7] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[7] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[6] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[6] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[5] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[5] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[4] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[4] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[3] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[3] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[2] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[2] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[1] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[1] >> 4) & 0xf,
+		  addr.sin6.sin6_addr.s6_addr[0] & 0xf,
+		  (addr.sin6.sin6_addr.s6_addr[0] >> 4) & 0xf);
+	    break;
 	}
     }
 }
@@ -1189,7 +1302,7 @@ CvtAddrToPtr(name)
  */
 
 static void
-ReadRC()
+ReadRC(void)
 {
     register FILE *fp;
     register char *cp;

contrib/bind/bin/nslookup/res.h

@@ -55,7 +55,7 @@
 
 /*
  *	@(#)res.h	5.10 (Berkeley) 6/1/90
- *	$Id: res.h,v 8.7 2000/12/23 08:14:47 vixie Exp $
+ *	$Id: res.h,v 8.10 2002/04/09 05:55:22 marka Exp $
  */
 
 /*
@@ -131,18 +131,22 @@ typedef int Boolean;
  * for use in system calls)."
  */
 
+typedef struct {
+	int     addrType;
+	int     addrLen;
+	char    *addr;
+} AddrInfo;
+
 typedef struct	{
 	char	*name;		/* official name of host */
 	char	**domains;	/* domains it serves */
-	char	**addrList;	/* list of addresses from name server */
+	AddrInfo **addrList;	/* list of addresses from name server */
 } ServerInfo;
 
 typedef struct	{
 	char	*name;		/* official name of host */
 	char	**aliases;	/* alias list */
-	char	**addrList;	/* list of addresses from name server */
-	int	addrType;	/* host address type */
-	int	addrLen;	/* length of address */
+	AddrInfo **addrList;	/* list of addresses from name server */
 	ServerInfo **servers;
 } HostInfo;
 
@@ -169,7 +173,6 @@ extern struct __res_state res;
  */
 
 /* XXX need prototypes */
-extern Boolean IsAddr();
 void Print_query(const u_char *msg, const u_char *eom, int printHeader);
 void Fprint_query(const u_char *msg, const u_char *eom, int printHeader,
 		  FILE *file);
@@ -186,18 +189,17 @@ extern char *Malloc();
 extern void NsError();
 extern void PrintServer();
 extern void PrintHostInfo();
-extern void ShowOptions();
 extern void FreeHostInfoPtr();
 extern FILE *OpenFile();
-extern char *res_skip();
 extern int pickString(const char *, char *, size_t);
-extern int GetHostInfoByName();
-extern int GetHostInfoByAddr();
-extern int GetHostDomain();
+extern int GetHostInfoByName(union res_sockaddr_union *, int, int,
+			     const char *, HostInfo *, Boolean, Boolean);
+extern int GetHostDomain(union res_sockaddr_union *, int, int,
+			 const char *, char *, HostInfo *, Boolean, Boolean);
 extern int matchString(const char *, const char *);
 extern int StringToType(char *, int, FILE *);
 extern int StringToClass(char *, int, FILE *);
-extern int SendRequest(struct in_addr *, const u_char *, int,
+extern int SendRequest(union res_sockaddr_union *, const u_char *, int,
 		       u_char *, u_int, int *);
 extern void SendRequest_close(void);
 extern int SetDefaultServer(char *, Boolean);
@@ -208,3 +210,18 @@ void ListHost_close(void);
 int SetOption(char *);
 int LookupHost(char *, Boolean);
 int LookupHostWithServer(char *, Boolean);
+const char * DecodeType(int);
+const char * DecodeError(int);
+FILE * OpenFile(char *, char *, size_t);
+void  PrintHostInfo(FILE *, const char *, HostInfo *);
+char * Calloc(int, int);
+char * Malloc(int);
+SIG_FN IntrHandler(int);
+int ListSubr(int, char *, char *);
+void FreeHostInfoPtr(HostInfo *);
+unsigned char * res_skip(unsigned char *, int, unsigned char *);
+extern Boolean IsAddr(const char *, union res_sockaddr_union *);
+void PrintHelp(void);
+int GetHostInfoByAddr(union res_sockaddr_union *, union res_sockaddr_union *,
+		      HostInfo *);
+

contrib/bind/bin/nslookup/send.c

@@ -53,7 +53,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)send.c	5.18 (Berkeley) 3/2/91";
-static const char rcsid[] = "$Id: send.c,v 8.10 2000/12/23 08:14:47 vixie Exp $";
+static const char rcsid[] = "$Id: send.c,v 8.14 2002/05/10 04:35:09 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -120,30 +120,31 @@ unsigned short nsport = NAMESERVER_PORT;
  */
 
 int
-SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
-	    u_char *answer, u_int anslen, int *trueLenPtr)
+SendRequest(union res_sockaddr_union *nsAddrPtr, const u_char *buf,
+	    int buflen, u_char *answer, u_int anslen, int *trueLenPtr)
 {
-	int n, try, v_circuit, resplen, salen;
+	int n, try, v_circuit, resplen;
+	ISC_SOCKLEN_T salen;
 	int gotsomewhere = 0, connected = 0;
 	int connreset = 0;
 	u_short id, len;
 	u_char *cp;
 	fd_set dsmask;
 	struct timeval timeout;
-	const HEADER *hp = (HEADER *) buf;
+	const HEADER *hp = (const HEADER *) buf;
 	HEADER *anhp = (HEADER *) answer;
 	struct iovec iov[2];
 	int terrno = ETIMEDOUT;
 	char junk[512];
-	struct sockaddr_in sin, sa;
+	struct sockaddr_storage sa;
+	int family = nsAddrPtr->sin.sin_family;
+	int clen = (family == AF_INET) ? sizeof(struct sockaddr_in) :
+				         sizeof(struct sockaddr_in6);
 
 	if (res.options & RES_DEBUG2) {
 	    printf("------------\nSendRequest(), len %d\n", buflen);
 	    Print_query(buf, buf + buflen, 1);
 	}
-	sin.sin_family	= AF_INET;
-	sin.sin_port	= htons(nsport);
-	sin.sin_addr	= *nsAddrPtr;
 	v_circuit = (res.options & RES_USEVC) || buflen > PACKETSZ;
 	id = hp->id;
 	/*
@@ -160,15 +161,15 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 			 */
 			try = res.retry;
 			if (s < 0) {
-				s = socket(AF_INET, SOCK_STREAM, 0);
+				s = socket(family, SOCK_STREAM, 0);
 				if (s < 0) {
 					terrno = errno;
 					if (res.options & RES_DEBUG)
 					    perror("socket (vc) failed");
 					continue;
 				}
-				if (connect(s, (struct sockaddr *)&sin,
-				   sizeof(struct sockaddr)) < 0) {
+				if (connect(s, (struct sockaddr *)nsAddrPtr,
+				    clen) < 0) {
 					terrno = errno;
 					if (res.options & RES_DEBUG)
 					    perror("connect failed");
@@ -183,7 +184,7 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 			__putshort(buflen, (u_char *)&len);
 			iov[0].iov_base = (caddr_t)&len;
 			iov[0].iov_len = INT16SZ;
-			iov[1].iov_base = (caddr_t)buf;
+			DE_CONST(buf, iov[1].iov_base);
 			iov[1].iov_len = buflen;
 			if (writev(s, iov, 2) != INT16SZ + buflen) {
 				terrno = errno;
@@ -224,7 +225,7 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 				continue;
 			}
 			cp = answer;
-			if ((resplen = ns_get16((u_char*)cp)) > anslen) {
+			if ((resplen = ns_get16((u_char*)cp)) > (int)anslen) {
 				if (res.options & RES_DEBUG)
 					fprintf(stderr, "response truncated\n");
 				len = anslen;
@@ -265,7 +266,7 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 			 * Use datagrams.
 			 */
 			if (s < 0) {
-				s = socket(AF_INET, SOCK_DGRAM, 0);
+				s = socket(family, SOCK_DGRAM, 0);
 				if (s < 0) {
 					terrno = errno;
 					if (res.options & RES_DEBUG)
@@ -275,8 +276,8 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 			}
 #if BSD >= 43
 			if (connected == 0) {
-				if (connect(s, (struct sockaddr *)&sin,
-				    sizeof sin) < 0) {
+				if (connect(s, (struct sockaddr *)nsAddrPtr,
+				    clen) < 0) {
 					if (res.options & RES_DEBUG)
 						perror("connect");
 					continue;
@@ -290,8 +291,8 @@ SendRequest(struct in_addr *nsAddrPtr, const u_char *buf, int buflen,
 			}
 #else /* BSD */
 			if (sendto(s, (const char *)buf, buflen, 0,
-				   (struct sockaddr *) &sin,
-				   sizeof sin) != buflen) {
+				   (struct sockaddr *) nsAddrPtr,
+				   clen) != buflen) {
 				if (res.options & RES_DEBUG)
 					perror("sendto");
 				continue;

contrib/bind/bin/nslookup/skip.c

@@ -53,7 +53,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)skip.c	5.12 (Berkeley) 3/21/91";
-static const char rcsid[] = "$Id: skip.c,v 8.5 1999/10/13 16:39:20 vixie Exp $";
+static const char rcsid[] = "$Id: skip.c,v 8.7 2001/06/20 12:30:35 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -84,8 +84,9 @@ static const char rcsid[] = "$Id: skip.c,v 8.5 1999/10/13 16:39:20 vixie Exp $";
 #include <stdio.h>
 
 #include "port_after.h"
+#include "res.h"
 
-char *res_skip_rr();
+static unsigned char *res_skip_rr(unsigned char *cp, unsigned char *eom);
 
 
 /*
@@ -109,13 +110,13 @@ char *res_skip_rr();
  *******************************************************************************
  */
 
-char *
+unsigned char *
 res_skip(msg, numFieldsToSkip, eom)
-	char *msg;
+	unsigned char *msg;
 	int numFieldsToSkip;
-	char *eom;
+	unsigned char *eom;
 {
-	register char *cp;
+	register unsigned char *cp;
 	register HEADER *hp;
 	register int tmp;
 	register int n;
@@ -132,7 +133,7 @@ res_skip(msg, numFieldsToSkip, eom)
 	n = ntohs(hp->qdcount);
 	if (n > 0) {
 		while (--n >= 0 && cp < eom) {
-			tmp = dn_skipname((u_char *)cp, (u_char *)eom);
+			tmp = dn_skipname(cp, eom);
 			if (tmp == -1) return(NULL);
 			cp += tmp;
 			cp += INT16SZ;	/* type 	*/
@@ -193,15 +194,15 @@ res_skip(msg, numFieldsToSkip, eom)
  *******************************************************************************
  */
 
-char *
+static unsigned char *
 res_skip_rr(cp, eom)
-	char *cp;
-	char *eom;
+	unsigned char *cp;
+	unsigned char *eom;
 {
 	int tmp;
 	int dlen;
 
-	if ((tmp = dn_skipname((u_char *)cp, (u_char *)eom)) == -1)
+	if ((tmp = dn_skipname(cp, eom)) == -1)
 		return (NULL);			/* compression error */
 	cp += tmp;
 	if ((cp + RRFIXEDSZ) > eom)
@@ -209,7 +210,7 @@ res_skip_rr(cp, eom)
 	cp += INT16SZ;	/* 	type 	*/
 	cp += INT16SZ;	/* 	class 	*/
 	cp += INT32SZ;	/* 	ttl 	*/
-	dlen = ns_get16((u_char*)cp);
+	dlen = ns_get16(cp);
 	cp += INT16SZ;	/* 	dlen 	*/
 	cp += dlen;
 	if (cp > eom)

contrib/bind/bin/nslookup/subr.c

@@ -53,7 +53,7 @@
 
 #ifndef lint
 static const char sccsid[] = "@(#)subr.c	5.24 (Berkeley) 3/2/91";
-static const char rcsid[] = "$Id: subr.c,v 8.14 2000/12/23 08:14:48 vixie Exp $";
+static const char rcsid[] = "$Id: subr.c,v 8.16 2002/04/09 05:55:24 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -120,7 +120,7 @@ static const char rcsid[] = "$Id: subr.c,v 8.14 2000/12/23 08:14:48 vixie Exp $"
  */
 
 SIG_FN
-IntrHandler()
+IntrHandler(int sig)
 {
     extern jmp_buf env;
 #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD) && !defined(__osf__)
@@ -129,6 +129,8 @@ IntrHandler()
 #endif
     extern void ListHost_close(void);
 
+    UNUSED(sig);
+
     SendRequest_close();
     ListHost_close();
     if (filePtr != NULL && filePtr != stdout) {
@@ -233,13 +235,15 @@ Calloc(num, size)
 void
 PrintHostInfo(file, title, hp)
 	FILE	*file;
-	char	*title;
+	const char	*title;
 	register HostInfo *hp;
 {
+	register AddrInfo	**ap;
 	register char		**cp;
 	register ServerInfo	**sp;
 	char			comma;
 	int			i;
+	char buf[80];
 
 	fprintf(file, "%-7s  %s", title, hp->name);
 
@@ -251,14 +255,18 @@ PrintHostInfo(file, title, hp)
 	    }
 	    comma = ' ';
 	    i = 0;
-	    for (cp = hp->addrList; cp && *cp; cp++) {
+	    for (ap = hp->addrList; ap && *ap; ap++) {
 		i++;
 		if (i > 4) {
 		    fprintf(file, "\n\t");
 		    comma = ' ';
 		    i = 0;
 		}
-		fprintf(file,"%c %s", comma, inet_ntoa(*(struct in_addr *)*cp));
+		if (inet_ntop((*ap)->addrType, (*ap)->addr,
+			      buf, sizeof(buf)) != NULL) {
+			fprintf(file,"%c %s", comma, buf);
+		} else
+			fprintf(file,"%c <UNKNOWN>", comma);
 		comma = ',';
 	    }
 	}
@@ -287,15 +295,18 @@ PrintHostInfo(file, title, hp)
 
 		comma = ' ';
 		i = 0;
-		for (cp = (*sp)->addrList; cp && *cp && **cp; cp++) {
+		for (ap = (*sp)->addrList; ap && *ap; ap++) {
 		    i++;
 		    if (i > 4) {
 			fprintf(file, "\n\t");
 			comma = ' ';
 			i = 0;
 		    }
-		    fprintf(file,
-			"%c %s", comma, inet_ntoa(*(struct in_addr *)*cp));
+		    if (inet_ntop((*ap)->addrType, (*ap)->addr,
+			      buf, sizeof(buf)) != NULL)
+			fprintf(file,"%c %s", comma, buf);
+		    else
+			fprintf(file,"%c <UNKNOWN>", comma);
 		    comma = ',';
 		}
 		fprintf(file, "\n\t");
@@ -387,21 +398,21 @@ OpenFile(string, file, size)
  */
 
 const struct res_sym error_syms[] = {
-	{ NOERROR,	"Success" },
-	{ FORMERR,	"Format error" },
-	{ SERVFAIL,	"Server failed" },
-	{ NXDOMAIN,	"Non-existent host/domain" },
-	{ NOTIMP,	"Not implemented" },
-	{ REFUSED,	"Query refused" },
+	{ NOERROR,	"Success", NULL },
+	{ FORMERR,	"Format error", NULL },
+	{ SERVFAIL,	"Server failed", NULL },
+	{ NXDOMAIN,	"Non-existent host/domain", NULL },
+	{ NOTIMP,	"Not implemented", NULL },
+	{ REFUSED,	"Query refused", NULL },
 #ifdef NOCHANGE
-	{ NOCHANGE,	"No change" },
+	{ NOCHANGE,	"No change", NULL },
 #endif
-	{ TIME_OUT,	"Timed out" },
-	{ NO_INFO,	"No information" },
-	{ ERROR,	"Unspecified error" },
-	{ NONAUTH,	"Non-authoritative answer" },
-	{ NO_RESPONSE,	"No response from server" },
-	{ 0,		NULL }
+	{ TIME_OUT,	"Timed out", NULL },
+	{ NO_INFO,	"No information", NULL },
+	{ ERROR,	"Unspecified error", NULL },
+	{ NONAUTH,	"Non-authoritative answer", NULL },
+	{ NO_RESPONSE,	"No response from server", NULL },
+	{ 0,		NULL, NULL }
 };
 
 const char *

contrib/bind/bin/nsupdate/nsupdate.c

@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: nsupdate.c,v 8.26 2000/12/23 08:14:48 vixie Exp $";
+static const char rcsid[] = "$Id: nsupdate.c,v 8.27 2001/06/18 14:43:46 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -390,7 +390,7 @@ main(int argc, char **argv) {
 		    exit (1);
 		}
 		r_dname = dnbuf;
-		r_ttl = (r_opcode == ADD) ? -1 : 0;
+		r_ttl = (r_opcode == ADD) ? (~0U) : 0;
 		r_type = -1;
 		r_class = C_IN; /* default to IN */
 		r_size = 0;
@@ -493,7 +493,7 @@ main(int argc, char **argv) {
 			r_size = endp - cp + 1;
 			break;
 		    case ADD:
-			if (r_ttl == -1) {
+			if (r_ttl == ~0U) {
 			    fprintf (stderr,
 		"ttl must be specified for record to be added: %s\n", buf);
 			    exit (1);

contrib/bind/doc/html/docdef.html

@@ -45,7 +45,7 @@ A quoted string which will be used as a pathname, such as
 
 <DT><VAR>ip_addr</VAR>
 <DD>
-An IP address in with exactly four elements in
+An IP address with exactly four elements in
 <VAR>dotted-decimal</VAR> notation.
 
 <DT><VAR>ip_port</VAR>
@@ -112,7 +112,7 @@ numbers <CODE>1</CODE> and <CODE>0</CODE>.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: docdef.html,v 1.8 1999/09/15 20:28:01 cyarnell Exp $
+Last Updated: $Id: docdef.html,v 1.9 2002/04/02 00:57:47 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>

contrib/bind/doc/html/logging.html

@@ -66,7 +66,7 @@ messages about processing of the entire configuration file, the
 <CODE>logging</CODE>statement must appear first.  Even if you do not
 redirect configuration file parsing messages, we recommend
 always putting the <CODE>logging</CODE> statement first so that this
-rule need not be consciously recalled if you ever do need want the
+rule need not be consciously recalled if you ever do want the
 parser's messages relocated.
 
 <H4>The <CODE>channel</CODE> phrase</H4>
@@ -182,7 +182,7 @@ time, category, severity.  Here is an example where all three
 </PRE>
 
 <P>There are four predefined channels that are used for
-<CODE>named</CODE>'s default logging as follows.  How they are used
+default logging as follows.  How they are used
 used is described in the next section, The <CODE>category</CODE> phrase.
 
 <PRE>
@@ -363,7 +363,7 @@ Messages arising from response checking, such as
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: logging.html,v 1.12 1999/09/30 17:58:35 cyarnell Exp $
+Last Updated: $Id: logging.html,v 1.13 2002/04/02 00:57:48 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>

contrib/bind/doc/html/options.html

@@ -13,6 +13,7 @@
 
 <PRE>
 options {
+  [ hostname <VAR>hostname_string</VAR>; ]
   [ version <VAR>version_string</VAR>; ]
   [ directory <VAR>path_name</VAR>; ]
   [ named-xfer <VAR>path_name</VAR>; ]
@@ -29,7 +30,8 @@ options {
   [ host-statistics <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ host-statistics-max <VAR>number</VAR>; ]
   [ multiple-cnames <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
-  [ notify <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
+  [ notify ( <VAR><A HREF="docdef.html">yes_or_no</A></VAR> | explicit ) <; ]
+  [ suppress-initial-notify <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ recursion <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ rfc2308-type1 <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ use-id-pool <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
@@ -67,6 +69,7 @@ options {
   [ <A HREF="#topology">topology</A> { <VAR>address_match_list</VAR> }; ]
   [ <A HREF="#sortlist">sortlist</A> { <VAR>address_match_list</VAR> }; ]
   [ rrset-order { <VAR>order_spec</VAR> ; [ <VAR>order_spec</VAR> ; ... ] }; ]
+  [ preferred-glue ( A | AAAA ); ]
 };
 </PRE>
 <HR>
@@ -80,16 +83,33 @@ first occurrence determines the actual options used,
 and a warning will be generated.  If there is no options statement,
 an options block with each option set to its default will be used.</P>
 
-<H4>Pathnames</H4>
+<H4>Server Information</H4>
 
 <DL>
+<DT><CODE>hostname</CODE>
+<DD>
+This defaults to the hostname of the machine hosting the nameserver
+as found by gethostname().
+Its prime purpose is to be able to identify which of a number of anycast
+servers is actually answering your queries by sending a <I>txt</I>
+query for <CODE>hostname.bind</CODE> in class <I>chaos</I> to the anycast
+server and getting back a unique name.
+Setting the hostname to a empty string ("") will disable processing of
+the queries.
+
 <DT><CODE>version</CODE>
 <DD>
 The version the server should report via the <VAR>ndc</VAR> command
 or via a query of name <CODE>version.bind</CODE> in class <I>chaos</I>.
 The default is the real version number of the server, but some server
 operators prefer the string <CODE>"surely you must be joking"</CODE>.
+Changing the value of this string will not prevent people from identifying
+what version you are running.
+</DL>
 
+<H4>Pathnames</H4>
+
+<DL>
 <DT><CODE>directory</CODE>
 <DD>
 The working directory of the server.  Any non-absolute
@@ -228,10 +248,17 @@ zone the server is authoritative for changes.  The use of NOTIFY
 speeds convergence between the master and its slaves.  Slave servers
 that receive a NOTIFY message, and understand it, will contact the
 master server for the zone to see if they need to do a zone transfer.  If
-they do, they will initiate it immediately.  The <CODE>notify</CODE>
+they do, they will initiate it immediately.  If <CODE>explicit</CODE>,
+the NOTIFY messages will only be sent to the addresses in the
+<CODE>also-notify</CODE> list.  The <CODE>notify</CODE>
 option may also be specified in the <CODE>zone</CODE> statement, in which
 case it overrides the <CODE>options notify</CODE> statement.
 
+<DT><CODE>suppress-initial-notify</CODE>
+<DD>
+If <CODE>yes</CODE>, suppress the initial notify messages when the server
+first loads.  The default is <CODE>no</CODE>.
+
 <DT><CODE>recursion</CODE>
 <DD>
 If <CODE>yes</CODE>, and a DNS query requests recursion, the
@@ -552,9 +579,8 @@ files</CODE> to specify the limit explicitly.
 
 <DT><CODE>max-ixfr-log-size</CODE>
 <DD>
-The <CODE>max-ixfr-log-size</CODE> will be used in a future release of 
-the server to limit the size of the 
-transaction log kept for Incremental Zone Transfer. 
+Limit the size of the transaction log kept for Incremental Zone Transfer. 
+Default 0 (unlimited).
 
 <DT><CODE>stacksize</CODE>
 <DD>
@@ -784,6 +810,15 @@ of:
 
 <P>is used.
 
+<H4>Glue Ordering</H4>
+
+When running a root nameserver it is sometimes necessary to ensure that
+other nameservers that are priming are successful.  This requires
+that glue A records for at least of the nameservers are returned in
+the answer to a priming query.  This can be achieved by setting
+<CODE>preferred-glue A;</CODE> which will add A records before other types
+in the additional section.
+
 <H4>Tuning</H4>
 
 <DL>
@@ -812,7 +847,7 @@ request for the root servers to be accepted.  Default 2.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: options.html,v 1.43 2001/03/03 05:08:55 marka Exp $
+Last Updated: $Id: options.html,v 1.48 2002/04/25 05:27:00 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>

contrib/bind/doc/html/server.html

@@ -13,6 +13,7 @@
 
 <PRE>
 server <VAR><A HREF="docdef.html">ip_addr</A></VAR> {
+  [ edns <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ bogus <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ support-ixfr <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
   [ transfers <VAR><A HREF="docdef.html">number</A></VAR>; ]
@@ -28,12 +29,20 @@ server <VAR><A HREF="docdef.html">ip_addr</A></VAR> {
 <P>The server statement defines the characteristics to be
 associated with a remote name server.</P>
 
+<P>If you discover that a server does not support EDNS you can prevent
+named making EDNS queries to it by specifying <CODE>edns no;</CODE>.
+The default value of <CODE>edns</CODE> is <CODE>yes</CODE>.
+
 <P>If you discover that a server is giving out bad data, marking it as
 <CODE>bogus</CODE> will prevent further queries to it.  The default value of
 <CODE>bogus</CODE> is <CODE>no</CODE>.  Marking a server as <CODE>bogus</CODE>
 will mark all other addresses for that server as <CODE>bogus</CODE> when
 a match is made when looking up a server's address by name. 
 
+<P>If the server supports IXFR you can tell named to attempt to perform a
+IXFR style zone transfer by specifing <CODE>support-ixfr yes</CODE>.
+The default value of <CODE>support-ixfr</CODE> is <CODE>no</CODE>.
+
 <P>The server supports two zone transfer methods.  The first,
 <CODE>one-answer</CODE>, uses one DNS message per resource record
 transferred.  <CODE>many-answers</CODE> packs as many resource records
@@ -65,7 +74,7 @@ required to be signed by this key.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: server.html,v 1.11 2000/11/08 04:15:07 marka Exp $
+Last Updated: $Id: server.html,v 1.13 2002/05/24 03:04:51 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>

contrib/bind/doc/html/zone.html

@@ -22,7 +22,7 @@ zone <VAR><A HREF="docdef.html">domain_name</A></VAR> [ ( in | hs | hesiod | cha
   [ allow-query { <VAR><A HREF="address_list.html">address_match_list</A></VAR> }; ]
   [ allow-transfer { <VAR><A HREF="address_list.html">address_match_list</A></VAR> }; ]
   [ dialup <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
-  [ notify <VAR><A HREF="docdef.html">yes_or_no</A></VAR>; ]
+  [ notify (<VAR><A HREF="docdef.html">yes_or_no</A></VAR> | explicit ); ]
   [ also-notify { <VAR><A HREF="docdef.html">ip_addr</A></VAR>; [ <VAR>ip_addr</VAR>; ... ] }; ]
   [ ixfr-base  <VAR><A HREF="docdef.html">path_name</A></VAR>; ]
   [ pubkey <VAR><A HREF="docdef.html">number</A></VAR> <VAR><A HREF="docdef.html">number</A></VAR> <VAR><A HREF="docdef.html">number</A></VAR> <VAR>string</VAR>; ]
@@ -32,7 +32,7 @@ zone <VAR><A HREF="docdef.html">domain_name</A></VAR> [ ( in | hs | hesiod | cha
   type ( slave | stub );
   [ file <VAR><A HREF="docdef.html">path_name</A></VAR>; ]
   [ ixfr-base  <VAR><A HREF="docdef.html">path_name</A></VAR>; ]
-  masters [ port <VAR><A HREF="docdef.html">ip_port</A></VAR> ] { <VAR><A HREF="docdef.html">ip_addr</A></VAR>; [ <VAR>ip_addr</VAR>; ... ] };
+  masters [ port <VAR><A HREF="docdef.html">ip_port</A></VAR> ] { <VAR><A HREF="docdef.html">ip_addr</A></VAR> [key <VAR><A HREF="key.html">key_id</A></VAR>]; [ ... ] };
   [ forward ( only | first ); ]
   [ forwarders { [ <VAR><A HREF="docdef.html">ip_addr</A></VAR> ; [ <VAR>ip_addr</VAR> ; ... ] ] }; ]
   [ check-names ( warn | fail | ignore ); ]
@@ -238,7 +238,7 @@ string representing the key.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: zone.html,v 1.24 2000/01/12 01:28:32 cyarnell Exp $
+Last Updated: $Id: zone.html,v 1.26 2002/04/25 05:27:02 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>

contrib/bind/doc/man/dig.1

@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.\" $Id: dig.1,v 8.4 1999/10/15 21:29:58 vixie Exp $
+.\" $Id: dig.1,v 8.9 2002/06/18 01:53:43 marka Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -96,12 +96,12 @@ will take the form:
 where:
 .Bl -tag -width Fl
 .It Ar server
-may be either a domain name or a dot-notation
+may be either a domain name or a raw (IPv4 / IPv6)
 Internet address. If this optional field is omitted, 
 .Ic dig
 will attempt to use the default name server for your machine.
 .Pp
-.Em Note:
+.Em Note :
 If a domain name is specified, this will be resolved
 using the domain name system resolver (i.e., BIND). If your
 system does not support DNS, you may 
@@ -117,7 +117,7 @@ itself can be resolved. See
 .Xr resolver @FORMAT_EXT@
 for information on 
 .Pa /etc/resolv.conf .
-.Sy WARNING: 
+.Sy WARNING :
 Changing 
 .Pa /etc/resolv.conf 
 will affect both the standard resolver library and 
@@ -145,7 +145,7 @@ See the
 .Fl x 
 option (documented in the
 .Sx OTHER OPTIONS 
-subsection of this section) for convenient way to specify inverse address
+subsection of this section) for convenient way to specify reverse address
 query.
 .It Ar query-type
 is the type of information (DNS query type) that
@@ -190,7 +190,7 @@ all/any class information
 .Pp
 (See RFC 1035 for the complete list.)
 .Pp
-.Em Note:
+.Em Note :
 .Dq Ar Any
 can be used to specify a 
 .Em class 
@@ -240,9 +240,15 @@ available (although not guaranteed to be useful):
 .It Fl x Ar dot-notation-address
 Convenient form to specify inverse address mapping.
 Instead of 
-.Dq Ic dig 32.0.9.128.in-addr.arpa , 
+.Dq Ic dig 32.0.9.28.in-addr.arpa , 
 one can simply 
-.Dq Ic dig -x 128.9.0.32 .
+.Dq Ic dig -x 28.9.0.32 .
+.It Fl x Ar IPv6-address
+Convenient form to specify inverse address mapping.
+Instead of 
+.Dq Ic dig 1.0.0.0.0.0.0.0.0.0.0.0. 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ,
+one can simply 
+.Dq Ic dig -x ::1 .
 .It Fl f Ar file
 File for 
 .Ic dig
@@ -323,7 +329,7 @@ environment is saved.  If not, the file
 .Dq Pa DiG.env 
 is created in the current working directory.
 .Pp
-.Em Note: 
+.Em Note :
 .Ev LOCALDEF 
 is specific to the 
 .Ic dig
@@ -521,6 +527,13 @@ print TTLs
 .Bq Cm tt
 .It Xo
 .Op Cm no 
+.Ns Cm trunc\ \ \ \ 
+.Pq Cm tr
+.Xc
+truncate origin from names
+.Bq Cm tr
+.It Xo
+.Op Cm no 
 .Ns Cm cl
 .Xc
 print class info 
@@ -566,6 +579,13 @@ print authoritative section
 .Xc
 print additional section 
 .Bq Cm ad
+.It Xo
+.Op Cm no 
+.Ns Cm dnssec\ \ \ 
+.Pq Cm \ddn
+.Xc
+set the DNSSEC OK bit in the OPT pseudo record
+.Bq Cm nodn
 .It Cm pfdef 
 set to default print flags
 .It Cm pfmin 
@@ -642,7 +662,7 @@ and
 options, above.
 .Sh FILES
 .Bl -tag -width "/etc/resolv.conf  " -compact
-.It Pa /etc/resolv.conf	
+.It Pa /etc/resolv.conf
 initial domain name and name server addresses
 .It Pa \./DiG.env
 default save file for default options
@@ -673,7 +693,8 @@ rather ad hoc genesis.
 .Ic Dig
 does not consistently exit nicely (with appropriate status)
 when a problem occurs somewhere in the resolver 
-.Po Sy NOTE: 
+.Po
+.Sy NOTE :
 most of the common exit cases are handled
 .Pc .  
 This is particularly annoying when running in

contrib/bind/doc/man/dnskeygen.1

@@ -13,26 +13,26 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.\" $Id: dnskeygen.1,v 8.5 1999/02/23 05:20:18 vixie Exp $
+.\" $Id: dnskeygen.1,v 8.8 2002/04/22 04:27:19 marka Exp $
 .\"
 .Dd December 2, 1998
 .Dt DNSKEYGEN @CMD_EXT_U@
 .Os BSD 4
 .Sh NAME
 .Nm dnskeygen 
-.Nd generate public, private, and shared secret keys for DNS Security
+.Nd "generate public, private, and shared secret keys for DNS Security"
 .Sh SYNOPSIS
 .Nm dnskeygen
-.Oo Fl
-.Op Cm DHR
+.Oo
+.Fl Op Cm DHR
 .Ar size
 .Oc
 .Op Fl F
-.Fl Op Cm zhu
-.Op Cm Fl a
-.Op Cm Fl c
-.Op Cm Fl p Ar num
-.Op Cm Fl s Ar num
+.Op Fl Cm zhu
+.Op Fl Cm a
+.Op Fl Cm c
+.Op Fl Cm p Ar num
+.Op Fl Cm s Ar num
 .Fl n Ar name
 .Sh DESCRIPTION
 .Ic Dnskeygen
@@ -61,7 +61,7 @@ key.
 .Dq size
 must be between 512 and 4096.
 .It Fl F
-.Ic (RSA only)
+.Ic ( RSA only )
 Use a large exponent for key generation.
 .It Fl z Fl h Fl u
 These flags define the type of key being generated: Zone (DNS validation) key,
@@ -77,8 +77,8 @@ Indicates that the key
 be used for encryption.
 .It Fl p Ar num
 Sets the key's protocol field to
-.Ar num
-; the default is
+.Ar num ;
+the default is
 .Ic 3
 (DNSSEC) if
 .Dq Fl z
@@ -95,12 +95,12 @@ is specified and
 (ANY).
 .It Fl s Ar num
 Sets the key's strength field to
-.Ar num;
+.Ar num ;
 the default is
-.Sy 0.
+.Sy 0 .
 .It Fl n Ar name
 Sets the key's name to
-.Ar name.
+.Ar name .
 .El
 .Ss DETAILS
 .Ic Dnskeygen

contrib/bind/doc/man/dnsquery.1

@@ -1,4 +1,4 @@
-.\" $Id: dnsquery.1,v 8.3 1999/01/08 18:54:21 vixie Exp $
+.\" $Id: dnsquery.1,v 8.5 2002/06/18 02:04:54 marka Exp $
 .\"
 .\"Copyright (c) 1995,1996,1999 by Internet Software Consortium
 .\"
@@ -49,8 +49,10 @@ are treated without case-sensitivity.
 .Bl -tag -width Fl
 .It Fl n Ar nameserver
 The nameserver to be used in the query.  Nameservers can appear as either 
-Internet addresses of the form 
-.Ar w.x.y.z 
+Internet addresses of the form
+.Ar ( w.x.y.z
+or
+.Ar xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx )
 or can appear as domain names.
 (Default: as specified in 
 .Pa /etc/resolv.conf . ) 
@@ -63,25 +65,25 @@ address
 nameserver
 .It Ar CNAME
 canonical name
-.It Ar PTR	
+.It Ar PTR
 domain name pointer
-.It Ar SOA	
+.It Ar SOA
 start of authority
-.It Ar WKS	
+.It Ar WKS
 well-known service
 .It Ar HINFO
 host information
 .It Ar MINFO
 mailbox information
-.It Ar MX	
+.It Ar MX
 mail exchange
-.It Ar RP	
+.It Ar RP
 responsible person
-.It Ar MG	
+.It Ar MG
 mail group member
-.It Ar AFSDB	
+.It Ar AFSDB
 DCE or AFS server
-.It Ar ANY	
+.It Ar ANY
 wildcard
 .El
 .Pp
@@ -91,13 +93,13 @@ Note that any case may be used.  (Default:
 The class of resource records of interest.
 Classes include:
 .Bl -tag -width "CHAOS  " -compact -offset indent
-.It Ar IN	
+.It Ar IN
 Internet
-.It Ar HS	
+.It Ar HS
 Hesiod
 .It Ar CHAOS
 Chaos
-.It Ar ANY	
+.It Ar ANY
 wildcard
 .El
 .Pp
@@ -135,9 +137,9 @@ The name of the host (or domain) of interest.
 .Bl -tag -width "<arpa/nameser.h>  " -compact
 .It Pa /etc/resolv.conf 
 to get the default ns and search lists
-.It Pa <arpa/nameser.h> 	
+.It Pa <arpa/nameser.h>
 list of usable RR types and classes
-.It Pa <resolv.h>		
+.It Pa <resolv.h>
 list of resolver flags
 .El
 .Sh DIAGNOSTICS

contrib/bind/doc/man/getaddrinfo.3

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"     $Id: getaddrinfo.3,v 8.1 1999/01/11 21:30:51 vixie Exp $
+.\"     $Id: getaddrinfo.3,v 8.3 2001/12/28 04:24:15 marka Exp $
 .\"
 .Dd May 25, 1995
 .Dt GETADDRINFO @LIB_NETWORK_EXT@
@@ -97,9 +97,7 @@ A
 .Pf non Dv -NULL
 .Fa nodename
 string can be either a node name or a numeric host address string
-.Po
-i.e., a dotted-decimal IPv4 address or an IPv6 hex address
-.Pc .
+(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
 A
 .Pf non Dv -NULL
 .Fa servname
@@ -218,7 +216,8 @@ call to
 .Pq for a connection-oriented protocol
 or either
 .Fn connect ,
-.Fn sendto , or
+.Fn sendto ,
+or
 .Fn sendmsg
 .Pq for a connectionless protocol .
 In this case, if the
@@ -356,6 +355,6 @@ The
 .Fn getaddrinfo
 function is defined IEEE POSIX 1003.1g draft specification,
 and documented in ``Basic Socket Interface Extensions for IPv6''
-.Pq RFC2133 .
+(RFC2133).
 .Sh BUGS
 The text was shamelessly copied from RFC2133.

contrib/bind/doc/man/gethostbyname.3

@@ -31,19 +31,19 @@
 .Sh SYNOPSIS
 .Fd #include <netdb.h>
 .Ft extern int 
-.Fa h_errno;
+.Fa h_errno ;
 .Pp
 .Ft struct hostent *
-.Fn gethostbyname "char *name";
+.Fn gethostbyname "char *name"
 .Ft struct hostent *
-.Fn gethostbyname2 "char *name" "int af";
+.Fn gethostbyname2 "char *name" "int af"
 .Ft struct hostent *
-.Fn gethostbyaddr "char *addr" "int len, type";
+.Fn gethostbyaddr "char *addr" "int len, type"
 .Ft struct hostent *
 .Fn gethostent
-.Fn sethostent "int stayopen";
+.Fn sethostent "int stayopen"
 .Fn endhostent
-.Fn herror "char *string";
+.Fn herror "char *string"
 .Sh DESCRIPTION
 .Fn Gethostbyname ,
 .Fn gethostbyname2 ,
@@ -140,21 +140,17 @@ Otherwise, queries are performed using UDP datagrams.
 .Fn Endhostent
 closes the TCP connection.
 .Sh ENVIRONMENT
-.Bl -tag -width "HOSTALIASES  " -compress
+.Bl -tag -width "HOSTALIASES  " -compact
 .It Ev HOSTALIASES
 Name of file containing 
 .Pq Ar host alias , full hostname
 pairs.
 .El
 .Sh FILES
-.Bl -tag -width "HOSTALIASES  " -compress
+.Bl -tag -width "HOSTALIASES  " -compact
 .It Pa /etc/hosts
 See
 .Xr hosts @FORMAT_EXT@ .
-.It Ev HOSTALIASES
-Name of file containing 
-.Pq Ar host alias , full hostname
-pairs.
 .El
 .Sh DIAGNOSTICS
 .Pp
@@ -222,7 +218,7 @@ when
 is built to use only the routines to lookup in
 .Pa /etc/hosts 
 and not the name server:
-.Bd  -filled -offset indent
+.Bd -ragged -offset indent
 .Pp
 .Fn Gethostent
 reads the next line of

contrib/bind/doc/man/getipnodebyname.3

@@ -43,11 +43,11 @@
 .Fd #include <netdb.h>
 .Pp
 .Ft struct hostent *
-.Fn getipnodebyname "const char *name" "int af" "int flags" "int *error";
+.Fn getipnodebyname "const char *name" "int af" "int flags" "int *error"
 .Ft struct hostent *
-.Fn getipnodebyaddr "const void *addr" "size_t len" "int af" "int *error";
+.Fn getipnodebyaddr "const void *addr" "size_t len" "int af" "int *error"
 .Ft void
-.Fn freehostent "struct hostent *he";
+.Fn freehostent "struct hostent *he"
 .Sh DESCRIPTION
 .Fn Getipnodebyname ,
 and
@@ -166,21 +166,17 @@ should not be passed to
 .Fn freehostent
 as they are pointers to static areas.
 .Sh ENVIRONMENT
-.Bl -tag -width "HOSTALIASES  " -compress
+.Bl -tag -width "HOSTALIASES  " -compact
 .It Ev HOSTALIASES
 Name of file containing 
 .Pq Ar host alias , full hostname
 pairs.
 .El
 .Sh FILES
-.Bl -tag -width "HOSTALIASES  " -compress
+.Bl -tag -width "HOSTALIASES  " -compact
 .It Pa /etc/hosts
 See
 .Xr hosts @FORMAT_EXT@ .
-.It Ev HOSTALIASES
-Name of file containing 
-.Pq Ar host alias , full hostname
-pairs.
 .El
 .Sh DIAGNOSTICS
 .Pp

contrib/bind/doc/man/getnameinfo.3

@@ -1,4 +1,4 @@
-.\" $Id: getnameinfo.3,v 8.1 1999/01/11 21:30:51 vixie Exp $
+.\" $Id: getnameinfo.3,v 8.2 2001/12/28 04:24:16 marka Exp $
 .\"
 .\"Copyright (c) 1998,1999 by Internet Software Consortium
 .\"
@@ -100,4 +100,4 @@ The
 .Fn getaddrinfo
 function is defined IEEE POSIX 1003.1g draft specification,
 and documented in ``Basic Socket Interface Extensions for IPv6''
-.Pq RFC2133 .
+(RFC2133).

contrib/bind/doc/man/getnetent.3

@@ -1,4 +1,4 @@
-.\" $Id: getnetent.3,v 8.4 1999/01/08 18:54:23 vixie Exp $
+.\" $Id: getnetent.3,v 8.6 2001/12/28 04:24:17 marka Exp $
 .\"
 .\"Copyright (c) 1995,1996,1999 by Internet Software Consortium
 .\"
@@ -30,11 +30,11 @@
 .Ft struct netent *
 .Fn getnetent
 .Ft struct netent *
-.Fn getnetbyname "char name";
+.Fn getnetbyname "char name"
 .Ft struct netent *
-.Fn getnetbyaddr "unsigned long net" "int type";
+.Fn getnetbyaddr "unsigned long net" "int type"
 .Ft void 
-.Fn setnetent "int stayopen";
+.Fn setnetent "int stayopen"
 .Ft void 
 .Fn endnetent
 .Sh DESCRIPTION
@@ -145,7 +145,8 @@ The
 .Fn "setnetent" , 
 and
 .Fn "endnetent"
-functions appeared in 4.2BSD.
+functions appeared in
+.Bx 4.2 .
 .Sh BUGS
 The data space used by these functions is static; if future use requires the
 data, it should be copied before any subsequent calls to these functions

contrib/bind/doc/man/host.1

@@ -1,3 +1,4 @@
+.\" $FreeBSD$
 .\" ++Copyright++ 1993
 .\" -
 .\" Copyright (c) 1993
@@ -50,9 +51,7 @@
 .\" SOFTWARE.
 .\" -
 .\" --Copyright--
-.\" $Id: host.1,v 8.4 2000/02/29 03:50:47 vixie Exp $
-.\" $FreeBSD$
-.\"
+.\" $Id: host.1,v 8.7 2002/06/18 02:39:26 marka Exp $
 .Dd December 15, 1994
 .Dt HOST @CMD_EXT_U@
 .Os BSD 4
@@ -61,16 +60,20 @@
 .Nd look up host names using domain server
 .Sh SYNOPSIS 
 .Nm host 
-.Op Fl adlrwv
-.Op Fl c Ar class
+.Op Fl l
+.Op Fl v
+.Op Fl w
+.Op Fl r
+.Op Fl d
 .Op Fl t Ar querytype
+.Op Fl a 
 .Ar host 
 .Op Ar server 
 .Sh DESCRIPTION 
 .Ic Host
 looks for information about Internet hosts.  It gets this information
 from a set of interconnected servers that are spread across the
-country.  By default, it simply converts between host names and
+world.  By default, it simply converts between host names and
 Internet addresses.  However, with the 
 .Dq Fl t 
 or 
@@ -82,7 +85,7 @@ by the domain server.
 The arguments can be either host names or host numbers.  The program
 first attempts to interpret them as host numbers.  If this fails,
 it will treat them as host names.  A host number consists of
-four decimal numbers separated by dots, e.g. 128.6.4.194
+IPv4 dotted decimal quad (127.0.0.1) or IPv6 raw address (::1).
 A host name consists of names separated by dots, e.g. topaz.rutgers.edu.  
 Unless the name ends in a dot, the local domain
 is automatically tacked on the end.  Thus, a Rutgers user can say
@@ -156,39 +159,23 @@ There are a number of options that can be used before the
 host name.  Most of these options are meaningful only to the
 staff who have to maintain the domain database.
 .Bl -tag -width Fl
-.It Fl a 
-.Dq all ;
-this is equivalent to 
-.Dq Fl v Fl t Cm any .
-.It Fl c Ar class
-The 
-.Ar class
-to look for non-Internet data.
-.It Fl d
-Turn on debugging.  Network transactions are shown in detail.
-.It Fl l
-List a complete domain; e.g.:
-.Pp
-.D1 Ic host -l rutgers.edu
-.Pp
-will give a listing of all hosts in the rutgers.edu domain.  The 
-.Dq Fl t
-option is used to filter what information is presented, as you 
-would expect.  The default is address information, which also
-include PTR and NS records.  The command
-.Pp
-.D1 Ic host -l -v -t any rutgers.edu
-.Pp
-will give a complete download of the zone data for rutgers.edu,
-in the official master file format.  (However the SOA record is
-listed twice, for arcane reasons.)  
-.Pp
-.Sy NOTE: 
-.Dq Fl l 
-is implemented by
-doing a complete zone transfer and then filtering out the information
-that you have asked for.  This command should be used only if it
-is absolutely necessary.
+.It Fl w 
+This causes 
+.Ic host 
+to wait forever for a response.  Normally
+it will time out after approximate one minute.
+.It Fl v
+Use "verbose" format for printout.  This
+is the official domain master file format, which is documented 
+in the man page for 
+.Xr @INDOT@named @SYS_OPS_EXT@ .
+Without this option, output still follows
+this format in general terms, but some attempt is made to make it
+more intelligible to normal users.  Without 
+.Dq Fl v ,
+any "a", "mx", and "cname" records
+are written out as "has address", "mail is handled by", and
+"is a nickname for" (respectively), and TTL and class fields are not shown.
 .It Fl r
 Turn off recursion in the request.
 This means that the name server will return only data it has in
@@ -206,6 +193,7 @@ to be looked up.  The arguments are defined in the man page for
 .Xr @INDOT@named @SYS_OPS_EXT@ .
 Currently-supported types include: 
 .Dq Cm a , 
+.Dq Cm aaaa , 
 .Dq Cm ns , 
 .Dq Cm md , 
 .Dq Cm mf , 
@@ -265,7 +253,7 @@ will give a complete download of the zone data for rutgers.edu,
 in the official master file format.  (However the SOA record is
 listed twice, for arcane reasons.)  
 .Pp
-.Sy NOTE: 
+.Sy NOTE :
 .Dq Fl l 
 is implemented by
 doing a complete zone transfer and then filtering out the information
@@ -289,21 +277,17 @@ host name.  The name file must be contained in the
 .Ev HOSTALIASES 
 environment variable.
 .Sh ENVIRONMENT
-.Bl -tag -width "/etc/resolv.conf  " -compress
+.Bl -tag -width "/etc/resolv.conf  " -compact
 .It Ev HOSTALIASES
 Name of file containing
 .Pq Ar host alias , full hostname
 pairs.
 .El
 .Sh FILES
-.Bl -tag -width "/etc/resolv.conf  " -compress
+.Bl -tag -width "/etc/resolv.conf  " -compact
 .It Pa /etc/resolv.conf 
 See
 .Xr resolver @FORMAT_EXT@ .
-.It Ev HOSTALIASES
-Name of file containing
-.Pq Ar host alias , full hostname
-pairs.
 .El
 .Sh SEE ALSO
 .Xr @INDOT@named  @SYS_OPS_EXT@ , 

contrib/bind/doc/man/hostname.7

@@ -147,7 +147,7 @@ If the name was not previously tried
 threshold or did not contain a dot), then the name as
 originally provided is attempted.
 .Sh ENVIRONMENT
-.Bl -tag -width "/etc/resolv.conf  " -compress
+.Bl -tag -width "/etc/resolv.conf  "
 .It Ev LOCALDOMAIN   
 Affects domains appended to partial hostnames.
 .It Ev HOSTALIASES
@@ -156,14 +156,11 @@ Name of file containing
 pairs.
 .El
 .Sh FILES
-.Bl -tag -width "/etc/resolv.conf  " -compress
+.Bl -tag -width "/etc/resolv.conf  " -compact
 .It Pa /etc/resolv.conf
 See
 .Xr resolve @FORMAT_EXT@ .
-.It Ev HOSTALIASES
-Name of file containing 
-.Pq Ar host alias , full hostname
-pairs.
+.El
 .Sh SEE ALSO
 .Xr gethostbyname @LIB_NETWORK_EXT@ ,
 .Xr resolver @FORMAT_EXT@ ,

contrib/bind/doc/man/inet_cidr.3

@@ -1,4 +1,4 @@
-.\" $Id: inet_cidr.3,v 8.2 1999/01/08 18:54:24 vixie Exp $
+.\" $Id: inet_cidr.3,v 8.3 2001/08/08 07:50:06 marka Exp $
 .\"
 .\"Copyright (c) 1998,1999 by Internet Software Consortium
 .\"
@@ -44,13 +44,13 @@ converts an address from network to presentation format.
 .Pp
 .Ft af
 describes the type of address that is being passed in
-.Ft src. 
+.Ft src .
 .\"Currently defined types are AF_INET and AF_INET6.
 Currently only AF_INET is supported.
 .Pp
 .Ft src
 is an address in network byte order, its length is determined from
-.Ft af.
+.Ft af .
 .Pp
 .Ft bits
 specifies the number of bits in the netmask unless it is -1 in which case
@@ -71,13 +71,13 @@ Check errno for reason.
 converts and address from presentation format, with optional CIDR
 reperesentation, to network format.
 The resulting address is zero filled if there were insufficint bits in
-.Ft src.
+.Ft src .
 .Pp
 .Ft af
 describes the type of address that is being passed in via 
 .Ft src
 and determines the size of 
-.Ft dst.
+.Ft dst .
 .Pp
 .Ft src
 is an address in presentation format.

contrib/bind/doc/man/mailaddr.7

@@ -122,7 +122,7 @@ Under some circumstances it may be necessary to route a message through
 several hosts to get it to the final destination.  Normally this routing
 is done automatically, but sometimes it is desirable to route the message
 manually.  Addresses which show these relays are termed 
-.Dq route-addrs.
+.Dq route-addrs .
 These use the syntax:
 .Bd -ragged -offset indent-two
 .Li <@hosta,@hostb:user@hostc>

contrib/bind/doc/man/mkdep.1

@@ -26,7 +26,7 @@
 .Op Fl ap
 .Op Fl f Ar depend_file
 .Op Ar flags 
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Ic Mkdep
 takes a set of flags for the C compiler and a list
@@ -73,9 +73,7 @@ C module.
 The 
 .Dq Fl a 
 option causes appending to the output file, so that multiple 
-.Xo Ic mkdep 
-.Ns 's 
-.Xc
+.Ic mkdep Ns 's 
 may be run from a single 
 .Pa Makefile .
 .Sh SEE ALSO

contrib/bind/doc/man/named-bootconf.8

@@ -48,7 +48,6 @@
 .\" 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.
-
 .Dd November 19, 1998
 .Dt NAMED-BOOTCONF 8
 .Os NetBSD

contrib/bind/doc/man/named-xfer.8

@@ -89,9 +89,7 @@
 .Op Fl p Ar port#
 .Op Fl S 
 .Ar nameserver 
-.Op Ar [ Sy axfr 
-| 
-.Op Sy ixfr ]
+.Op Sy axfr | ixfr
 .Sh DESCRIPTION
 .Ic Named-xfer
 is an ancillary program executed by
@@ -161,7 +159,7 @@ for more information.
 Additional arguments are taken as name server addresses in so-called
 .Dq dotted-quad 
 syntax 
-.Em only; 
+.Em only ;
 no host name are allowed here.  At least one address must be specified.  
 Any additional addresses will be tried, in order, if the first one fails 
 to transfer to us successfully.

contrib/bind/doc/man/named.8

@@ -92,7 +92,7 @@ or
 .Dq Fl c
 flags.
 .Pp
-.Sy NOTE:
+.Sy NOTE :
 Several of 
 .Nm named Ns 's
 options, and much more of its behaviour, can be controlled in the configuration 
@@ -111,7 +111,7 @@ is a number determines the level of messages printed.  If negative,
 is set to 
 .Dq 1 .
 .Pp
-.Sy NOTE:
+.Sy NOTE :
 The new debugging framework is considerably more sophisticated than it
 was in older versions of 
 .Nm @INDOT@named .
@@ -131,7 +131,7 @@ the port number returned by
 for service 
 .Dq Li domain .
 .Pp
-.Sy NOTE:
+.Sy NOTE :
 Previously, the syntax
 .Dq Fl p Ar port# Ns Op Ar \&/localport#
 was supported; the first port was that used when contacting 
@@ -169,7 +169,7 @@ has been compiled with
 .Li QRYLOG 
 defined.  
 .Pp
-.Sy NOTE: 
+.Sy NOTE :
 This option is deprecated in favor of the
 .Dq Li queries
 .Em logging category 
@@ -183,7 +183,7 @@ Turns recursion off in the server.  Answers can come only from local
 (primary or secondary) zones.  This can be used on root servers.
 The default is to use recursion.
 .Pp
-.Sy NOTE: 
+.Sy NOTE :
 This option can be overridden by and is deprecated in favor of the
 .Dq Li recursion 
 clause of the configuration file's
@@ -242,7 +242,7 @@ where:
 .Bl -tag -width "opt_domain  " 
 .It Ar domain
 is 
-.Dq Li \&. 
+.Dq Li .\&
 for root, 
 .Dq Li @ 
 for the current origin, or a standard domain name. If
@@ -252,7 +252,7 @@ is a standard domain name that does
 end with 
 .Dq Li \&. , 
 the current origin is appended to the domain. Domain names ending with 
-.Dq Li \&.
+.Dq Li .\&
 are unmodified.
 .It Ar opt_domain
 This field is used to define an origin for the data in an included file.
@@ -270,7 +270,7 @@ an explicit ttl.
 .It Ar opt_ttl
 An optional integer number for the time-to-live field.
 If not set the ttl is taken from the last $TTL statement.
-If no $TTL statement has occured then the SOA minimum value is used and a
+If no $TTL statement has occurred then the SOA minimum value is used and a
 warning is generated.
 .It Ar opt_class
 The object address type; currently only one type is supported,
@@ -310,7 +310,7 @@ Resource records normally end at the end of a line,
 but may be continued across lines between opening and closing parentheses.
 Comments are introduced by semicolons and continue to the end of the line.
 .Pp
-.Sy NOTE:
+.Sy NOTE :
 There are other resource record types not shown here.  You should
 consult the 
 .Sy BIND 
@@ -400,19 +400,21 @@ Saves any modified dynamic zones to the file system, and shuts down the server.
 Turns on debugging; each 
 .Dv SIGUSR1 
 increments debug level.
-.Po Dv SIGEMT 
+.Po
+.Dv SIGEMT
 on older systems without 
 .Dv SIGUSR1 .
 .Pc 
 .It Dv SIGUSR2
 Turns off debugging completely.
-.Po Dv SIGFPE 
+.Po
+.Dv SIGFPE
 on older systems without 
 .Dv SIGUSR2 .
 .Pc
 .It Dv SIGWINCH
 Toggles logging of all incoming queries via 
-.Xr syslog @SYS_OPS_EXT@
+.Xr syslog @LIB_C_EXT@
 (requires server to have been built with the 
 .Li QRYLOG 
 option).
@@ -431,12 +433,13 @@ debug output
 nameserver statistics data
 .El
 .Sh SEE ALSO
+.Xr named.conf @FORMAT_EXT@ ,
 .Xr gethostbyname @LIB_NETWORK_EXT@ ,
 .Xr hostname @DESC_EXT@ ,
 .Xr kill @CMD_EXT@ ,
 .Xr resolver @LIB_NETWORK_EXT@ , 
 .Xr resolver @FORMAT_EXT@ , 
-.Xr signal @SYSCALL_EXT@ ,
+.Xr signal @LIB_C_EXT@ ,
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
 RFC 2308
 .Dq Name Server Operations Guide for Sy BIND

contrib/bind/doc/man/ndc.8

@@ -94,7 +94,7 @@ Exit from
 command interpreter.
 .It Ar /trace
 Toggle tracing (see
-.Fl -t
+.Fl t
 description above).
 .It Ar /debug
 Toggle debugging (see
@@ -125,7 +125,7 @@ mode, there is no
 command and the
 .Ar restart
 command just tells the name server to
-.Xr execvp 2
+.Xr execvp @LIB_C_EXT@
 itself.
 .Sh AUTHOR
 Paul Vixie (Internet Software Consortium)

contrib/bind/doc/man/nslookup.8

@@ -172,7 +172,7 @@ command.
 Connects with the finger server on the current host. 
 The current host is defined when a previous lookup for a host
 was successful and returned address information (see the 
-.Dq Ic set querytype=A 
+.Dq Ic set querytype Ns = Ns Dv A 
 command).
 The 
 .Ar name 
@@ -225,12 +225,13 @@ Sorts and lists the output of previous
 command(s) with 
 .Xr more @CMD_EXT@ .
 .It Ic help
-.It Ic ?
+.It Ic ?\&
 Prints a brief summary of commands.
 .It Ic exit
 Exits the program.
-.It Xo Ic set Ar keyword 
-.Ns Op = Ns Ar value
+.It Xo
+.Ic set
+.Ar keyword Ns Op = Ns Ar value
 .Xc
 This command is used to change state information that affects the lookups.
 Valid keywords are:
@@ -239,7 +240,7 @@ Valid keywords are:
 Prints the current values of the frequently-used options to 
 .Ic set .
 Information about the  current default server and host is also printed.
-.It Ic class= Ns Ar value
+.It Ic class Ns = Ns Ar value
 Change the query class to one of:
 .Bl -tag -width "HESIOD  "
 .It Dv IN
@@ -258,8 +259,8 @@ The class specifies the protocol group of the information.
 .Dv IN ; 
 abbreviation = 
 .Ic cl )
-.It Xo Op Ic no 
-.Ns Ic debug
+.It Xo
+.Oo Ic no Oc Ns Ic debug
 .Xc
 Turn debugging mode on.  A lot more information is printed about the
 packet sent to the server and the resulting answer.
@@ -267,18 +268,16 @@ packet sent to the server and the resulting answer.
 (Default = 
 .Ic nodebug ; 
 abbreviation = 
-.Xo Op Ic no
-.Ns Ic deb )
-.Xc
-.It Xo Op Ic no 
-.Ns Ic d2
+.Oo Ic no Oc Ns Ic deb )
+.It Xo
+.Oo Ic no Oc Ns Ic d2
 .Xc
 Turn exhaustive debugging mode on.
 Essentially all fields of every packet are printed.
 .Pp
 (Default = 
 .Ic nod2 )
-.It Ic domain= Ns Ar name
+.It Ic domain Ns = Ns Ar name
 Change the default domain name to 
 .Ar name . 
 The default domain name is appended to a lookup request depending on the
@@ -302,10 +301,17 @@ command to display the list.
 .Xr hostname @CMD_EXT@ , 
 .Pa /etc/resolv.conf ,
 or 
-.Ev LOCALDOMAIN;
+.Ev LOCALDOMAIN ;
 abbreviation = 
 .Ic do )
-.It Ic srchlist= Ns Ar name1/name2/...
+.It Xo
+.Sm off
+.Ic srchlist No =
+.Ar name1 No /
+.Ar name2 No /
+.Ar ...
+.Sm on
+.Xc
 Change the default domain name to 
 .Ar name1 
 and the domain search list
@@ -331,11 +337,11 @@ command to display the list.
 .Xr hostname @CMD_EXT@ , 
 .Pa /etc/resolv.conf ,
 or 
-.Ev LOCALDOMAIN;
+.Ev LOCALDOMAIN ;
 abbreviation = 
 .Ic srchl )
-.It Xo Op Ic no
-.Ns Ic defname
+.It Xo
+.Oo Ic no Oc Ns Ic defname
 .Xc
 If set, append the default domain name to a single-component lookup request 
 (i.e., one that does not contain a period).
@@ -343,11 +349,9 @@ If set, append the default domain name to a single-component lookup request
 (Default = 
 .Ic defname ; 
 abbreviation = 
-.Xo Op Ic no
-.Ns Ic defname )
-.Xc
-.It Xo Op Ic no 
-.Ns Ic search
+.Oo Ic no Oc Ns Ic defname )
+.It Xo
+.Oo Ic no Oc Ns Ic search
 .Xc
 If the lookup request contains at least one period but 
 .Em doesn't 
@@ -357,18 +361,16 @@ to the request until an answer is received.
 (Default = 
 .Ic search ; 
 abbreviation = 
-.Xo Op Ic no 
-.Ns Ic sea )
-.Xc
-.It Ic port= Ns Ar value
+.Oo Ic no Oc Ns Ic sea )
+.It Ic port Ns = Ns Ar value
 Change the default TCP/UDP name server port to 
 .Ar value .
 .Pp
 (Default = 53; 
 abbreviation = 
 .Ic \&po )
-.It Ic querytype= Ns Ar value
-.It Ic type= Ns Ar value
+.It Ic querytype Ns = Ns Ar value
+.It Ic type Ns = Ns Ar value
 Change the type of information query to one of:
 .Bl -tag -width "HINFO   "
 .It Dv A
@@ -399,15 +401,16 @@ the supported well-known services.
 .El
 .Pp
 Other types 
-.Pq Dv ANY, AXFR, MB, MD, MF, NULL 
+.Dv ( ANY , AXFR , MB ,
+.Dv MD , MF , NULL )
 are described in the RFC-1035 document.
 .Pp
 (Default = 
 .Dv A ; 
 abbreviations = 
 .Ic q , ty )
-.It Xo Op Ic no
-.Ns Ic recurse
+.It Xo
+.Oo Ic no Oc Ns Ic recurse
 .Xc
 Tell the name server to query other servers if it does not have the
 information.
@@ -415,10 +418,8 @@ information.
 (Default = 
 .Ic recurse ; 
 abbreviation =
-.Xo Op Ic no
-.Ns Ic rec )
-.Xc
-.It Ic retry= Ns Ar number
+.Oo Ic no Oc Ns Ic rec )
+.It Ic retry Ns = Ns Ar number
 Set the number of retries to 
 .Ar number .
 When a reply to a request is not received within a certain 
@@ -429,7 +430,7 @@ The retry value controls how many times a request is resent before giving up.
 .Pp
 (Default = 4, abbreviation = 
 .Ic ret )
-.It Ic root= Ns Ar host
+.It Ic root Ns = Ns Ar host
 Change the name of the root server to 
 .Ar host . 
 This affects the 
@@ -440,35 +441,31 @@ command.
 .Ic ns.internic.net. ;
 abbreviation = 
 .Ic ro )
-.It Ic timeout= Ns Ar number
+.It Ic timeout Ns = Ns Ar number
 Change the initial timeout interval for waiting for a reply to 
 .Ar number 
 seconds. Each retry doubles the timeout period.
 .Pp
 (Default = 5 seconds; abbreviation = 
 .Ic ti )
-.It Xo Op Ic no
-.Ns Ic vc
+.It Xo
+.Oo Ic no Oc Ns Ic vc
 .Xc
 Always use a virtual circuit when sending requests to the server.
 .Pp
 (Default = 
 .Ic novc ; 
 abbreviation = 
-.Xo Op Ic no
-.Ns Ic v )
+.Oo Ic no Oc Ns Ic v )
+.It Xo
+.Oo Ic no Oc Ns Ic ignoretc
 .Xc
-.It Xo Op Ic no
-.Ns Ic ignoretc
-.Xc 
 Ignore packet truncation errors.
 .Pp
 (Default = 
 .Ic noignoretc ; 
 abbreviation = 
-.Xo Op Ic no
-.Ns Ic ig )
-.Xc 
+.Oo Ic no Oc Ns Ic ig )
 .El
 .El
 .Sh DIAGNOSTICS
@@ -478,9 +475,11 @@ Possible errors are:
 .It Li Timed out
 The server did not respond to a request after a certain amount of
 time (changed with 
-.Dq Ic set timeout= Ns Ar value ) 
+.Dq Ic set timeout Ns = Ns Ar value )
 and a certain number of retries (changed with 
-.Dq Ic set retry= Ns Ar value ) .
+.Do
+.Ic set retry Ns = Ns Ar value
+.Dc ) .
 .It Li \&No response from server
 No name server is running on the server machine.
 .It Li \&No records

contrib/bind/doc/man/nsupdate.8

@@ -1,5 +1,4 @@
-.\" $FreeBSD$
-.\" $Id: nsupdate.8,v 8.6 2000/10/30 23:06:57 cyarnell Exp $
+.\" $Id: nsupdate.8,v 8.8 2002/04/22 04:38:04 marka Exp $
 .\"
 .\"Copyright (c) 1999 by Internet Software Consortium
 .\"
@@ -23,9 +22,9 @@
 .Nd update Internet name servers interactively
 .Sh SYNOPSIS
 .Nm nsupdate
-.Op Fl Ar k  keydir:keyname 
-.Op Fl Ar d
-.Op Fl Ar v
+.Op Fl k Ar keydir:keyname 
+.Op Fl d
+.Op Fl v
 .Op Ar filename
 .Sh DESCRIPTION
 .Ic Nsupdate
@@ -82,18 +81,14 @@ will be performed.
 .Ic Nsupdate
 understands the following input record formats:
 .Pp
-
 .Bl -hang
-
 .It Ic prereq nxdomain Va domain-name
 Requires that no RR of any type exists with name
 .Va domain-name .
-
 .It Ic prereq yxdomain Va domain-name
 Requires that at least one RR named
 .Va domain-name
 must exist.
-
 .It Xo
 .Ic prereq nxrrset Va domain-name Op class
 .Va type
@@ -102,11 +97,10 @@ Requires that no RR exists of the specified
 .Va type
 and
 .Va domain-name .
-
 .It Xo
 .Ic prereq yxrrset
-.Va domain-name Op class
-.Va type Op data...
+.Va domain-name Op Va class
+.Va type Op Va data...
 .Xc
 Requires that a RR exists of the specified
 .Va type
@@ -115,11 +109,10 @@ and
 If
 .Va data
 is specified, it must match exactly.
-
 .It Xo
 .Ic update delete
-.Va domain-name Op class
-.Va Op type Op data...
+.Va domain-name Op Va class
+.Op Va type Op Va data...
 .Xc
 Deletes RRs named
 .Va domain-name .
@@ -129,19 +122,16 @@ If
 .Va data )
 is specified,
 only matching records will be deleted.
-
 .It Xo
 .Ic update add
-.Va domain-name ttl Op class
+.Va domain-name ttl Op Va class
 .Va type data...
 .Xc
 Adds a new RR with specified
 .Va ttl , type ,
 and
 .Va data .
-
 .El
-
 .Sh EXAMPLES
 The following example illustrates the interactive use of
 .Ic nsupdate
@@ -157,7 +147,6 @@ $ nsupdate
 > update delete test.example.com A
 > update add test.example.com 3600 A 10.1.1.1
 >
-
 .Ed
 .Pp
 In this example, a CNAME alias is added to the database
@@ -169,7 +158,6 @@ $ nsupdate
 > prereq nxrrset www.example.com CNAME
 > update add www.example.com 3600 CNAME test.example.com
 >
-
 .Ed
 .Pp
 In this example, the nsupdate will be signed with the key "mykey", which
@@ -178,20 +166,15 @@ is in the directory "/var/named/keys".
 $ nsupdate -k /var/named/keys:mykey
 > update add ftp.example.com 60 A 192.168.5.1
 >
-
 .Ed
-
 .Sh DIAGNOSTICS
 .Bl -hang
-
 .It Qq send error
 Typically indicates that the authoritative nameservers could not be reached
-
 .It Qq failed update packet
 Typically indicates that the nameserver has rejected the update,
 either because the nameserver doesn't support dynamic update,
 or due to an authentication failure
-
 .It Qq res_mkupdate: packet size = Va size
 (and no other messages)
 The update was successfully received and authenticated by the nameserver.
@@ -204,8 +187,8 @@ and examine the status field in the nameserver's reply.
 .Sh FILES
 .Bl -hang
 .It Pa /etc/resolv.conf
-.El
 initial domain name and name server addresses
+.El
 .Sh SEE ALSO
 .Xr @INDOT@named @SYS_OPS_EXT@ ,
 .Xr resolver @LIB_NETWORK_EXT@ , 

contrib/bind/doc/man/resolver.3

@@ -16,8 +16,7 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	$Id: resolver.3,v 8.13 2000/12/05 02:37:33 vixie Exp $
-.\" $FreeBSD$
+.\"	$Id: resolver.3,v 8.16 2001/12/28 04:24:20 marka Exp $
 .\"
 .Dd July 4, 2000
 .Dt RESOLVER @LIB_NETWORK_EXT_U@ 
@@ -60,7 +59,7 @@
 .Fd #include <netinet/in.h>
 .Fd #include <arpa/nameser.h>
 .Fd #include <resolv.h>
-.Ft typedef struct __res_state *res_state;
+.Vt typedef struct __res_state *res_state ;
 .Pp
 .Fn res_ninit "res_state statp"
 .Fn res_ourserver_p "const res_state statp" "const struct sockaddr_in *addr"
@@ -70,18 +69,28 @@
 .Fn res_nquery "res_state statp" "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
 .Fn res_nsearch "res_state statp" "const char *dname" "int class" "int type" "u_char * answer" "int anslen"
 .Fn res_nquerydomain "res_state statp" "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
-.Fn res_nmkquery "res_state statp, int op, const char *dname" "int class" "int type" "const u_char *data" "int datalen" "const u_char *newrr" "u_char *buf" "int buflen"
+.Fo res_nmkquery
+.Fa "res_state statp"
+.Fa "int op"
+.Fa "const char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "const u_char *data"
+.Fa "int datalen"
+.Fa "const u_char *newrr"
+.Fa "u_char *buf"
+.Fa "int buflen"
+.Fc
 .Fn res_nsend "res_state statp" "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
 .Fn res_nupdate "res_state statp" "ns_updrec *rrecp_in"
 .Fn res_nmkupdate "res_state statp" "ns_updrec *rrecp_in" "u_char *buf" "int buflen"
 .Fn res_nclose "res_state statp"
 .Fn res_nsendsigned "res_state statp" "const u_char *msg" "int msglen" "ns_tsig_key *key" "u_char *answer" "int anslen"
 .Fn res_findzonecut "res_state statp" "const char *dname" "ns_class class" "int options" "char *zname" "size_t zsize" "struct in_addr *addrs" "int naddrs"
-.Fn dn_comp "const char *exp_dn" "u_char *comp_dn" "int length" "u_char **dnptrs, **lastdnptr"
-.Fn dn_expand "const u_char *msg, *eomorig, *comp_dn" "char *exp_dn" "int  length"
+.Fn dn_comp "const char *exp_dn" "u_char *comp_dn" "int length" "u_char **dnptrs" "u_char **lastdnptr"
+.Fn dn_expand "const u_char *msg" "const u_char *eomorig" "const u_char *comp_dn" "char *exp_dn" "int  length"
 .Fn hstrerror "int err"
-.Sh DEPRECATED
-.nr nS 1
+.Ss DEPRECATED
 .Fd #include <sys/types.h>
 .Fd #include <netinet/in.h>
 .Fd #include <arpa/nameser.h>
@@ -91,10 +100,20 @@
 .Fn fp_nquery "const u_char *msg" "int msglen" "FILE *fp"
 .Fn p_query "const u_char *msg" "FILE *fp"
 .Fn hostalias "const char *name"
-.Fn res_query "const char *dname" "int class, type" "u_char *answer" "int anslen"
-.Fn res_search "const char *dname" "int class, type" "u_char *answer" "int anslen"
+.Fn res_query "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
+.Fn res_search "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
 .Fn res_querydomain "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
-.Fn res_mkquery "int op" "const char *dname, int class, type" "const char *data" "int datalen" "struct rrec *newrr" "u_char *buf" "int buflen"
+.Fo res_mkquery
+.Fa "int op"
+.Fa "const char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "const char *data"
+.Fa "int datalen"
+.Fa "struct rrec *newrr"
+.Fa "u_char *buf"
+.Fa "int buflen"
+.Fc
 .Fn res_send "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
 .Fn res_update "ns_updrec *rrecp_in"
 .Fn res_close "void"
@@ -164,7 +183,7 @@ has been called).
 Print debugging messages.
 .It Dv RES_AAONLY
 Accept authoritative answers only.
-should continue until it finds an authoritative answer or finds an error.
+Should continue until it finds an authoritative answer or finds an error.
 Currently this is not implemented.
 .It Dv RES_USEVC
 Use TCP connections for queries instead of UDP datagrams.
@@ -227,6 +246,18 @@ This option causes
 .Fn res_nsendsigned
 to leave the message unchanged after TSIG verification; otherwise the TSIG
 record would be removed and the header updated.
+.It Dv RES_NOTLDQUERY
+This option causes
+.Fn res_nsearch
+to not attempt to resolve a unqualified name as if it were a top level
+domain (TLD).
+This option can cause problems if the site has "localhost" as a TLD rather
+than having localhost on one or more elements of the search list.
+This option has no effect if neither
+.Dv RES_DEFNAMES
+or
+.Dv RES_DNSRCH
+is set.
 .El
 .Pp
 The
@@ -410,7 +441,8 @@ The functions
 /
 .Fn hostalias
 lookup up name in the file referred to by the
-.Ev HOSTALIASES files return a fully qualified hostname if found or NULL if
+.Ev HOSTALIASES
+files return a fully qualified hostname if found or NULL if
 not found or an error occurred.
 .Fn res_hostalias
 uses
@@ -560,7 +592,7 @@ value of the
 parameter.
 .Sh FILES
 .Bl -tag -width "/etc/resolv.conf    "
-.It Pa /etc/resolv.conf	
+.It Pa /etc/resolv.conf
 See 
 .Xr resolver @FORMAT_EXT@ . 
 .El

contrib/bind/doc/man/resolver.5

@@ -14,7 +14,7 @@
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.5	5.9 (Berkeley) 12/14/89
-.\"	$Id: resolver.5,v 8.6 1999/05/21 00:01:02 vixie Exp $
+.\"	$Id: resolver.5,v 8.9 2001/12/28 04:24:21 marka Exp $
 .\"
 .Dd November 11, 1993
 .Dt RESOLVER @FORMAT_EXT_U@ 
@@ -146,14 +146,14 @@ name server before retrying the query via a different name server.  Measured in
 seconds, the default is
 .Dv RES_TIMEOUT
 (see
-.Pa <resolv.h> ).
+.Pa <resolv.h> ) .
 .It Li attempts: Ns Ar n
 sets the number of times the resolver will send a query to its name servers
 before giving up and returning an error to the calling application.  The
 default is
 .Dv RES_DFLRETRY
 (see
-.Pa <resolv.h> ).
+.Pa <resolv.h> ) .
 .It Li rotate
 sets
 .Dv RES_ROTATE
@@ -178,6 +178,22 @@ This has the effect of trying a AAAA query before an A query inside the
 .Ft gethostbyname
 function, and of mapping IPv4 responses in IPv6 ``tunnelled form'' if no
 AAAA records are found but an A record set exists.
+.It Li no-tld-query
+sets
+.Dv RES_NOTLDQUERY
+in
+.Ft _res.options .
+This option causes
+.Fn res_nsearch
+to not attempt to resolve a unqualified name as if it were a top level  
+domain (TLD).
+This option can cause problems if the site has "localhost" as a TLD rather
+than having localhost on one or more elements of the search list.
+This option has no effect if neither
+.Dv RES_DEFNAMES
+or
+.Dv RES_DNSRCH
+is set.
 .El
 .El
 .Pp

contrib/bind/doc/man/tsig.3

@@ -1,4 +1,4 @@
-.\" $Id: tsig.3,v 8.2 1999/01/08 18:54:28 vixie Exp $
+.\" $Id: tsig.3,v 8.3 2001/08/08 07:50:19 marka Exp $
 .\"
 .\"Copyright (c) 1995-1999 by Internet Software Consortium
 .\"
@@ -80,7 +80,7 @@ and
 .Fn ns_verify_tcp
 are used to sign/verify TCP messages that may be split into multiple packets,
 such as zone transfers, and
-.Fn ns_sign_tcp_init,
+.Fn ns_sign_tcp_init ,
 .Fn ns_verify_tcp_init
 initialize the state structure necessary for TCP operations.
 .Fn ns_find_tsig

contrib/bind/doc/misc/rfc2317-notes.txt

@@ -0,0 +1,105 @@
+Message-Id: <[email protected]>
+To: ...
+Subject: Notes on RFC-2317
+Date: Mon, 22 May 2000 22:46:55 -0400
+From: Kimmo Suominen <[email protected]>
+
+Hi!
+
+I wrote down some notes on RFC-2317.  I've had discussions with all of
+you regarding classless IN-ADDR.ARPA delegations, and I would very much
+appreciate any comments you may have.  Please feel free to forward this
+to other parties as you see necessary or appropriate.
+
+The goal of these notes is to try and clarify the reasoning behind the
+recommendations I've been making on implementing RFC-2317 delegations.
+In particular the following issues keep coming up with again and again
+with each vendor:
+
+    - why use "-" instead of "/"
+    - why use particular NS records
+    - why delegate within IN-ADDR.ARPA
+
+I am hoping that the these notes could eventually be used to convince
+ISPs to provide an efficient and smooth implementation of RFC-2317 with
+the least amount of headache for the end-user.
+
+Regards,
++ Kim
+
+
+
+NOTES ON IMPLEMENTING CLASSLESS IN-ADDR.ARPA DELEGATION PER RFC-2317
+
+1.  Selecting the CNAME target zone
+
+    RFC-2317 shows an example case where the target zone is a delegated
+    sub-zone of the IN-ADDR.ARPA zone for the natural class C network.
+    This will allow for the NS records for the zone can be independently
+    selected (see benefits described below).  An example of such a zone
+    would be 0-28.150.80.204.IN-ADDR.ARPA.
+
+    Now pay careful attention to the last paragraph of RFC-2317.  There
+    are broken resolver implementations that apply the "valid host name"
+    restrictions on the CNAME target (it should only be applied to the
+    PTR target name).  To avoid problems with such implementations it
+    is best to use a character that is allowed in a hostname.  I prefer
+    using a hyphen, as I did in the example above.
+
+    Some ISPs may at first refuse to delegate these zones (without any
+    explanation).  Approach such ISPs with the reasoning in here first,
+    but if that fails consider using your "forward" zone as a fallback.
+
+    There is nothing magic about the IN-ADDR.ARPA zone for RFC-2317
+    delegations.  You will have to sacrifice the optimization provided
+    by a correct IN-ADDR.ARPA delegation, but you will still retain
+    the ease of local administration for all name changes.
+
+    I recommend using a dedicated subdomain for the PTR records, e.g. if
+    your "forward" domain is "HOME.GW.COM" use "REV.HOME.GW.COM" for the
+    PTR records.
+
+2.  Selecting the NS records
+
+    The NS records for the delegated zone should include all the NS
+    records of the parent zone, in addition to any NS records pointing
+    to the public name servers the delegate may want to use.  Having the
+    name servers of the parent zone secondary the delegated zone allows
+    them to have the necessary authoritative data to return the CNAME
+    target in the additional records of a response to a PTR record query
+    (minimizing the number of queries needed to resolve an address).
+
+    This can be achieved using any zone (i.e. even a subdomain of your
+    "forward" domain), of course.  However, having the ISP delegate an
+    IN-ADDR.ARPA zone for your PTR records rather than you delegating a
+    zone to your ISP maintains the logical "owner" and "delegate" roles.
+
+    If the primary server for the delegated zone is not permanently on
+    the Internet (e.g. a dial-on-demand connection) then you would not
+    want to advertise it in the NS records.  It would just be a stealth
+    server which the advertised secondaries poll for updates.
+
+3.  Example delegation
+
+    To delegate our example zone 0-28.150.80.204.IN-ADDR.ARPA first look
+    at the NS records of the parent zone 150.80.204.IN-ADDR.ARPA.  Let's
+    say they are the following:
+
+        $ORIGIN 150.80.204.IN-ADDR.ARPA.
+        @    IN NS GRENDEL.GW.COM.
+             IN NS PYRY.GW.COM.
+
+    To delegate 204.80.150.0/28 to SRV.HOME.GW.COM you would then insert
+    these records in the parent zone data:
+
+        $ORIGIN 150.80.204.IN-ADDR.ARPA.
+        0-28 IN NS SRV.HOME.GW.COM.
+             IN NS GRENDEL.GW.COM.
+             IN NS PYRY.GW.COM.
+        $GENERATE 0-15 $ IN CNAME $.0-28.150.80.204.IN-ADDR.ARPA.
+
+    The necessary modifications to /etc/named.conf will be left as an
+    exercise to the reader.
+
+Kimmo Suominen
+Global Wire Oy

contrib/bind/include/arpa/nameser.h

@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 8.41 2000/12/23 08:14:50 vixie Exp $
+ *	$Id: nameser.h,v 8.47 2002/04/30 03:43:53 marka Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
@@ -119,7 +119,7 @@ typedef struct __ns_msg {
 	const u_char	*_sections[ns_s_max];
 	ns_sect		_sect;
 	int		_rrnum;
-	const u_char	*_ptr;
+	const u_char	*_msg_ptr;
 } ns_msg;
 
 /* Private data structure - do not use from outside library. */
@@ -203,7 +203,9 @@ typedef	enum __ns_rcode {
 	ns_r_notauth = 9,	/* Not authoritative for zone */
 	ns_r_notzone = 10,	/* Zone of record different from zone section */
 	ns_r_max = 11,
-	/* The following are TSIG extended errors */
+	/* The following are EDNS extended rcodes */
+	ns_r_badvers = 16,
+	/* The following are TSIG errors */
 	ns_r_badsig = 16,
 	ns_r_badkey = 17,
 	ns_r_badtime = 18
@@ -425,11 +427,16 @@ typedef enum __ns_cert_types {
 #define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
 #define NS_NXT_MAX 127
 
+/*
+ * EDNS0 extended flags, host order.
+ */
+#define NS_OPT_DNSSEC_OK	0x8000U
+
 /*
  * Inline versions of get/put short/long.  Pointer is advanced.
  */
 #define NS_GET16(s, cp) do { \
-	register u_char *t_cp = (u_char *)(cp); \
+	register const u_char *t_cp = (const u_char *)(cp); \
 	(s) = ((u_int16_t)t_cp[0] << 8) \
 	    | ((u_int16_t)t_cp[1]) \
 	    ; \
@@ -437,7 +444,7 @@ typedef enum __ns_cert_types {
 } while (0)
 
 #define NS_GET32(l, cp) do { \
-	register u_char *t_cp = (u_char *)(cp); \
+	register const u_char *t_cp = (const u_char *)(cp); \
 	(l) = ((u_int32_t)t_cp[0] << 24) \
 	    | ((u_int32_t)t_cp[1] << 16) \
 	    | ((u_int32_t)t_cp[2] << 8) \
@@ -490,7 +497,9 @@ typedef enum __ns_cert_types {
 #define	ns_name_skip		__ns_name_skip
 #define	ns_name_rollback	__ns_name_rollback
 #define	ns_sign			__ns_sign
+#define	ns_sign2		__ns_sign2
 #define	ns_sign_tcp		__ns_sign_tcp
+#define	ns_sign_tcp2		__ns_sign_tcp2
 #define	ns_sign_tcp_init	__ns_sign_tcp_init
 #define ns_find_tsig		__ns_find_tsig
 #define	ns_verify		__ns_verify
@@ -535,8 +544,14 @@ void		ns_name_rollback __P((const u_char *, const u_char **,
 				      const u_char **));
 int		ns_sign __P((u_char *, int *, int, int, void *,
 			     const u_char *, int, u_char *, int *, time_t));
+int		ns_sign2 __P((u_char *, int *, int, int, void *,
+			      const u_char *, int, u_char *, int *, time_t,
+			      u_char **, u_char **));
 int		ns_sign_tcp __P((u_char *, int *, int, int,
 				 ns_tcp_tsig_state *, int));
+int		ns_sign_tcp2 __P((u_char *, int *, int, int,
+				  ns_tcp_tsig_state *, int,
+				  u_char **, u_char **));
 int		ns_sign_tcp_init __P((void *, const u_char *, int,
 					ns_tcp_tsig_state *));
 u_char		*ns_find_tsig __P((u_char *, u_char *));

contrib/bind/include/arpa/nameser_compat.h

@@ -32,7 +32,7 @@
 
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 8.11 1999/01/02 08:00:58 vixie Exp $
+ *	$Id: nameser_compat.h,v 8.14 2002/05/18 01:39:11 marka Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
@@ -64,6 +64,7 @@
     defined(apollo) || defined(__convex__) || defined(_CRAY) || \
     defined(__hppa) || defined(__hp9000) || \
     defined(__hp9000s300) || defined(__hp9000s700) || \
+    defined(__hp3000s900) || defined(__hpux) || defined(MPE) || \
     defined (BIT_ZERO_ON_LEFT) || defined(m68k) || \
     (defined(__Lynx__) && \
      (defined(__68k__) || defined(__sparc__) || defined(__powerpc__)))
@@ -207,6 +208,7 @@ typedef struct {
 #define	T_SRV		ns_t_srv
 #define T_ATMA		ns_t_atma
 #define T_NAPTR		ns_t_naptr
+#define T_A6		ns_t_a6
 #define	T_TSIG		ns_t_tsig
 #define	T_IXFR		ns_t_ixfr
 #define T_AXFR		ns_t_axfr

contrib/bind/include/irs.h

@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: irs.h,v 8.5 2000/12/23 08:14:49 vixie Exp $
+ * $Id: irs.h,v 8.6 2001/05/29 05:47:00 marka Exp $
  */
 
 #ifndef _IRS_H_INCLUDED
@@ -30,6 +30,7 @@
 #include <netdb.h>
 #include <resolv.h>
 #include <pwd.h>
+#include <netgroup.h>
 
 /*
  * This is the group map class.
@@ -114,6 +115,8 @@ struct irs_ho {
 	struct __res_state * (*res_get) __P((struct irs_ho *));
 	void		(*res_set) __P((struct irs_ho *, res_state,
 					void (*)(void *)));
+	struct addrinfo *(*addrinfo) __P((struct irs_ho *, const char *,
+					  const struct addrinfo *));
 };
 
 /*
@@ -138,8 +141,8 @@ struct irs_nw {
 struct irs_ng {
 	void *		private;
 	void		(*close) __P((struct irs_ng *));
-	int		(*next) __P((struct irs_ng *, char **, char **,
-				     char **));
+	int		(*next) __P((struct irs_ng *, const char **,
+				     const char **, const char **));
 	int		(*test) __P((struct irs_ng *, const char *,
 				     const char *, const char *,
 				     const char *));
@@ -261,6 +264,12 @@ extern struct hostent 	*gethostent_p __P((struct net_data *net_data));
 extern void 		sethostent_p __P((int stayopen,
 					  struct net_data *net_data));
 extern void 		endhostent_p __P((struct net_data *net_data));
+extern struct hostent 	*getipnodebyname_p __P((const char *name, int af,
+					       int flags, int *errp,
+					       struct net_data *net_data));
+extern struct hostent 	*getipnodebyaddr_p __P((const void *addr, size_t len,
+					      int af, int *errp,
+					      struct net_data *net_data));
 
 extern struct netent 	*getnetent_p __P((struct net_data *net_data));
 extern struct netent 	*getnetbyname_p __P((const char *name,
@@ -279,8 +288,8 @@ extern int		innetgr_p __P((const char *netgroup,
 				       const char *user,
 				       const char *domain,
 				       struct net_data *net_data));
-extern int		getnetgrent_p __P((char **host, char **user,
-					   char **domain,
+extern int		getnetgrent_p __P((const char **host, const char **user,
+					   const char **domain,
 					   struct net_data *net_data));
 
 extern struct protoent  *getprotoent_p __P((struct net_data *net_data));