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	2007/12/09 06:39:45

Modified files:
	usr.sbin/bind  : CHANGES FAQ Makefile.bsd-wrapper Makefile.in 
	                 README acconfig.h config.h.in version 
	usr.sbin/bind/bin: Makefile.in 
	usr.sbin/bind/bin/check: named-checkconf.html 
	usr.sbin/bind/bin/dig: Makefile.in dig.1 dig.c dig.docbook 
	                       dig.html dighost.c host.1 host.c 
	                       host.docbook host.html nslookup.1 
	                       nslookup.c 
	usr.sbin/bind/bin/dig/include/dig: dig.h 
	usr.sbin/bind/bin/dnssec: dnssec-keygen.html dnssec-signzone.8 
	                          dnssec-signzone.c 
	                          dnssec-signzone.docbook 
	                          dnssec-signzone.html dnssectool.c 
	usr.sbin/bind/bin/named: client.c config.c control.c 
	                         controlconf.c interfacemgr.c lwdgnba.c 
	                         lwresd.c lwresd.html main.c named.8 
	                         named.html notify.c query.c server.c 
	                         update.c xfrout.c 
	usr.sbin/bind/bin/named/include/named: control.h globals.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.8 nsupdate.c 
	                            nsupdate.docbook nsupdate.html 
	usr.sbin/bind/bin/rndc: rndc-confgen.8 rndc-confgen.c 
	                        rndc-confgen.docbook rndc-confgen.html 
	                        rndc.c rndc.conf.html rndc.html 
	usr.sbin/bind/bin/rndc/unix: os.c 
	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: dnssec migration 
	usr.sbin/bind/lib: Makefile.in 
	usr.sbin/bind/lib/bind9: getaddresses.c 
	usr.sbin/bind/lib/dns: Makefile.in adb.c api byaddr.c cache.c 
	                       db.c dispatch.c dnssec.c dst_api.c gen.c 
	                       log.c master.c masterdump.c message.c 
	                       name.c ncache.c rbt.c rbtdb.c rcode.c 
	                       rdata.c rdatalist.c rdataset.c 
	                       rdataslab.c resolver.c result.c rootns.c 
	                       sdb.c time.c tsig.c ttl.c validator.c 
	                       view.c xfrin.c zone.c 
	usr.sbin/bind/lib/dns/include/dns: adb.h byaddr.h db.h 
	                                   dispatch.h events.h log.h 
	                                   master.h name.h rdata.h 
	                                   rdataset.h rdataslab.h 
	                                   result.h view.h zone.h 
	usr.sbin/bind/lib/dns/rdata/any_255: tsig_250.c 
	usr.sbin/bind/lib/dns/rdata/generic: afsdb_18.c cert_37.c 
	                                     dlv_32769.c dnskey_48.c 
	                                     ds_43.c key_25.c loc_29.c 
	                                     mx_15.c nsec_47.c nxt_30.c 
	                                     opt_41.c rrsig_46.c rt_21.c 
	                                     sig_24.c soa_6.c sshfp_44.c 
	                                     sshfp_44.h tkey_249.c 
	usr.sbin/bind/lib/dns/rdata/in_1: a6_38.c apl_42.c kx_36.c 
	                                  naptr_35.c nsap_22.c px_26.c 
	                                  srv_33.c wks_11.c 
	usr.sbin/bind/lib/isc: Makefile.in api base64.c commandline.c 
	                       entropy.c hash.c inet_aton.c inet_ntop.c 
	                       inet_pton.c lex.c lfsr.c log.c mem.c 
	                       print.c random.c rwlock.c sha1.c 
	                       sockaddr.c string.c task.c 
	usr.sbin/bind/lib/isc/include/isc: Makefile.in hash.h log.h 
	                                   platform.h.in refcount.h 
	                                   rwlock.h socket.h string.h 
	                                   types.h 
	usr.sbin/bind/lib/isc/pthreads: thread.c 
	usr.sbin/bind/lib/isc/unix: Makefile.in dir.c entropy.c file.c 
	                            fsaccess.c ifiter_ioctl.c socket.c 
	                            time.c 
	usr.sbin/bind/lib/isc/unix/include/isc: stat.h 
	usr.sbin/bind/lib/isccc: Makefile.in api cc.c result.c 
	usr.sbin/bind/lib/isccc/include/isccc: result.h 
	usr.sbin/bind/lib/isccfg: Makefile.in api parser.c 
	usr.sbin/bind/lib/lwres: context.c getaddrinfo.c gethost.c 
	                         getipnode.c getnameinfo.c getrrset.c 
	                         herror.c lwconfig.c lwinetaton.c 
	                         lwinetntop.c lwresutil.c print.c 
	usr.sbin/bind/lib/lwres/man: lwres.html lwres_buffer.html 
	                             lwres_config.html lwres_context.3 
	                             lwres_context.docbook 
	                             lwres_context.html lwres_gabn.html 
	                             lwres_gai_strerror.html 
	                             lwres_getaddrinfo.html 
	                             lwres_gethostent.html 
	                             lwres_getipnode.3 
	                             lwres_getipnode.docbook 
	                             lwres_getipnode.html 
	                             lwres_getnameinfo.html 
	                             lwres_getrrsetbyname.html 
	                             lwres_gnba.html 
	                             lwres_hstrerror.html 
	                             lwres_inetntop.html lwres_noop.html 
	                             lwres_packet.html 
	                             lwres_resutil.html 
	usr.sbin/bind/make: rules.in 
Removed files:
	usr.sbin/bind  : README.idnkit 
	usr.sbin/bind/bin/named: aclconf.c 
	usr.sbin/bind/bin/named/include/named: aclconf.h 
	usr.sbin/bind/docutil: docbook2man-wrapper.sh.in 

Log message:
resolve conflicts