CVS commit: src/dist/bind

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Jun 21 18:59:26 UTC 2008

Modified Files:
        src/dist/bind: README
        src/dist/bind/bin/dig: dig.c dighost.c
        src/dist/bind/bin/dig/include/dig: dig.h
        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/bin/rndc: rndc-confgen.c rndc.c
        src/dist/bind/contrib/named-bootconf: named-bootconf.sh
        src/dist/bind/lib/bind/include/isc: assertions.h
        src/dist/bind/lib/bind/inet: inet_network.c
        src/dist/bind/lib/bind/isc: assertions.c
        src/dist/bind/lib/dns: adb.c dst_api.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/alpha/include/isc: atomic.h
        src/dist/bind/lib/isc/ia64/include/isc: atomic.h
        src/dist/bind/lib/isc/include/isc: assertions.h
        src/dist/bind/lib/isc/mips/include/isc: atomic.h
        src/dist/bind/lib/isc/noatomic/include/isc: atomic.h
        src/dist/bind/lib/isc/powerpc/include/isc: atomic.h
        src/dist/bind/lib/isc/sparc64/include/isc: atomic.h
        src/dist/bind/lib/isc/unix: app.c os.c
        src/dist/bind/lib/isc/x86_32/include/isc: atomic.h
        src/dist/bind/lib/isc/x86_64/include/isc: atomic.h
        src/dist/bind/lib/lwres: getaddrinfo.c getnameinfo.c
        src/dist/bind/lib/lwres/include/lwres: lwres.h
Removed Files:
        src/dist/bind/bin/tests/system/rrsetorder: dig.out.cyclic.good1
            dig.out.cyclic.good2 dig.out.cyclic.good3 dig.out.cyclic.good4
        src/dist/bind/contrib/query-loc-0.3.0: ADDRESSES ALGO INSTALL
            Makefile.in README USAGE config.h.in configure configure.in
            install-sh loc.c loc.h loc_ntoa.c query-loc.1 query-loc.c
        src/dist/bind/doc/draft: draft-ietf-dnsext-dnssec-experiments-01.txt
            draft-ietf-dnsext-mdns-43.txt draft-ietf-dnsext-nsec3-04.txt
            draft-ietf-dnsext-rfc2536bis-dsa-06.txt
            draft-ietf-dnsext-rfc2538bis-04.txt
            draft-ietf-dnsext-rfc2539bis-dhk-06.txt
            draft-ietf-dnsext-trustupdate-timers-02.txt
            draft-ietf-dnsop-dnssec-operational-practices-08.txt
            draft-ietf-dnsop-respsize-02.txt draft-schlitt-spf-classic-02.txt

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 src/dist/bind/README
cvs rdiff -r1.14 -r1.15 src/dist/bind/bin/dig/dig.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/dig/dighost.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/dig/include/dig/dig.h
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/dnssec/dnssec-signzone.c
cvs rdiff -r1.6 -r1.7 src/dist/bind/bin/named/main.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/bin/named/named.8 \
    src/dist/bind/bin/named/named.conf.5
cvs rdiff -r1.5 -r1.6 src/dist/bind/bin/named/query.c
cvs rdiff -r1.12 -r1.13 src/dist/bind/bin/nsupdate/nsupdate.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/rndc/rndc-confgen.c \
    src/dist/bind/bin/rndc/rndc.c
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/bin/tests/system/rrsetorder/dig.out.cyclic.good1 \
    src/dist/bind/bin/tests/system/rrsetorder/dig.out.cyclic.good2 \
    src/dist/bind/bin/tests/system/rrsetorder/dig.out.cyclic.good3 \
    src/dist/bind/bin/tests/system/rrsetorder/dig.out.cyclic.good4
cvs rdiff -r1.2 -r1.3 src/dist/bind/contrib/named-bootconf/named-bootconf.sh
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/contrib/query-loc-0.3.0/ADDRESSES \
    src/dist/bind/contrib/query-loc-0.3.0/INSTALL \
    src/dist/bind/contrib/query-loc-0.3.0/Makefile.in \
    src/dist/bind/contrib/query-loc-0.3.0/README \
    src/dist/bind/contrib/query-loc-0.3.0/config.h.in \
    src/dist/bind/contrib/query-loc-0.3.0/configure.in \
    src/dist/bind/contrib/query-loc-0.3.0/loc.c \
    src/dist/bind/contrib/query-loc-0.3.0/loc.h \
    src/dist/bind/contrib/query-loc-0.3.0/query-loc.1 \
    src/dist/bind/contrib/query-loc-0.3.0/query-loc.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/contrib/query-loc-0.3.0/ALGO \
    src/dist/bind/contrib/query-loc-0.3.0/USAGE \
    src/dist/bind/contrib/query-loc-0.3.0/configure \
    src/dist/bind/contrib/query-loc-0.3.0/install-sh \
    src/dist/bind/contrib/query-loc-0.3.0/loc_ntoa.c
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-mdns-43.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-nsec3-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt \
    
src/dist/bind/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-respsize-02.txt \
    src/dist/bind/doc/draft/draft-schlitt-spf-classic-02.txt
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/bind/include/isc/assertions.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/bind/inet/inet_network.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/bind/isc/assertions.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/dns/adb.c \
    src/dist/bind/lib/dns/message.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/dns/dst_api.c
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/dns/rbt.c \
    src/dist/bind/lib/dns/validator.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/dns/resolver.c
cvs rdiff -r1.4 -r1.5 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.4 -r1.5 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.5 -r1.6 src/dist/bind/lib/dns/rdata/in_1/wks_11.c
cvs rdiff -r1.7 -r1.8 src/dist/bind/lib/isc/assertions.c
cvs rdiff -r1.5 -r1.6 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.2 -r1.3 src/dist/bind/lib/isc/alpha/include/isc/atomic.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/ia64/include/isc/atomic.h
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/isc/include/isc/assertions.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/mips/include/isc/atomic.h
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/isc/noatomic/include/isc/atomic.h
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/isc/powerpc/include/isc/atomic.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/sparc64/include/isc/atomic.h
cvs rdiff -r1.6 -r1.7 src/dist/bind/lib/isc/unix/app.c \
    src/dist/bind/lib/isc/unix/os.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/x86_32/include/isc/atomic.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/x86_64/include/isc/atomic.h
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/lwres/getaddrinfo.c
cvs rdiff -r1.6 -r1.7 src/dist/bind/lib/lwres/getnameinfo.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/lwres/include/lwres/lwres.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.