CVS commit: src/dist/bind

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: src/dist/bind
From: Christos Zoulas <christos%netbsd.org@localhost>
Date: Sat, 27 Jan 2007 21:24:11 +0000 (UTC)
Module Name:    src
Committed By:   christos
Date:           Sat Jan 27 21:24:11 UTC 2007

Modified Files:
        src/dist/bind: README
        src/dist/bind/bin/dig: dig.c
        src/dist/bind/bin/dnssec: dnssec-signzone.c
        src/dist/bind/bin/named: main.c named.8 named.conf.5 query.c
        src/dist/bind/bin/nsupdate: nsupdate.c
        src/dist/bind/lib/bind/include/isc: assertions.h
        src/dist/bind/lib/bind/isc: assertions.c
        src/dist/bind/lib/dns: adb.c message.c rbt.c resolver.c validator.c
        src/dist/bind/lib/dns/rdata/generic: dnskey_48.c dnskey_48.h ds_43.c
            ds_43.h nsec_47.c nsec_47.h rrsig_46.c rrsig_46.h sshfp_44.c
            sshfp_44.h
        src/dist/bind/lib/dns/rdata/in_1: apl_42.c apl_42.h wks_11.c
        src/dist/bind/lib/isc: assertions.c base64.c heap.c hex.c string.c
        src/dist/bind/lib/isc/include/isc: assertions.h
        src/dist/bind/lib/isc/unix: app.c os.c
        src/dist/bind/lib/lwres: getaddrinfo.c getnameinfo.c
Removed Files:
        src/dist/bind: EXCLUDED
        src/dist/bind/bin/named: aclconf.c
        src/dist/bind/bin/named/include/named: aclconf.h
        src/dist/bind/bin/tests: nxtify.c
        src/dist/bind/bin/tests/names: dns_label_countbits_data
            dns_label_getbit_data dns_name_fromwire_9_data wire_test9.data
        src/dist/bind/bin/tests/system/stress/ns1: root.db
        src/dist/bind/bin/tests/system/xfer: knowngood.dig.out
        src/dist/bind/bin/tests/system/xfer/ns2: example.db tsigzone.db
        src/dist/bind/contrib/idn/idnkit-1.0-src/patch/bind9:
            bind-9.2.3rc1-patch bind-9.3.0-patch bind-9.3.1-patch
            bind-9.3.2-patch
        src/dist/bind/doc/draft: draft-baba-dnsext-acl-reqts-00.txt
            draft-dnsext-opcode-discover-01.txt
            draft-esibov-dnsext-dynupdtld-00.txt
            draft-hibbs-dns-server-mib-01.txt draft-ietf-dnsext-aaaa-a6-01.txt
            draft-ietf-dnsext-ad-is-secure-06.txt
            draft-ietf-dnsext-apl-rr-02.txt
            draft-ietf-dnsext-axfr-clarify-03.txt
            draft-ietf-dnsext-delegation-signer-14.txt
            draft-ietf-dnsext-dhcid-rr-06.txt draft-ietf-dnsext-dhcid-rr-09.txt
            draft-ietf-dnsext-dnsmib-historical-00.txt
            draft-ietf-dnsext-dnssec-intro-05.txt
            draft-ietf-dnsext-dnssec-okbit-02.txt
            draft-ietf-dnsext-dnssec-online-signing-00.txt
            draft-ietf-dnsext-dnssec-opt-in-05.txt
            draft-ietf-dnsext-dnssec-protocol-01.txt
            draft-ietf-dnsext-dnssec-records-03.txt
            draft-ietf-dnsext-dnssec-roadmap-07.txt
            draft-ietf-dnsext-ecc-key-03.txt draft-ietf-dnsext-edns0dot5-02.txt
            draft-ietf-dnsext-gss-tsig-06.txt
            draft-ietf-dnsext-insensitive-03.txt
            draft-ietf-dnsext-insensitive-06.txt
            draft-ietf-dnsext-ipv6-dns-tradeoffs-00.txt
            draft-ietf-dnsext-ipv6-name-auto-reg-00.txt
            draft-ietf-dnsext-keyrr-key-signing-flag-06.txt
            draft-ietf-dnsext-mdns-19.txt draft-ietf-dnsext-message-size-01.txt
            draft-ietf-dnsext-not-existing-rr-01.txt
            draft-ietf-dnsext-nsec3-02.txt
            draft-ietf-dnsext-obsolete-iquery-04.txt
            draft-ietf-dnsext-parent-sig-00.txt
            draft-ietf-dnsext-parent-stores-zone-keys-01.txt
            draft-ietf-dnsext-rfc1886bis-02.txt
            draft-ietf-dnsext-rfc2536bis-dsa-00.txt
            draft-ietf-dnsext-rfc2539bis-dhk-00.txt
            draft-ietf-dnsext-rfc2782bis-01.txt
            draft-ietf-dnsext-tkey-renewal-mode-03.txt
            draft-ietf-dnsext-trustupdate-timers-01.txt
            draft-ietf-dnsext-tsig-sha-04.txt
            draft-ietf-dnsext-unknown-rrs-05.txt
            draft-ietf-dnsext-wcard-clarify-08.txt
            draft-ietf-dnsext-zone-status-03.txt
            draft-ietf-dnsop-bad-dns-res-04.txt
            draft-ietf-dnsop-dnssec-operational-practices-04.txt
            draft-ietf-dnsop-hardie-shared-root-server-07.txt
            draft-ietf-dnsop-inaddr-required-02.txt
            draft-ietf-dnsop-interim-signed-root-01.txt
            draft-ietf-dnsop-ipv6-dns-issues-02.txt
            draft-ietf-dnsop-keyhand-04.txt draft-ietf-dnsop-parent-sig-00.txt
            draft-ietf-dnsop-serverid-01.txt draft-ietf-dnsop-serverid-04.txt
            draft-ietf-enum-e164-gstn-np-01.txt
            draft-ietf-enum-operation-02.txt draft-ietf-idn-aceid-02.txt
            draft-ietf-idn-amc-ace-m-00.txt draft-ietf-idn-brace-00.txt
            draft-ietf-idn-cjk-01.txt draft-ietf-idn-dnsii-mdnp-02.txt
            draft-ietf-idn-dnsii-mdnr-01.txt draft-ietf-idn-dnsii-trace-00.txt
            draft-ietf-idn-dude-02.txt draft-ietf-idn-idna-03.txt
            draft-ietf-idn-idne-02.txt draft-ietf-idn-iptr-02.txt
            draft-ietf-idn-jpchar-01.txt draft-ietf-idn-lace-01.txt
            draft-ietf-idn-mua-00.txt draft-ietf-idn-nameprep-03.txt
            draft-ietf-idn-punycode-03.txt draft-ietf-idn-race-03.txt
            draft-ietf-idn-requirements-05.txt draft-ietf-idn-udns-02.txt
            draft-ietf-idn-uri-03.txt draft-ietf-idn-utf6-00.txt
            draft-ietf-idn-version-00.txt draft-ietf-idn-vidn-01.txt
            draft-ietf-ipngwg-default-addr-select-05.txt
            draft-ietf-ipngwg-dns-lookups-08.txt
            draft-ietf-ipngwg-prefix-rr-disc-00.txt
            draft-ietf-ipngwg-rfc2292bis-02.txt
            draft-ietf-ipngwg-rfc2553bis-10.txt
            draft-ietf-ipv6-dns-discovery-07.txt draft-ietf-secsh-dns-04.txt
            draft-jeong-hmipv6-dns-optimization-00.txt
            draft-klensin-1591-reflections-02.txt draft-klensin-dns-role-01.txt
            draft-klensin-idn-tld-00.txt
            draft-kosters-dnsext-dnssec-opt-in-01.txt
            draft-lewis-dns-wildcard-clarify-00.txt
            draft-macgowan-dnsext-label-intel-manage-00.txt
            draft-manning-multicast-dns-02.txt
            draft-msawyer-dnsext-edns-attributes-00.txt
            draft-richardson-ipsec-rr-02.txt
            draft-sawyer-dnsext-edns0-zone-option-00.txt
            draft-skwan-utf8-dns-06.txt draft-ymbk-6to4-arpa-delegation-00.txt
        src/dist/bind/docutil: docbook2man-wrapper.sh.in
        src/dist/bind/lib/dns: a6.c nxt.c
        src/dist/bind/lib/dns/include/dns: a6.h nxt.h
        src/dist/bind/lib/dns/rdata/generic: dlv_65323.c dlv_65323.h
        src/dist/bind/lib/isc/win32: ntfile.c
        src/dist/bind/lib/isc/win32/include/isc: ntfile.h
        src/dist/bind/lib/isccfg: check.c
        src/dist/bind/lib/isccfg/include/isccfg: check.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/EXCLUDED
cvs rdiff -r1.14 -r1.15 src/dist/bind/README
cvs rdiff -r1.12 -r1.13 src/dist/bind/bin/dig/dig.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/dnssec/dnssec-signzone.c
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/bin/named/aclconf.c
cvs rdiff -r1.5 -r1.6 src/dist/bind/bin/named/main.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/named/named.8 \
    src/dist/bind/bin/named/named.conf.5
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/named/query.c
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/bin/named/include/named/aclconf.h
cvs rdiff -r1.11 -r1.12 src/dist/bind/bin/nsupdate/nsupdate.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/bin/tests/nxtify.c
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/bin/tests/names/dns_label_countbits_data \
    src/dist/bind/bin/tests/names/dns_label_getbit_data \
    src/dist/bind/bin/tests/names/dns_name_fromwire_9_data \
    src/dist/bind/bin/tests/names/wire_test9.data
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/bin/tests/system/stress/ns1/root.db
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/bin/tests/system/xfer/knowngood.dig.out
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/bin/tests/system/xfer/ns2/example.db \
    src/dist/bind/bin/tests/system/xfer/ns2/tsigzone.db
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.3rc1-patch \
    src/dist/bind/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.1-patch \
    src/dist/bind/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.2-patch
cvs rdiff -r1.1.1.2 -r0 \
    src/dist/bind/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.3.0-patch
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/doc/draft/draft-baba-dnsext-acl-reqts-00.txt \
    src/dist/bind/doc/draft/draft-dnsext-opcode-discover-01.txt \
    src/dist/bind/doc/draft/draft-esibov-dnsext-dynupdtld-00.txt \
    src/dist/bind/doc/draft/draft-hibbs-dns-server-mib-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-aaaa-a6-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-ad-is-secure-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-apl-rr-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-axfr-clarify-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-delegation-signer-14.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dhcid-rr-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnsmib-historical-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-intro-05.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-okbit-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-opt-in-05.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-protocol-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-records-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-roadmap-07.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-ecc-key-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-edns0dot5-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-gss-tsig-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-insensitive-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-insensitive-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-ipv6-dns-tradeoffs-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-ipv6-name-auto-reg-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-mdns-19.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-message-size-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-not-existing-rr-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-nsec3-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-obsolete-iquery-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-parent-sig-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-parent-stores-zone-keys-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc1886bis-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2782bis-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-unknown-rrs-05.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-zone-status-03.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt \
    
src/dist/bind/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-hardie-shared-root-server-07.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-inaddr-required-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-interim-signed-root-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-keyhand-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-parent-sig-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-serverid-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-serverid-04.txt \
    src/dist/bind/doc/draft/draft-ietf-enum-e164-gstn-np-01.txt \
    src/dist/bind/doc/draft/draft-ietf-enum-operation-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-aceid-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-amc-ace-m-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-brace-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-cjk-01.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-dnsii-mdnp-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-dnsii-mdnr-01.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-dnsii-trace-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-dude-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-idna-03.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-idne-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-iptr-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-jpchar-01.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-lace-01.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-mua-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-nameprep-03.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-punycode-03.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-race-03.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-requirements-05.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-udns-02.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-uri-03.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-utf6-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-version-00.txt \
    src/dist/bind/doc/draft/draft-ietf-idn-vidn-01.txt \
    src/dist/bind/doc/draft/draft-ietf-ipngwg-default-addr-select-05.txt \
    src/dist/bind/doc/draft/draft-ietf-ipngwg-dns-lookups-08.txt \
    src/dist/bind/doc/draft/draft-ietf-ipngwg-prefix-rr-disc-00.txt \
    src/dist/bind/doc/draft/draft-ietf-ipngwg-rfc2292bis-02.txt \
    src/dist/bind/doc/draft/draft-ietf-ipngwg-rfc2553bis-10.txt \
    src/dist/bind/doc/draft/draft-ietf-ipv6-dns-discovery-07.txt \
    src/dist/bind/doc/draft/draft-ietf-secsh-dns-04.txt \
    src/dist/bind/doc/draft/draft-jeong-hmipv6-dns-optimization-00.txt \
    src/dist/bind/doc/draft/draft-klensin-1591-reflections-02.txt \
    src/dist/bind/doc/draft/draft-klensin-dns-role-01.txt \
    src/dist/bind/doc/draft/draft-klensin-idn-tld-00.txt \
    src/dist/bind/doc/draft/draft-kosters-dnsext-dnssec-opt-in-01.txt \
    src/dist/bind/doc/draft/draft-lewis-dns-wildcard-clarify-00.txt \
    src/dist/bind/doc/draft/draft-macgowan-dnsext-label-intel-manage-00.txt \
    src/dist/bind/doc/draft/draft-manning-multicast-dns-02.txt \
    src/dist/bind/doc/draft/draft-msawyer-dnsext-edns-attributes-00.txt \
    src/dist/bind/doc/draft/draft-richardson-ipsec-rr-02.txt \
    src/dist/bind/doc/draft/draft-sawyer-dnsext-edns0-zone-option-00.txt \
    src/dist/bind/doc/draft/draft-skwan-utf8-dns-06.txt \
    src/dist/bind/doc/draft/draft-ymbk-6to4-arpa-delegation-00.txt
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/docutil/docbook2man-wrapper.sh.in
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/bind/include/isc/assertions.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/bind/isc/assertions.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/dns/a6.c \
    src/dist/bind/lib/dns/nxt.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/dns/adb.c \
    src/dist/bind/lib/dns/message.c src/dist/bind/lib/dns/resolver.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/dns/rbt.c \
    src/dist/bind/lib/dns/validator.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/dns/include/dns/a6.h \
    src/dist/bind/lib/dns/include/dns/nxt.h
cvs rdiff -r1.3 -r0 src/dist/bind/lib/dns/rdata/generic/dlv_65323.c \
    src/dist/bind/lib/dns/rdata/generic/dlv_65323.h
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/dns/rdata/generic/dnskey_48.c \
    src/dist/bind/lib/dns/rdata/generic/dnskey_48.h \
    src/dist/bind/lib/dns/rdata/generic/ds_43.c \
    src/dist/bind/lib/dns/rdata/generic/ds_43.h \
    src/dist/bind/lib/dns/rdata/generic/nsec_47.c \
    src/dist/bind/lib/dns/rdata/generic/nsec_47.h \
    src/dist/bind/lib/dns/rdata/generic/rrsig_46.c \
    src/dist/bind/lib/dns/rdata/generic/rrsig_46.h \
    src/dist/bind/lib/dns/rdata/generic/sshfp_44.c \
    src/dist/bind/lib/dns/rdata/generic/sshfp_44.h
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/dns/rdata/in_1/apl_42.c \
    src/dist/bind/lib/dns/rdata/in_1/apl_42.h
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/dns/rdata/in_1/wks_11.c
cvs rdiff -r1.6 -r1.7 src/dist/bind/lib/isc/assertions.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/isc/base64.c \
    src/dist/bind/lib/isc/heap.c src/dist/bind/lib/isc/hex.c \
    src/dist/bind/lib/isc/string.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/isc/include/isc/assertions.h
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/isc/unix/app.c \
    src/dist/bind/lib/isc/unix/os.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/isc/win32/ntfile.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/isc/win32/include/isc/ntfile.h
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/isccfg/check.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/isccfg/include/isccfg/check.h
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/lwres/getaddrinfo.c
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/lwres/getnameinfo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Prev by Date: CVS commit: src/dist/bind
Next by Date: CVS commit: src/include
Previous by Thread: CVS commit: src/dist/bind
Next by Thread: CVS commit: src/include
Indexes:
Home | Main Index | Thread Index | Old Index