CVS: cvs.openbsd.org: src

[Jakob Schlyter <jakob_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	src
Changes by:	jakob_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2005/03/22 09:52:40

Modified files:
	usr.sbin/bind  : CHANGES FAQ README acconfig.h config.guess 
	                 config.h.in configure configure.in libtool.m4 
	                 ltmain.sh version 
	usr.sbin/bind/bin/dig: dig.c dighost.c host.c nslookup.c 
	usr.sbin/bind/bin/dig/include/dig: dig.h 
	usr.sbin/bind/bin/dnssec: dnssec-signzone.c 
	usr.sbin/bind/bin/named: client.c config.c control.c main.c 
	                         server.c update.c 
	usr.sbin/bind/bin/named/include/named: control.h 
	usr.sbin/bind/bin/named/unix: os.c 
	usr.sbin/bind/bin/named/unix/include/named: os.h 
	usr.sbin/bind/bin/nsupdate: nsupdate.c 
	usr.sbin/bind/bin/rndc: rndc-confgen.c rndc.c 
	usr.sbin/bind/bin/tests/system: ifconfig.sh 
	usr.sbin/bind/doc/arm: Bv9ARM-book.xml Bv9ARM.ch03.html 
	                       Bv9ARM.ch04.html Bv9ARM.ch05.html 
	                       Bv9ARM.ch06.html Bv9ARM.ch07.html 
	                       Bv9ARM.ch08.html Bv9ARM.ch09.html 
	                       Bv9ARM.html 
	usr.sbin/bind/doc/misc: migration 
	usr.sbin/bind/lib/bind9: getaddresses.c 
	usr.sbin/bind/lib/dns: Makefile.in adb.c api rbt.c rdata.c 
	                       resolver.c validator.c xfrin.c zone.c 
	usr.sbin/bind/lib/dns/include/dns: name.h zone.h 
	usr.sbin/bind/lib/dns/rdata/in_1: wks_11.c 
	usr.sbin/bind/lib/isc: api string.c task.c 
	usr.sbin/bind/lib/isc/pthreads: thread.c 
	usr.sbin/bind/lib/isc/unix: ifiter_ioctl.c socket.c 
	usr.sbin/bind/lib/isccfg: api 
	usr.sbin/bind/lib/lwres: context.c print.c 
Removed files:
	usr.sbin/bind  : KNOWN_DEFECTS 
	usr.sbin/bind/lib/dns/sec: Makefile.in 
	usr.sbin/bind/lib/dns/sec/dst: Makefile.in dst_api.c 
	                               dst_internal.h dst_lib.c 
	                               dst_openssl.h dst_parse.c 
	                               dst_parse.h dst_result.c 
	                               gssapi_link.c gssapictx.c 
	                               hmac_link.c key.c openssl_link.c 
	                               openssldh_link.c 
	                               openssldsa_link.c 
	                               opensslrsa_link.c 
	usr.sbin/bind/lib/dns/sec/dst/include: Makefile.in 
	usr.sbin/bind/lib/dns/sec/dst/include/dst: Makefile.in dst.h 
	                                           gssapi.h lib.h 
	                                           result.h 

Log message:
resolve conflicts