Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/bind/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/fc2eda5a96cc
branches: trunk
changeset: 792351:fc2eda5a96cc
user: christos <christos%NetBSD.org@localhost>
date: Tue Dec 31 20:24:38 2013 +0000
description:
merge conflicts
diffstat:
external/bsd/bind/dist/CHANGES | 298 +-
external/bsd/bind/dist/bin/check/named-checkconf.c | 56 +-
external/bsd/bind/dist/bin/check/win32/checktool.dsp | 113 -
external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsp | 107 -
external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsw | 29 -
external/bsd/bind/dist/bin/check/win32/namedcheckconf.mak | 404 -
external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsp | 108 -
external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsw | 29 -
external/bsd/bind/dist/bin/check/win32/namedcheckzone.mak | 404 -
external/bsd/bind/dist/bin/confgen/win32/confgentool.dsp | 135 -
external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.dsp | 103 -
external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.mak | 337 -
external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.dsp | 103 -
external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.mak | 336 -
external/bsd/bind/dist/bin/dig/dig.1 | 14 +-
external/bsd/bind/dist/bin/dig/dig.c | 14 +-
external/bsd/bind/dist/bin/dig/dighost.c | 292 +-
external/bsd/bind/dist/bin/dig/host.c | 6 +-
external/bsd/bind/dist/bin/dig/include/dig/dig.h | 7 +-
external/bsd/bind/dist/bin/dig/nslookup.1 | 11 +-
external/bsd/bind/dist/bin/dig/nslookup.c | 24 +-
external/bsd/bind/dist/bin/dig/win32/dig.dsp | 107 -
external/bsd/bind/dist/bin/dig/win32/dig.mak | 427 -
external/bsd/bind/dist/bin/dig/win32/dighost.dsp | 113 -
external/bsd/bind/dist/bin/dig/win32/host.dsp | 103 -
external/bsd/bind/dist/bin/dig/win32/host.mak | 427 -
external/bsd/bind/dist/bin/dig/win32/nslookup.dsp | 107 -
external/bsd/bind/dist/bin/dig/win32/nslookup.mak | 427 -
external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 | 2 +-
external/bsd/bind/dist/bin/dnssec/dnssec-importkey.c | 2 +-
external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c | 6 +-
external/bsd/bind/dist/bin/dnssec/dnssec-settime.c | 6 +-
external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8 | 29 +-
external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c | 42 +-
external/bsd/bind/dist/bin/dnssec/dnssectool.c | 43 +-
external/bsd/bind/dist/bin/dnssec/win32/dnssectool.dsp | 113 -
external/bsd/bind/dist/bin/dnssec/win32/dsfromkey.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/dsfromkey.mak | 324 -
external/bsd/bind/dist/bin/dnssec/win32/keyfromlabel.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/keyfromlabel.mak | 324 -
external/bsd/bind/dist/bin/dnssec/win32/keygen.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/keygen.mak | 324 -
external/bsd/bind/dist/bin/dnssec/win32/nsupdate.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/nsupdate.dsw | 29 -
external/bsd/bind/dist/bin/dnssec/win32/revoke.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/revoke.mak | 324 -
external/bsd/bind/dist/bin/dnssec/win32/settime.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/settime.mak | 324 -
external/bsd/bind/dist/bin/dnssec/win32/signzone.dsp | 103 -
external/bsd/bind/dist/bin/dnssec/win32/signzone.mak | 324 -
external/bsd/bind/dist/bin/named/builtin.c | 7 +-
external/bsd/bind/dist/bin/named/client.c | 285 +-
external/bsd/bind/dist/bin/named/config.c | 17 +-
external/bsd/bind/dist/bin/named/control.c | 11 +-
external/bsd/bind/dist/bin/named/include/named/globals.h | 3 +-
external/bsd/bind/dist/bin/named/include/named/main.h | 8 +-
external/bsd/bind/dist/bin/named/include/named/query.h | 8 +-
external/bsd/bind/dist/bin/named/include/named/server.h | 16 +-
external/bsd/bind/dist/bin/named/interfacemgr.c | 17 +-
external/bsd/bind/dist/bin/named/logconf.c | 63 +-
external/bsd/bind/dist/bin/named/lwdgrbn.c | 15 +-
external/bsd/bind/dist/bin/named/main.c | 28 +-
external/bsd/bind/dist/bin/named/named.conf.5 | 4 +-
external/bsd/bind/dist/bin/named/named.conf.docbook | 2 +-
external/bsd/bind/dist/bin/named/named.conf.html | 10 +-
external/bsd/bind/dist/bin/named/query.c | 151 +-
external/bsd/bind/dist/bin/named/server.c | 754 +-
external/bsd/bind/dist/bin/named/statschannel.c | 19 +-
external/bsd/bind/dist/bin/named/unix/os.c | 7 +-
external/bsd/bind/dist/bin/named/update.c | 16 +-
external/bsd/bind/dist/bin/named/win32/named.dsp | 333 -
external/bsd/bind/dist/bin/named/win32/named.mak | 1197 -
external/bsd/bind/dist/bin/named/win32/ntservice.c | 160 +-
external/bsd/bind/dist/bin/named/win32/os.c | 6 +-
external/bsd/bind/dist/bin/nsupdate/nsupdate.c | 31 +-
external/bsd/bind/dist/bin/nsupdate/win32/nsupdate.dsp | 103 -
external/bsd/bind/dist/bin/nsupdate/win32/nsupdate.mak | 375 -
external/bsd/bind/dist/bin/pkcs11/openssl-0.9.8x-patch | 15768 ----------
external/bsd/bind/dist/bin/pkcs11/openssl-1.0.0j-patch | 15749 ---------
external/bsd/bind/dist/bin/pkcs11/openssl-1.0.1c-patch | 15750 ---------
external/bsd/bind/dist/bin/pkcs11/win32/pk11destroy.dsp | 119 -
external/bsd/bind/dist/bin/pkcs11/win32/pk11destroy.mak | 296 -
external/bsd/bind/dist/bin/pkcs11/win32/pk11keygen.dsp | 119 -
external/bsd/bind/dist/bin/pkcs11/win32/pk11keygen.mak | 296 -
external/bsd/bind/dist/bin/pkcs11/win32/pk11list.dsp | 119 -
external/bsd/bind/dist/bin/pkcs11/win32/pk11list.mak | 296 -
external/bsd/bind/dist/bin/rndc/rndc.8 | 301 +-
external/bsd/bind/dist/bin/rndc/rndc.c | 14 +-
external/bsd/bind/dist/bin/rndc/win32/rndc.dsp | 107 -
external/bsd/bind/dist/bin/rndc/win32/rndc.mak | 425 -
external/bsd/bind/dist/bin/rndc/win32/rndcutil.dsp | 119 -
external/bsd/bind/dist/bin/tests/atomic/t_atomic.c | 17 +-
external/bsd/bind/dist/bin/tests/backtrace_test.c | 8 +-
external/bsd/bind/dist/bin/tests/db/t_db.c | 64 +-
external/bsd/bind/dist/bin/tests/dst/gsstest.c | 4 +-
external/bsd/bind/dist/bin/tests/dst/t_dst.c | 148 +-
external/bsd/bind/dist/bin/tests/hashes/t_hashes.c | 112 +-
external/bsd/bind/dist/bin/tests/master/t_master.c | 35 +-
external/bsd/bind/dist/bin/tests/mem/t_mem.c | 15 +-
external/bsd/bind/dist/bin/tests/names/t_names.c | 62 +-
external/bsd/bind/dist/bin/tests/rbt/t_rbt.c | 41 +-
external/bsd/bind/dist/bin/tests/resolver/t_resolver.c | 23 +-
external/bsd/bind/dist/bin/tests/rwlock_test.c | 22 +-
external/bsd/bind/dist/bin/tests/sock_test.c | 6 +-
external/bsd/bind/dist/bin/tests/sockaddr/t_sockaddr.c | 17 +-
external/bsd/bind/dist/bin/tests/system/rrl/rrl.c | 2 +-
external/bsd/bind/dist/bin/tests/task_test.c | 10 +-
external/bsd/bind/dist/bin/tests/tasks/t_tasks.c | 55 +-
external/bsd/bind/dist/bin/tests/timer_test.c | 10 +-
external/bsd/bind/dist/bin/tests/timers/t_timers.c | 45 +-
external/bsd/bind/dist/bin/tools/win32/arpaname.dsp | 103 -
external/bsd/bind/dist/bin/tools/win32/arpaname.mak | 299 -
external/bsd/bind/dist/bin/tools/win32/genrandom.dsp | 103 -
external/bsd/bind/dist/bin/tools/win32/genrandom.mak | 299 -
external/bsd/bind/dist/bin/tools/win32/ischmacfixup.dsp | 103 -
external/bsd/bind/dist/bin/tools/win32/ischmacfixup.mak | 299 -
external/bsd/bind/dist/bin/tools/win32/journalprint.dsp | 103 -
external/bsd/bind/dist/bin/tools/win32/journalprint.mak | 299 -
external/bsd/bind/dist/bin/tools/win32/nsec3hash.dsp | 103 -
external/bsd/bind/dist/bin/tools/win32/nsec3hash.mak | 299 -
external/bsd/bind/dist/bin/win32/BINDInstall/BINDInstall.dsp | 177 -
external/bsd/bind/dist/bin/win32/BINDInstall/BINDInstall.mak | 428 -
external/bsd/bind/dist/bin/win32/BINDInstall/StdAfx.h | 5 +-
external/bsd/bind/dist/binclude4netbsd | 56 -
external/bsd/bind/dist/bind2netbsd | 129 -
external/bsd/bind/dist/config.h.in | 21 +
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf | Bin
external/bsd/bind/dist/doc/misc/options | 2 -
external/bsd/bind/dist/lib/bind9/check.c | 7 +-
external/bsd/bind/dist/lib/bind9/win32/libbind9.dsp | 133 -
external/bsd/bind/dist/lib/bind9/win32/libbind9.mak | 452 -
external/bsd/bind/dist/lib/dns/acache.c | 5 +-
external/bsd/bind/dist/lib/dns/client.c | 82 +-
external/bsd/bind/dist/lib/dns/diff.c | 11 +-
external/bsd/bind/dist/lib/dns/dnssec.c | 105 +-
external/bsd/bind/dist/lib/dns/dst_api.c | 29 +-
external/bsd/bind/dist/lib/dns/dst_internal.h | 7 +-
external/bsd/bind/dist/lib/dns/dst_parse.c | 66 +-
external/bsd/bind/dist/lib/dns/dst_result.c | 6 +-
external/bsd/bind/dist/lib/dns/gen.c | 15 +-
external/bsd/bind/dist/lib/dns/gssapi_link.c | 14 +-
external/bsd/bind/dist/lib/dns/gssapictx.c | 42 +-
external/bsd/bind/dist/lib/dns/hmac_link.c | 17 +-
external/bsd/bind/dist/lib/dns/include/dns/client.h | 17 +-
external/bsd/bind/dist/lib/dns/include/dns/dnssec.h | 19 +-
external/bsd/bind/dist/lib/dns/include/dns/log.h | 5 +-
external/bsd/bind/dist/lib/dns/include/dns/master.h | 5 +-
external/bsd/bind/dist/lib/dns/include/dns/masterdump.h | 9 +-
external/bsd/bind/dist/lib/dns/include/dns/message.h | 3 +-
external/bsd/bind/dist/lib/dns/include/dns/nsec3.h | 6 +-
external/bsd/bind/dist/lib/dns/include/dns/rdata.h | 7 +-
external/bsd/bind/dist/lib/dns/include/dns/rrl.h | 2 +-
external/bsd/bind/dist/lib/dns/include/dns/view.h | 4 +-
external/bsd/bind/dist/lib/dns/include/dns/zone.h | 8 +-
external/bsd/bind/dist/lib/dns/include/dst/dst.h | 27 +-
external/bsd/bind/dist/lib/dns/include/dst/gssapi.h | 6 +-
external/bsd/bind/dist/lib/dns/journal.c | 41 +-
external/bsd/bind/dist/lib/dns/log.c | 5 +-
external/bsd/bind/dist/lib/dns/master.c | 12 +-
external/bsd/bind/dist/lib/dns/masterdump.c | 38 +-
external/bsd/bind/dist/lib/dns/message.c | 4 +-
external/bsd/bind/dist/lib/dns/name.c | 12 +-
external/bsd/bind/dist/lib/dns/nsec.c | 6 +-
external/bsd/bind/dist/lib/dns/nsec3.c | 28 +-
external/bsd/bind/dist/lib/dns/openssldh_link.c | 8 +-
external/bsd/bind/dist/lib/dns/openssldsa_link.c | 23 +-
external/bsd/bind/dist/lib/dns/opensslecdsa_link.c | 53 +-
external/bsd/bind/dist/lib/dns/opensslgost_link.c | 31 +-
external/bsd/bind/dist/lib/dns/opensslrsa_link.c | 22 +-
external/bsd/bind/dist/lib/dns/rbtdb.c | 120 +-
external/bsd/bind/dist/lib/dns/rcode.c | 8 +-
external/bsd/bind/dist/lib/dns/rdata.c | 26 +-
external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.c | 24 +-
external/bsd/bind/dist/lib/dns/rdata/generic/hip_55.c | 10 +-
external/bsd/bind/dist/lib/dns/rdata/generic/isdn_20.c | 22 +-
external/bsd/bind/dist/lib/dns/rdata/generic/key_25.c | 24 +-
external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c | 28 +-
external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c | 46 +-
external/bsd/bind/dist/lib/dns/rdata/in_1/wks_11.c | 10 +-
external/bsd/bind/dist/lib/dns/rdataslab.c | 9 +-
external/bsd/bind/dist/lib/dns/resolver.c | 11 +-
external/bsd/bind/dist/lib/dns/rootns.c | 4 +-
external/bsd/bind/dist/lib/dns/rrl.c | 2 +-
external/bsd/bind/dist/lib/dns/spnego.c | 16 +-
external/bsd/bind/dist/lib/dns/spnego_asn1.c | 22 +-
external/bsd/bind/dist/lib/dns/ssu_external.c | 6 +-
external/bsd/bind/dist/lib/dns/tests/rdata_test.c | 3 +-
external/bsd/bind/dist/lib/dns/tests/zonemgr_test.c | 2 +-
external/bsd/bind/dist/lib/dns/ttl.c | 6 +-
external/bsd/bind/dist/lib/dns/update.c | 10 +-
external/bsd/bind/dist/lib/dns/validator.c | 8 +-
external/bsd/bind/dist/lib/dns/view.c | 47 +-
external/bsd/bind/dist/lib/dns/win32/gen.dsp | 107 -
external/bsd/bind/dist/lib/dns/win32/gen.mak | 267 -
external/bsd/bind/dist/lib/dns/win32/libdns.def | 1040 -
external/bsd/bind/dist/lib/dns/win32/libdns.dsp | 801 -
external/bsd/bind/dist/lib/dns/win32/libdns.mak | 2403 -
external/bsd/bind/dist/lib/dns/win32/version.c | 4 +-
external/bsd/bind/dist/lib/dns/xfrin.c | 99 +-
external/bsd/bind/dist/lib/dns/zone.c | 953 +-
external/bsd/bind/dist/lib/isc/app_api.c | 14 +-
external/bsd/bind/dist/lib/isc/backtrace.c | 17 +-
external/bsd/bind/dist/lib/isc/base32.c | 6 +-
external/bsd/bind/dist/lib/isc/base64.c | 6 +-
external/bsd/bind/dist/lib/isc/hash.c | 13 +-
external/bsd/bind/dist/lib/isc/heap.c | 6 +-
external/bsd/bind/dist/lib/isc/hex.c | 6 +-
external/bsd/bind/dist/lib/isc/hmacmd5.c | 7 +-
external/bsd/bind/dist/lib/isc/hmacsha.c | 15 +-
external/bsd/bind/dist/lib/isc/include/isc/app.h | 13 +-
external/bsd/bind/dist/lib/isc/include/isc/file.h | 14 +-
external/bsd/bind/dist/lib/isc/include/isc/hash.h | 6 +-
external/bsd/bind/dist/lib/isc/include/isc/namespace.h | 5 +-
external/bsd/bind/dist/lib/isc/include/isc/safe.h | 2 +-
external/bsd/bind/dist/lib/isc/include/isc/socket.h | 15 +-
external/bsd/bind/dist/lib/isc/include/isc/stdio.h | 12 +-
external/bsd/bind/dist/lib/isc/inet_aton.c | 7 +-
external/bsd/bind/dist/lib/isc/inet_pton.c | 11 +-
external/bsd/bind/dist/lib/isc/lex.c | 21 +-
external/bsd/bind/dist/lib/isc/log.c | 6 +-
external/bsd/bind/dist/lib/isc/mem.c | 16 +-
external/bsd/bind/dist/lib/isc/nothreads/include/isc/thread.h | 5 +-
external/bsd/bind/dist/lib/isc/pthreads/include/isc/thread.h | 7 +-
external/bsd/bind/dist/lib/isc/pthreads/thread.c | 17 +-
external/bsd/bind/dist/lib/isc/random.c | 6 +-
external/bsd/bind/dist/lib/isc/safe.c | 2 +-
external/bsd/bind/dist/lib/isc/socket_api.c | 12 +-
external/bsd/bind/dist/lib/isc/tests/lex_test.c | 2 +-
external/bsd/bind/dist/lib/isc/tests/safe_test.c | 2 +-
external/bsd/bind/dist/lib/isc/unix/app.c | 29 +-
external/bsd/bind/dist/lib/isc/unix/file.c | 31 +-
external/bsd/bind/dist/lib/isc/unix/socket.c | 30 +-
external/bsd/bind/dist/lib/isc/unix/stdio.c | 23 +-
external/bsd/bind/dist/lib/isc/win32/entropy.c | 12 +-
external/bsd/bind/dist/lib/isc/win32/file.c | 6 +-
external/bsd/bind/dist/lib/isc/win32/include/isc/atomic.h | 2 +-
external/bsd/bind/dist/lib/isc/win32/include/isc/net.h | 76 +-
external/bsd/bind/dist/lib/isc/win32/include/isc/platform.h | 108 -
external/bsd/bind/dist/lib/isc/win32/include/isc/thread.h | 6 +-
external/bsd/bind/dist/lib/isc/win32/interfaceiter.c | 14 +-
external/bsd/bind/dist/lib/isc/win32/libisc.def | 596 -
external/bsd/bind/dist/lib/isc/win32/libisc.dsp | 814 -
external/bsd/bind/dist/lib/isc/win32/libisc.mak | 2104 -
external/bsd/bind/dist/lib/isc/win32/net.c | 5 +-
external/bsd/bind/dist/lib/isc/win32/netdb.h | 6 +-
external/bsd/bind/dist/lib/isc/win32/socket.c | 33 +-
external/bsd/bind/dist/lib/isc/win32/stdio.c | 33 +-
external/bsd/bind/dist/lib/isc/win32/stdtime.c | 6 +-
external/bsd/bind/dist/lib/isccc/base64.c | 12 +-
external/bsd/bind/dist/lib/isccc/cc.c | 18 +-
external/bsd/bind/dist/lib/isccc/win32/libisccc.dsp | 197 -
external/bsd/bind/dist/lib/isccc/win32/libisccc.mak | 540 -
external/bsd/bind/dist/lib/isccfg/namedconf.c | 39 +-
external/bsd/bind/dist/lib/isccfg/win32/libisccfg.dsp | 157 -
external/bsd/bind/dist/lib/isccfg/win32/libisccfg.mak | 466 -
external/bsd/bind/dist/lib/lwres/context.c | 24 +-
external/bsd/bind/dist/lib/lwres/gethost.c | 152 +-
external/bsd/bind/dist/lib/lwres/lwinetaton.c | 7 +-
external/bsd/bind/dist/lib/lwres/lwinetpton.c | 9 +-
external/bsd/bind/dist/lib/lwres/lwres_gabn.c | 40 +-
external/bsd/bind/dist/lib/lwres/lwres_gnba.c | 44 +-
external/bsd/bind/dist/lib/lwres/lwres_grbn.c | 12 +-
external/bsd/bind/dist/lib/lwres/lwres_noop.c | 40 +-
external/bsd/bind/dist/lib/lwres/win32/include/lwres/net.h | 108 +-
external/bsd/bind/dist/lib/lwres/win32/include/lwres/netdb.h | 8 +-
external/bsd/bind/dist/lib/lwres/win32/liblwres.dsp | 245 -
external/bsd/bind/dist/lib/lwres/win32/liblwres.mak | 774 -
external/bsd/bind/dist/lib/tests/include/tests/t_api.h | 17 +-
external/bsd/bind/dist/lib/tests/t_api.c | 65 +-
external/bsd/bind/dist/lib/tests/win32/DLLMain.c | 2 +-
external/bsd/bind/dist/lib/win32/bindevt/bindevt.dsp | 132 -
external/bsd/bind/dist/lib/win32/bindevt/bindevt.mak | 310 -
external/bsd/bind/dist/srcid | 2 +-
external/bsd/bind/dist/unit/atf-src/admin/check-install.sh | 92 -
external/bsd/bind/dist/unit/atf-src/atf-c++/atf-c++-api.3 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/atf-c-api.3 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/atf_c_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/check.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/check.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/check_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/config.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/config_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/dynstr_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/env.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/env_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/fs_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/list.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/list.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/list_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/map.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/map.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/map_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/process.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/process.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/process_helpers.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/process_test.c | 87 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/sanity.h | 5 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/sanity_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/test_helpers_test.c | 187 -
external/bsd/bind/dist/unit/atf-src/atf-c/detail/text.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/text.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/text_test.c | 8 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/tp_main.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/user.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/user.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/detail/user_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/error.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/error.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/error_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/macros.h | 32 +-
external/bsd/bind/dist/unit/atf-src/atf-c/macros_h_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/macros_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tc.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tc.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tc_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tp.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tp.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/tp_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/unused_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/utils.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/utils.h | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-c/utils_test.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-config/atf-config.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-report/atf-report.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-run/atf-run.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-run/several_tcs_helper.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-run/zero_tcs_helper.c | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-sh/atf-check.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-sh/atf-sh-api.3 | 2 +-
external/bsd/bind/dist/unit/atf-src/atf-version/atf-version.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/doc/atf-formats.5 | 2 +-
external/bsd/bind/dist/unit/atf-src/doc/atf-test-case.4 | 2 +-
external/bsd/bind/dist/unit/atf-src/doc/atf-test-program.1 | 2 +-
external/bsd/bind/dist/unit/atf-src/test-programs/c_helpers.c | 2 +-
external/bsd/bind/dist/unit/atf-src/test-programs/fork_test.sh | 64 -
external/bsd/bind/dist/version | 7 +-
external/bsd/bind/dist/win32utils/BINDBuild.dsw | 740 -
external/bsd/bind/dist/win32utils/BuildAll.bat | 143 -
external/bsd/bind/dist/win32utils/BuildPost.bat | 28 -
external/bsd/bind/dist/win32utils/BuildSetup.bat | 116 -
external/bsd/bind/dist/win32utils/SetupLibs.bat | 32 -
external/bsd/bind/dist/win32utils/dnsheadergen.bat | 26 -
external/bsd/bind/dist/win32utils/legacy/BINDBuild.dsw.in | 3 -
external/bsd/bind/dist/win32utils/makedefs.pl | 149 -
external/bsd/bind/dist/win32utils/makesrcid.pl | 81 -
external/bsd/bind/dist/win32utils/makeversion.pl | 136 -
external/bsd/bind/dist/win32utils/setpk11provider.pl | 105 -
external/bsd/bind/dist/win32utils/updatelibxml2.pl | 217 -
external/bsd/bind/dist/win32utils/updateopenssl.pl | 108 -
external/bsd/bind/dist/win32utils/win32-build.txt | 151 -
357 files changed, 5141 insertions(+), 76881 deletions(-)
diffs (truncated from 90754 to 300 lines):
diff -r 40c1383f5e32 -r fc2eda5a96cc external/bsd/bind/dist/CHANGES
--- a/external/bsd/bind/dist/CHANGES Tue Dec 31 20:23:12 2013 +0000
+++ b/external/bsd/bind/dist/CHANGES Tue Dec 31 20:24:38 2013 +0000
@@ -1,13 +1,305 @@
- --- 9.9.3-P2 released ---
+ --- 9.9.5b1 released ---
+
+3688. [bug] loadnode could return a freed node on out of memory.
+ [RT #35106]
+
+3687. [bug] Address null pointer dereference in zone_xfrdone.
+ [RT #35042]
+
+3686. [func] "dnssec-signzone -Q" drops signatures from keys
+ that are still published but no longer active.
+ [RT #34990]
+
+3685. [bug] "rndc refresh" didn't work correctly with slave
+ zones using inline-signing. [RT #35105]
+
+3683. [cleanup] Add a more detailed "not found" message to rndc
+ commands which specify a zone name. [RT #35059]
+
+3682. [bug] Correct the behavior of rndc retransfer to allow
+ inline-signing slave zones to retain NSEC3 parameters
+ instead of reverting to NSEC. [RT #34745]
+
+3681. [port] Update the Windows build system to support feature
+ selection and WIN64 builds. This is a work in
+ progress. [RT #34160]
+
+3679. [bug] dig could fail to clean up TCP sockets still
+ waiting on connect(). [RT #35074]
+
+3678. [port] Update config.guess and config.sub. [RT #35060]
+
+3677. [bug] 'nsupdate' leaked memory if 'realm' was used multiple
+ times. [RT #35073]
+
+3676. [bug] "named-checkconf -z" now checks zones of type
+ hint and redirect as well as master. [RT #35046]
+
+3675. [misc] Provide a place for third parties to add version
+ information for their extensions in the version
+ file by setting the EXTENSIONS variable.
+
+3674. [bug] RPZ zeroed ttls if the query type was '*'. [RT #35026]
+
+3672. [func] Local address can now be specified when using
+ dns_client API. [RT #34811]
+
+3671. [bug] Don't allow dnssec-importkey overwrite a existing
+ non-imported private key.
+
+3670. [bug] Address read after free in server side of
+ lwres_getrrsetbyname. [RT #29075]
+
+3669. [port] freebsd: --with-gssapi needs -lhx509. [RT #35001]
+
+3668. [bug] Fix cast in lex.c which could see 0xff treated as eof.
+ [RT #34993]
+
+3667. [test] dig: add support to keep the TCP socket open between
+ successive queries (+[no]keepopen). [RT #34918]
+
+3665. [bug] Failure to release lock on error in receive_secure_db.
+ [RT #34944]
+
+3664. [bug] Updated OpenSSL PKCS#11 patches to fix active list
+ locking and other bugs. [RT #34855]
+
+3663. [bug] Address bugs in dns_rdata_fromstruct and
+ dns_rdata_tostruct for WKS and ISDN types. [RT #34910]
+
+3662. [bug] 'host' could die if a UDP query timed out. [RT #34870]
+
+3661. [bug] Address lock order reversal deadlock with inline zones.
+ [RT #34856]
+
+3660. [cleanup] Changed the name of "isc-config.sh" to "bind9-config".
+ [RT #23825]
+
+3659. [port] solaris: don't add explict dependancies/rules for
+ python programs as make won't use the implicit rules.
+ [RT #34835]
+
+3658. [port] linux: Address platform specific compilation issue
+ when libcap-devel is installed. [RT #34838]
+
+3657. [port] Some readline clones don't accept NULL pointers when
+ calling add_history. [RT #34842]
+
+3656. [bug] Treat an all zero netmask as invalid when generating
+ the localnets acl. [RT #34687]
+
+3655. [cleanup] Simplify TCP message processing when requesting a
+ zone transfer. [RT #34825]
+
+3654. [bug] Address race condition with manual notify requests.
+ [RT #34806]
+
+3653. [func] Create delegations for all "children" of empty zones
+ except "forward first". [RT #34826]
+
+3651. [tuning] Adjust when a master server is deemed unreachable.
+ [RT #27075]
+
+3650. [tuning] Use separate rate limiting queues for refresh and
+ notify requests. [RT #30589]
+
+3649. [cleanup] Include a comment in .nzf files, giving the name of
+ the associated view. [RT #34765]
+
+3648. [test] Updated the ATF test framework to version 0.17.
+ [RT #25627]
+
+3647. [bug] Address a race condition when shutting down a zone.
+ [RT #34750]
+
+3646. [bug] Journal filename string could be set incorrectly,
+ causing garbage in log messages. [RT #34738]
+
+3645. [protocol] Use case sensitive compression when responding to
+ queries. [RT #34737]
+
+3644. [protocol] Check that EDNS subnet client options are well formed.
+ [RT #34718]
+
+3642. [func] Allow externally generated DNSKEY to be imported
+ into the DNSKEY management framework. A new tool
+ dnssec-importkey is used to do this. [RT #34698]
+
+3641. [bug] Handle changes to sig-validity-interval settings
+ better. [RT #34625]
+
+3640. [bug] ndots was not being checked when searching. Only
+ continue searching on NXDOMAIN responses. Add the
+ ability to specify ndots to nslookup. [RT #34711]
+
+3639. [bug] Treat type 65533 (KEYDATA) as opaque except when used
+ in a key zone. [RT #34238]
+
+ --- 9.9.4 released ---
+
+3643. [doc] Clarify RRL "slip" documentation.
+
+3638. [cleanup] Add the ability to handle ENOPROTOOPT in case it is
+ encountered. [RT #34668]
+
+ --- 9.9.4rc2 released ---
+
+3637. [bug] 'allow-query-on' was checking the source address
+ rather than the destination address. [RT #34590]
+
+3636. [bug] Automatic empty zones now behave better with
+ forward only "zones" beneath them. [RT #34583]
+
+3635. [bug] Signatures were not being removed from a zone with
+ only KSK keys for a algorithm. [RT #34439]
+
+3634. [func] Report build-id in rndc status. Report build-id
+ when building from a git repository. [RT #20422]
+
+3633. [cleanup] Refactor OPT processing in named to make it easier
+ to support new EDNS options. [RT #34414]
+
+3632. [bug] Signature from newly inactive keys were not being
+ removed. [RT #32178]
+
+3631. [bug] Remove spurious warning about missing signatures when
+ qtype is SIG. [RT #34600]
+
+3630. [bug] Ensure correct ID computation for MD5 keys. [RT #33033]
+
+3627. [bug] RPZ changes were not effective on slaves. [RT #34450]
+
+3625. [bug] Don't send notify messages to machines outside of the
+ test setup.
+
+3623. [bug] zone-statistics was only effective in new statistics.
+ [RT #34466]
+
+ --- 9.9.4rc1 released ---
3621. [security] Incorrect bounds checking on private type 'keydata'
can lead to a remotely triggerable REQUIRE failure
(CVE-2013-4854). [RT #34238]
- --- 9.9.3-P1 released ---
+3617. [bug] Named was failing to answer queries during
+ "rndc reload" [RT #34098]
+
+3616. [bug] Change #3613 was incomplete. [RT #34177]
+
+3615. [cleanup] "configure" now finishes by printing a summary
+ of optional BIND features and whether they are
+ active or inactive. ("configure --enable-full-report"
+ increases the verbosity of the summary.) [RT #31777]
+
+3614. [port] Check for <linux/types.h>. [RT #34162]
+
+3613. [bug] named could crash when deleting inline-signing
+ zones with "rndc delzone". [RT #34066]
+
+3611. [bug] Improved resistance to a theoretical authentication
+ attack based on differential timing. [RT #33939]
+
+3610. [cleanup] win32: Some executables had been omitted from the
+ installer. [RT #34116]
+
+3608. [port] win32: added todos.pl script to ensure all text files
+ the win32 build depends on are converted to DOS
+ newline format. [RT #22067]
+
+3607. [bug] dnssec-keygen had broken 'Invalid keyfile' error
+ message. [RT #34045]
+
+ --- 9.9.4b1 released ---
+
+3605. [port] win32: Addressed several compatibility issues
+ with newer versions of Visual Studio. [RT #33916]
+
+3603. [bug] Install <isc/stat.h>. [RT #33956]
+
+3601. [bug] Added to PKCS#11 openssl patches a value len
+ attribute in DH derive key. [RT #33928]
+
+3600. [cleanup] dig: Fixed a typo in the warning output when receiving
+ an oversized response. [RT #33910]
+
+3599. [tuning] Check for pointer equivalence in name comparisons.
+ [RT #18125]
+
+3596. [port] Updated win32 build documentation, added
+ dnssec-verify. [RT #22067]
+
+3594. [maint] Update config.guess and config.sub. [RT #33816]
+
+3592. [doc] Moved documentation of rndc command options to the
+ rndc man page. [RT #33506]
+
+3590. [bug] When using RRL on recursive servers, defer
+ rate-limiting until after recursion is complete;
+ also, use correct rcode for slipped NXDOMAIN
+ responses. [RT #33604]
+
+3588. [bug] dig: addressed a memory leak in the sigchase code
+ that could cause a shutdown crash. [RT #33733]
+
+3587. [func] 'named -g' now checks the logging configuration but
+ does not use it. [RT #33473]
+
+3586. [bug] Handle errors in xmlDocDumpFormatMemoryEnc. [RT #33706]
3584. [security] Caching data from an incompletely signed zone could
- trigger an assertion failure in resolver.c [RT #33690]
+ trigger an assertion failure in resolver.c
+ (CVE-2013-3919). [RT #33690]
+
+3583. [bug] Address memory leak in GSS-API processing [RT #33574]
+
+3582. [bug] Silence false positive warning regarding missing file
+ directive for inline slave zones. [RT #33662]
+
+3581. [bug] Changed the tcp-listen-queue default to 10. [RT #33029]
+
+3580. [bug] Addressed a possible race in acache.c [RT #33602]
+
+3579. [maint] Updates to PKCS#11 openssl patches, supporting
+ versions 0.9.8y, 1.0.0k, 1.0.1e [RT #33463]
+
+3578. [bug] 'rndc -c file' now fails if 'file' does not exist.
+ [RT #33571]
+
+3577. [bug] Handle zero TTL values better. [RT #33411]
+
+3576. [bug] Address a shutdown race when validating. [RT #33573]
+
+3575. [func] Changed the logging category for RRL events from
+ 'queries' to 'query-errors'. [RT #33540]
+
+3574. [doc] The 'hostname' keyword was missing from server-id
+ description in the named.conf man page. [RT #33476]
+
+3573. [bug] "rndc addzone" and "rndc delzone" incorrectly handled
+ zone names containing punctuation marks and other
+ nonstandard characters. [RT #33419]
+
+3571. [bug] Address race condition in dns_client_startresolve().
+ [RT #33234]
+
+3566. [func] Log when forwarding updates to master. [RT #33240]
+
+3554. [bug] RRL failed to correctly rate-limit upward
+ referrals and failed to count dropped error
+ responses in the statistics. [RT #33225]
+
+3545. [bug] RRL slip behavior was incorrect when set to 1.
+ [RT #33111]
+
Home |
Main Index |
Thread Index |
Old Index