Module Name: src Committed By: christos Date: Tue Dec 31 20:24:44 UTC 2013
Modified Files: src/external/bsd/bind/dist: CHANGES config.h.in srcid version src/external/bsd/bind/dist/bin/check: named-checkconf.c src/external/bsd/bind/dist/bin/dig: dig.1 dig.c dighost.c host.c nslookup.1 nslookup.c src/external/bsd/bind/dist/bin/dig/include/dig: dig.h src/external/bsd/bind/dist/bin/dnssec: dnssec-importkey.8 dnssec-importkey.c dnssec-keygen.c dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssectool.c src/external/bsd/bind/dist/bin/named: builtin.c client.c config.c control.c interfacemgr.c logconf.c lwdgrbn.c main.c named.conf.5 named.conf.docbook named.conf.html query.c server.c statschannel.c update.c src/external/bsd/bind/dist/bin/named/include/named: globals.h main.h query.h server.h src/external/bsd/bind/dist/bin/named/unix: os.c src/external/bsd/bind/dist/bin/named/win32: ntservice.c os.c src/external/bsd/bind/dist/bin/nsupdate: nsupdate.c src/external/bsd/bind/dist/bin/rndc: rndc.8 rndc.c src/external/bsd/bind/dist/bin/tests: backtrace_test.c rwlock_test.c sock_test.c task_test.c timer_test.c src/external/bsd/bind/dist/bin/tests/atomic: t_atomic.c src/external/bsd/bind/dist/bin/tests/db: t_db.c src/external/bsd/bind/dist/bin/tests/dst: gsstest.c t_dst.c src/external/bsd/bind/dist/bin/tests/hashes: t_hashes.c src/external/bsd/bind/dist/bin/tests/master: t_master.c src/external/bsd/bind/dist/bin/tests/mem: t_mem.c src/external/bsd/bind/dist/bin/tests/names: t_names.c src/external/bsd/bind/dist/bin/tests/rbt: t_rbt.c src/external/bsd/bind/dist/bin/tests/resolver: t_resolver.c src/external/bsd/bind/dist/bin/tests/sockaddr: t_sockaddr.c src/external/bsd/bind/dist/bin/tests/system/rrl: rrl.c src/external/bsd/bind/dist/bin/tests/tasks: t_tasks.c src/external/bsd/bind/dist/bin/tests/timers: t_timers.c src/external/bsd/bind/dist/bin/win32/BINDInstall: StdAfx.h src/external/bsd/bind/dist/doc/arm: Bv9ARM.pdf src/external/bsd/bind/dist/doc/misc: options src/external/bsd/bind/dist/lib/bind9: check.c src/external/bsd/bind/dist/lib/dns: acache.c client.c diff.c dnssec.c dst_api.c dst_internal.h dst_parse.c dst_result.c gen.c gssapi_link.c gssapictx.c hmac_link.c journal.c log.c master.c masterdump.c message.c name.c nsec.c nsec3.c openssldh_link.c openssldsa_link.c opensslecdsa_link.c opensslgost_link.c opensslrsa_link.c rbtdb.c rcode.c rdata.c rdataslab.c resolver.c rootns.c rrl.c spnego.c spnego_asn1.c ssu_external.c ttl.c update.c validator.c view.c xfrin.c zone.c src/external/bsd/bind/dist/lib/dns/include/dns: client.h dnssec.h log.h master.h masterdump.h message.h nsec3.h rdata.h rrl.h view.h zone.h src/external/bsd/bind/dist/lib/dns/include/dst: dst.h gssapi.h src/external/bsd/bind/dist/lib/dns/rdata/generic: dnskey_48.c hip_55.c isdn_20.c key_25.c keydata_65533.c opt_41.c src/external/bsd/bind/dist/lib/dns/rdata/in_1: wks_11.c src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c zonemgr_test.c src/external/bsd/bind/dist/lib/dns/win32: version.c src/external/bsd/bind/dist/lib/isc: app_api.c backtrace.c base32.c base64.c hash.c heap.c hex.c hmacmd5.c hmacsha.c inet_aton.c inet_pton.c lex.c log.c mem.c random.c safe.c socket_api.c src/external/bsd/bind/dist/lib/isc/include/isc: app.h file.h hash.h namespace.h safe.h socket.h stdio.h src/external/bsd/bind/dist/lib/isc/nothreads/include/isc: thread.h src/external/bsd/bind/dist/lib/isc/pthreads: thread.c src/external/bsd/bind/dist/lib/isc/pthreads/include/isc: thread.h src/external/bsd/bind/dist/lib/isc/tests: lex_test.c safe_test.c src/external/bsd/bind/dist/lib/isc/unix: app.c file.c socket.c stdio.c src/external/bsd/bind/dist/lib/isc/win32: entropy.c file.c interfaceiter.c net.c netdb.h socket.c stdio.c stdtime.c src/external/bsd/bind/dist/lib/isc/win32/include/isc: atomic.h net.h thread.h src/external/bsd/bind/dist/lib/isccc: base64.c cc.c src/external/bsd/bind/dist/lib/isccfg: namedconf.c src/external/bsd/bind/dist/lib/lwres: context.c gethost.c lwinetaton.c lwinetpton.c lwres_gabn.c lwres_gnba.c lwres_grbn.c lwres_noop.c src/external/bsd/bind/dist/lib/lwres/win32/include/lwres: net.h netdb.h src/external/bsd/bind/dist/lib/tests: t_api.c src/external/bsd/bind/dist/lib/tests/include/tests: t_api.h src/external/bsd/bind/dist/lib/tests/win32: DLLMain.c src/external/bsd/bind/dist/unit/atf-src: atf-c.h src/external/bsd/bind/dist/unit/atf-src/atf-c: atf-c-api.3 atf_c_test.c check.c check.h check_test.c config.c config_test.c error.c error.h error_test.c macros.h macros_h_test.c macros_test.c tc.c tc.h tc_test.c tp.c tp.h tp_test.c unused_test.c utils.c utils.h utils_test.c src/external/bsd/bind/dist/unit/atf-src/atf-c++: atf-c++-api.3 src/external/bsd/bind/dist/unit/atf-src/atf-c/detail: dynstr.c dynstr.h dynstr_test.c env.c env_test.c fs.c fs.h fs_test.c list.c list.h list_test.c map.c map.h map_test.c process.c process.h process_helpers.c process_test.c sanity.h sanity_test.c test_helpers.c test_helpers.h text.c text.h text_test.c tp_main.c user.c user.h user_test.c src/external/bsd/bind/dist/unit/atf-src/atf-config: atf-config.1 src/external/bsd/bind/dist/unit/atf-src/atf-report: atf-report.1 src/external/bsd/bind/dist/unit/atf-src/atf-run: atf-run.1 several_tcs_helper.c zero_tcs_helper.c src/external/bsd/bind/dist/unit/atf-src/atf-sh: atf-check.1 atf-sh-api.3 src/external/bsd/bind/dist/unit/atf-src/atf-version: atf-version.1 src/external/bsd/bind/dist/unit/atf-src/doc: atf-formats.5 atf-test-case.4 atf-test-program.1 src/external/bsd/bind/dist/unit/atf-src/test-programs: c_helpers.c src/external/bsd/bind/dist/win32utils/legacy: BINDBuild.dsw.in Removed Files: src/external/bsd/bind/dist: binclude4netbsd bind2netbsd src/external/bsd/bind/dist/bin/check/win32: checktool.dsp namedcheckconf.dsp namedcheckconf.dsw namedcheckconf.mak namedcheckzone.dsp namedcheckzone.dsw namedcheckzone.mak src/external/bsd/bind/dist/bin/confgen/win32: confgentool.dsp ddnsconfgen.dsp ddnsconfgen.mak rndcconfgen.dsp rndcconfgen.mak src/external/bsd/bind/dist/bin/dig/win32: dig.dsp dig.mak dighost.dsp host.dsp host.mak nslookup.dsp nslookup.mak src/external/bsd/bind/dist/bin/dnssec/win32: dnssectool.dsp dsfromkey.dsp dsfromkey.mak keyfromlabel.dsp keyfromlabel.mak keygen.dsp keygen.mak nsupdate.dsp nsupdate.dsw revoke.dsp revoke.mak settime.dsp settime.mak signzone.dsp signzone.mak src/external/bsd/bind/dist/bin/named/win32: named.dsp named.mak src/external/bsd/bind/dist/bin/nsupdate/win32: nsupdate.dsp nsupdate.mak src/external/bsd/bind/dist/bin/pkcs11: openssl-0.9.8x-patch openssl-1.0.0j-patch openssl-1.0.1c-patch src/external/bsd/bind/dist/bin/pkcs11/win32: pk11destroy.dsp pk11destroy.mak pk11keygen.dsp pk11keygen.mak pk11list.dsp pk11list.mak src/external/bsd/bind/dist/bin/rndc/win32: rndc.dsp rndc.mak rndcutil.dsp src/external/bsd/bind/dist/bin/tools/win32: arpaname.dsp arpaname.mak genrandom.dsp genrandom.mak ischmacfixup.dsp ischmacfixup.mak journalprint.dsp journalprint.mak nsec3hash.dsp nsec3hash.mak src/external/bsd/bind/dist/bin/win32/BINDInstall: BINDInstall.dsp BINDInstall.mak src/external/bsd/bind/dist/lib/bind9/win32: libbind9.dsp libbind9.mak src/external/bsd/bind/dist/lib/dns/win32: gen.dsp gen.mak libdns.def libdns.dsp libdns.mak src/external/bsd/bind/dist/lib/isc/win32: libisc.def libisc.dsp libisc.mak src/external/bsd/bind/dist/lib/isc/win32/include/isc: platform.h src/external/bsd/bind/dist/lib/isccc/win32: libisccc.dsp libisccc.mak src/external/bsd/bind/dist/lib/isccfg/win32: libisccfg.dsp libisccfg.mak src/external/bsd/bind/dist/lib/lwres/win32: liblwres.dsp liblwres.mak src/external/bsd/bind/dist/lib/win32/bindevt: bindevt.dsp bindevt.mak src/external/bsd/bind/dist/unit/atf-src/admin: check-install.sh src/external/bsd/bind/dist/unit/atf-src/atf-c/detail: test_helpers_test.c src/external/bsd/bind/dist/unit/atf-src/test-programs: fork_test.sh src/external/bsd/bind/dist/win32utils: BINDBuild.dsw BuildAll.bat BuildPost.bat BuildSetup.bat SetupLibs.bat dnsheadergen.bat makedefs.pl makesrcid.pl makeversion.pl setpk11provider.pl updatelibxml2.pl updateopenssl.pl win32-build.txt Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.3 -r0 src/external/bsd/bind/dist/binclude4netbsd cvs rdiff -u -r1.6 -r0 src/external/bsd/bind/dist/bind2netbsd cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/config.h.in \ src/external/bsd/bind/dist/version cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/srcid cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/bind/dist/bin/check/named-checkconf.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/bin/check/win32/checktool.dsp \ src/external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsp \ src/external/bsd/bind/dist/bin/check/win32/namedcheckconf.mak \ src/external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsp \ src/external/bsd/bind/dist/bin/check/win32/namedcheckzone.mak cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsw \ src/external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsw cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/confgen/win32/confgentool.dsp \ src/external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.dsp \ src/external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.mak \ src/external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.dsp \ src/external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.mak cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/dig/dig.1 cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/dig/dig.c \ src/external/bsd/bind/dist/bin/dig/host.c \ src/external/bsd/bind/dist/bin/dig/nslookup.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/bin/dig/nslookup.1 cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/dig/include/dig/dig.h cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/bind/dist/bin/dig/win32/dig.dsp \ src/external/bsd/bind/dist/bin/dig/win32/dig.mak \ src/external/bsd/bind/dist/bin/dig/win32/dighost.dsp \ src/external/bsd/bind/dist/bin/dig/win32/host.dsp \ src/external/bsd/bind/dist/bin/dig/win32/host.mak \ src/external/bsd/bind/dist/bin/dig/win32/nslookup.dsp \ src/external/bsd/bind/dist/bin/dig/win32/nslookup.mak cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-importkey.c cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-settime.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8 cvs rdiff -u -r1.9 -r1.10 \ src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/dnssec/dnssectool.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/bin/dnssec/win32/dnssectool.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/dsfromkey.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/dsfromkey.mak \ src/external/bsd/bind/dist/bin/dnssec/win32/keyfromlabel.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/keyfromlabel.mak \ src/external/bsd/bind/dist/bin/dnssec/win32/keygen.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/keygen.mak \ src/external/bsd/bind/dist/bin/dnssec/win32/signzone.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/signzone.mak cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/dnssec/win32/nsupdate.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/nsupdate.dsw \ src/external/bsd/bind/dist/bin/dnssec/win32/revoke.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/revoke.mak \ src/external/bsd/bind/dist/bin/dnssec/win32/settime.dsp \ src/external/bsd/bind/dist/bin/dnssec/win32/settime.mak cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/named/builtin.c \ src/external/bsd/bind/dist/bin/named/control.c \ src/external/bsd/bind/dist/bin/named/interfacemgr.c \ src/external/bsd/bind/dist/bin/named/logconf.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/client.c \ src/external/bsd/bind/dist/bin/named/config.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/bin/named/lwdgrbn.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/bin/named/main.c \ src/external/bsd/bind/dist/bin/named/query.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/bin/named/named.conf.5 \ src/external/bsd/bind/dist/bin/named/named.conf.docbook \ src/external/bsd/bind/dist/bin/named/named.conf.html cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/bin/named/server.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/named/statschannel.c \ src/external/bsd/bind/dist/bin/named/update.c cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/bind/dist/bin/named/include/named/globals.h \ src/external/bsd/bind/dist/bin/named/include/named/server.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/named/include/named/main.h \ src/external/bsd/bind/dist/bin/named/include/named/query.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/named/unix/os.c cvs rdiff -u -r1.1.1.4 -r0 \ src/external/bsd/bind/dist/bin/named/win32/named.dsp \ src/external/bsd/bind/dist/bin/named/win32/named.mak cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/named/win32/ntservice.c \ src/external/bsd/bind/dist/bin/named/win32/os.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/bin/nsupdate/win32/nsupdate.dsp \ src/external/bsd/bind/dist/bin/nsupdate/win32/nsupdate.mak cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/pkcs11/openssl-0.9.8x-patch \ src/external/bsd/bind/dist/bin/pkcs11/openssl-1.0.0j-patch \ src/external/bsd/bind/dist/bin/pkcs11/openssl-1.0.1c-patch cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11destroy.dsp \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11destroy.mak \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11keygen.dsp \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11keygen.mak \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11list.dsp \ src/external/bsd/bind/dist/bin/pkcs11/win32/pk11list.mak cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/bin/rndc/rndc.8 cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/rndc/rndc.c cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/bind/dist/bin/rndc/win32/rndc.dsp \ src/external/bsd/bind/dist/bin/rndc/win32/rndc.mak cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/rndc/win32/rndcutil.dsp cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/bin/tests/backtrace_test.c \ src/external/bsd/bind/dist/bin/tests/rwlock_test.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/tests/sock_test.c \ src/external/bsd/bind/dist/bin/tests/task_test.c \ src/external/bsd/bind/dist/bin/tests/timer_test.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/tests/atomic/t_atomic.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/tests/db/t_db.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/tests/dst/gsstest.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/dst/t_dst.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/tests/hashes/t_hashes.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/bin/tests/master/t_master.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/bin/tests/mem/t_mem.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/names/t_names.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bin/tests/rbt/t_rbt.c cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/bind/dist/bin/tests/resolver/t_resolver.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/tests/sockaddr/t_sockaddr.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/bin/tests/system/rrl/rrl.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/tests/tasks/t_tasks.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/bin/tests/timers/t_timers.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/bin/tools/win32/arpaname.dsp \ src/external/bsd/bind/dist/bin/tools/win32/arpaname.mak \ src/external/bsd/bind/dist/bin/tools/win32/genrandom.dsp \ src/external/bsd/bind/dist/bin/tools/win32/genrandom.mak \ src/external/bsd/bind/dist/bin/tools/win32/ischmacfixup.dsp \ src/external/bsd/bind/dist/bin/tools/win32/ischmacfixup.mak \ src/external/bsd/bind/dist/bin/tools/win32/journalprint.dsp \ src/external/bsd/bind/dist/bin/tools/win32/nsec3hash.dsp \ src/external/bsd/bind/dist/bin/tools/win32/nsec3hash.mak cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/bin/tools/win32/journalprint.mak cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/bin/win32/BINDInstall/BINDInstall.dsp \ src/external/bsd/bind/dist/bin/win32/BINDInstall/BINDInstall.mak cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/bin/win32/BINDInstall/StdAfx.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/doc/misc/options cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/bind9/check.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/bind/dist/lib/bind9/win32/libbind9.dsp \ src/external/bsd/bind/dist/lib/bind9/win32/libbind9.mak cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/acache.c \ src/external/bsd/bind/dist/lib/dns/dst_result.c \ src/external/bsd/bind/dist/lib/dns/gen.c \ src/external/bsd/bind/dist/lib/dns/hmac_link.c \ src/external/bsd/bind/dist/lib/dns/log.c \ src/external/bsd/bind/dist/lib/dns/openssldh_link.c \ src/external/bsd/bind/dist/lib/dns/rootns.c \ src/external/bsd/bind/dist/lib/dns/spnego_asn1.c \ src/external/bsd/bind/dist/lib/dns/ttl.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/dns/client.c \ src/external/bsd/bind/dist/lib/dns/diff.c \ src/external/bsd/bind/dist/lib/dns/dst_parse.c \ src/external/bsd/bind/dist/lib/dns/gssapi_link.c \ src/external/bsd/bind/dist/lib/dns/gssapictx.c \ src/external/bsd/bind/dist/lib/dns/journal.c \ src/external/bsd/bind/dist/lib/dns/opensslgost_link.c \ src/external/bsd/bind/dist/lib/dns/rcode.c \ src/external/bsd/bind/dist/lib/dns/spnego.c \ src/external/bsd/bind/dist/lib/dns/ssu_external.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/dnssec.c \ src/external/bsd/bind/dist/lib/dns/dst_internal.h \ src/external/bsd/bind/dist/lib/dns/masterdump.c \ src/external/bsd/bind/dist/lib/dns/name.c \ src/external/bsd/bind/dist/lib/dns/nsec.c \ src/external/bsd/bind/dist/lib/dns/openssldsa_link.c \ src/external/bsd/bind/dist/lib/dns/opensslrsa_link.c \ src/external/bsd/bind/dist/lib/dns/rdataslab.c \ src/external/bsd/bind/dist/lib/dns/view.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/dns/dst_api.c \ src/external/bsd/bind/dist/lib/dns/nsec3.c \ src/external/bsd/bind/dist/lib/dns/rdata.c \ src/external/bsd/bind/dist/lib/dns/xfrin.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/master.c \ src/external/bsd/bind/dist/lib/dns/validator.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/dns/message.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/dns/opensslecdsa_link.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/dist/lib/dns/rbtdb.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/lib/dns/resolver.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/lib/dns/rrl.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/dns/update.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/zone.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/dns/include/dns/client.h \ src/external/bsd/bind/dist/lib/dns/include/dns/master.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/bind/dist/lib/dns/include/dns/dnssec.h \ src/external/bsd/bind/dist/lib/dns/include/dns/masterdump.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/dns/include/dns/log.h \ src/external/bsd/bind/dist/lib/dns/include/dns/message.h \ src/external/bsd/bind/dist/lib/dns/include/dns/nsec3.h cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/bind/dist/lib/dns/include/dns/rdata.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/lib/dns/include/dns/rrl.h cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/bind/dist/lib/dns/include/dns/view.h cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/bind/dist/lib/dns/include/dns/zone.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/dns/include/dst/dst.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/dns/include/dst/gssapi.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.c \ src/external/bsd/bind/dist/lib/dns/rdata/generic/key_25.c \ src/external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/dns/rdata/generic/hip_55.c \ src/external/bsd/bind/dist/lib/dns/rdata/generic/isdn_20.c cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/dns/rdata/in_1/wks_11.c cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/bind/dist/lib/dns/tests/rdata_test.c cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/bsd/bind/dist/lib/dns/tests/zonemgr_test.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/bind/dist/lib/dns/win32/gen.dsp \ src/external/bsd/bind/dist/lib/dns/win32/gen.mak cvs rdiff -u -r1.1.1.11 -r0 \ src/external/bsd/bind/dist/lib/dns/win32/libdns.def cvs rdiff -u -r1.1.1.6 -r0 \ src/external/bsd/bind/dist/lib/dns/win32/libdns.dsp \ src/external/bsd/bind/dist/lib/dns/win32/libdns.mak cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/dns/win32/version.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/isc/app_api.c \ src/external/bsd/bind/dist/lib/isc/base32.c \ src/external/bsd/bind/dist/lib/isc/base64.c \ src/external/bsd/bind/dist/lib/isc/hex.c \ src/external/bsd/bind/dist/lib/isc/hmacmd5.c \ src/external/bsd/bind/dist/lib/isc/inet_pton.c \ src/external/bsd/bind/dist/lib/isc/lex.c \ src/external/bsd/bind/dist/lib/isc/random.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/backtrace.c \ src/external/bsd/bind/dist/lib/isc/hash.c \ src/external/bsd/bind/dist/lib/isc/heap.c \ src/external/bsd/bind/dist/lib/isc/hmacsha.c \ src/external/bsd/bind/dist/lib/isc/inet_aton.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isc/log.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/isc/mem.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/lib/isc/safe.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/socket_api.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/include/isc/app.h cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/bind/dist/lib/isc/include/isc/file.h \ src/external/bsd/bind/dist/lib/isc/include/isc/socket.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/isc/include/isc/hash.h \ src/external/bsd/bind/dist/lib/isc/include/isc/stdio.h cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/bind/dist/lib/isc/include/isc/namespace.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/lib/isc/include/isc/safe.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/isc/nothreads/include/isc/thread.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/pthreads/thread.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/isc/pthreads/include/isc/thread.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/lib/isc/tests/lex_test.c \ src/external/bsd/bind/dist/lib/isc/tests/safe_test.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/isc/unix/app.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/unix/file.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/isc/unix/socket.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/unix/stdio.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/isc/win32/entropy.c \ src/external/bsd/bind/dist/lib/isc/win32/net.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/win32/file.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/isc/win32/interfaceiter.c \ src/external/bsd/bind/dist/lib/isc/win32/netdb.h \ src/external/bsd/bind/dist/lib/isc/win32/stdio.c \ src/external/bsd/bind/dist/lib/isc/win32/stdtime.c cvs rdiff -u -r1.1.1.10 -r0 \ src/external/bsd/bind/dist/lib/isc/win32/libisc.def cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/bind/dist/lib/isc/win32/libisc.dsp \ src/external/bsd/bind/dist/lib/isc/win32/libisc.mak cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isc/win32/socket.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/lib/isc/win32/include/isc/atomic.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/bind/dist/lib/isc/win32/include/isc/net.h cvs rdiff -u -r1.3 -r0 \ src/external/bsd/bind/dist/lib/isc/win32/include/isc/platform.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/isc/win32/include/isc/thread.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/isccc/base64.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/lib/isccc/cc.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/bind/dist/lib/isccc/win32/libisccc.dsp \ src/external/bsd/bind/dist/lib/isccc/win32/libisccc.mak cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isccfg/namedconf.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/bind/dist/lib/isccfg/win32/libisccfg.dsp cvs rdiff -u -r1.1.1.4 -r0 \ src/external/bsd/bind/dist/lib/isccfg/win32/libisccfg.mak cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/lwres/context.c \ src/external/bsd/bind/dist/lib/lwres/lwinetaton.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/dist/lib/lwres/gethost.c \ src/external/bsd/bind/dist/lib/lwres/lwinetpton.c \ src/external/bsd/bind/dist/lib/lwres/lwres_gabn.c \ src/external/bsd/bind/dist/lib/lwres/lwres_gnba.c \ src/external/bsd/bind/dist/lib/lwres/lwres_grbn.c \ src/external/bsd/bind/dist/lib/lwres/lwres_noop.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/bind/dist/lib/lwres/win32/liblwres.dsp \ src/external/bsd/bind/dist/lib/lwres/win32/liblwres.mak cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/bind/dist/lib/lwres/win32/include/lwres/net.h cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/lwres/win32/include/lwres/netdb.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/lib/tests/t_api.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/bind/dist/lib/tests/include/tests/t_api.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/lib/tests/win32/DLLMain.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/lib/win32/bindevt/bindevt.dsp \ src/external/bsd/bind/dist/lib/win32/bindevt/bindevt.mak cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/bind/dist/unit/atf-src/atf-c.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/unit/atf-src/admin/check-install.sh cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/atf-c-api.3 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/atf_c_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/check.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/check.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/check_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/config.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/config_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/error.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/error.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/error_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/macros_h_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tc.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tc.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tc_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tp.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tp.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/tp_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/utils.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/utils.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/utils_test.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/macros.h cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/macros_test.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/unused_test.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-c++/atf-c++-api.3 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/env.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/env_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/list.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/list.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/list_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/map.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/map.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/map_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/process.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/process.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/sanity_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/text.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/text.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/tp_main.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/user.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/user.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/user_test.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/process_test.c \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/sanity.h \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/text_test.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers_test.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-config/atf-config.1 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-report/atf-report.1 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-run/atf-run.1 \ src/external/bsd/bind/dist/unit/atf-src/atf-run/several_tcs_helper.c \ src/external/bsd/bind/dist/unit/atf-src/atf-run/zero_tcs_helper.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-sh/atf-check.1 \ src/external/bsd/bind/dist/unit/atf-src/atf-sh/atf-sh-api.3 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/atf-version/atf-version.1 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/doc/atf-formats.5 \ src/external/bsd/bind/dist/unit/atf-src/doc/atf-test-case.4 \ src/external/bsd/bind/dist/unit/atf-src/doc/atf-test-program.1 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/bind/dist/unit/atf-src/test-programs/c_helpers.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/unit/atf-src/test-programs/fork_test.sh cvs rdiff -u -r1.1.1.5 -r0 \ src/external/bsd/bind/dist/win32utils/BINDBuild.dsw cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/bind/dist/win32utils/BuildAll.bat \ src/external/bsd/bind/dist/win32utils/BuildSetup.bat \ src/external/bsd/bind/dist/win32utils/makedefs.pl \ src/external/bsd/bind/dist/win32utils/makeversion.pl \ src/external/bsd/bind/dist/win32utils/updatelibxml2.pl cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/bind/dist/win32utils/BuildPost.bat \ src/external/bsd/bind/dist/win32utils/dnsheadergen.bat \ src/external/bsd/bind/dist/win32utils/makesrcid.pl cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/bind/dist/win32utils/SetupLibs.bat \ src/external/bsd/bind/dist/win32utils/setpk11provider.pl cvs rdiff -u -r1.1.1.6 -r0 \ src/external/bsd/bind/dist/win32utils/updateopenssl.pl \ src/external/bsd/bind/dist/win32utils/win32-build.txt cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/bind/dist/win32utils/legacy/BINDBuild.dsw.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted