Module Name:	src
Committed By:	christos
Date:		Thu Dec 22 00:26:25 UTC 2005

Modified Files:
	src/dist/bind: README
	src/dist/bind/bin/dig: dig.c
	src/dist/bind/bin/named: main.c
	src/dist/bind/bin/nsupdate: nsupdate.c
	src/dist/bind/lib/dns: rbt.c validator.c
	src/dist/bind/lib/dns/rdata/in_1: wks_11.c
	src/dist/bind/lib/isc: assertions.c base64.c heap.c hex.c string.c
	src/dist/bind/lib/isc/unix: app.c os.c
	src/dist/bind/lib/lwres: getaddrinfo.c getnameinfo.c
Added Files:
	src/dist/bind/lib/dns/rdata/generic: dlv_65323.c dlv_65323.h
	    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
Removed Files:
	src/dist/bind: KNOWN_DEFECTS
	src/dist/bind/bin/dnssec: dnssec-makekeyset.8 dnssec-makekeyset.c
	    dnssec-makekeyset.docbook dnssec-makekeyset.html dnssec-signkey.8
	    dnssec-signkey.c dnssec-signkey.docbook dnssec-signkey.html
	src/dist/bind/bin/dnssec/win32: makekeyset.dsp makekeyset.dsw
	    makekeyset.mak signkey.dsp signkey.dsw signkey.mak
	src/dist/bind/doc/arm: isc.color.gif nominum-docbook-html.dsl.in
	    nominum-docbook-print.dsl.in validate.sh.in
	src/dist/bind/doc/draft: draft-ietf-dnsext-dhcid-rr-08.txt
	    draft-ietf-dnsext-dnssec-intro-11.txt
	    draft-ietf-dnsext-dnssec-protocol-07.txt
	    draft-ietf-dnsext-dnssec-records-09.txt
	    draft-ietf-dnsext-insensitive-04.txt
	    draft-ietf-dnsext-interop3597-01.txt draft-ietf-dnsext-mdns-33.txt
	    draft-ietf-dnsext-tkey-renewal-mode-04.txt
	    draft-ietf-dnsext-tsig-sha-00.txt
	    draft-ietf-dnsext-wcard-clarify-02.txt
	    draft-ietf-dnsop-bad-dns-res-02.txt
	    draft-ietf-dnsop-dnssec-operational-practices-01.txt
	    draft-ietf-dnsop-ipv6-dns-configuration-02.txt
	    draft-ietf-dnsop-ipv6-dns-issues-09.txt
	    draft-ietf-dnsop-key-rollover-requirements-01.txt
	    draft-ietf-dnsop-misbehavior-against-aaaa-00.txt
	    draft-ietf-dnsop-respsize-01.txt draft-ietf-dnsop-serverid-02.txt
	    draft-ietf-ipseckey-rr-09.txt
	src/dist/bind/lib/bind: libtool.m4 ltmain.sh
	src/dist/bind/lib/dns/sec: Makefile.in
	src/dist/bind/lib/dns/sec/dst: Makefile.in dst_api.c dst_internal.h
	    dst_lib.c dst_openssl.h dst_parse.c dst_parse.h dst_result.c
	    gssapi_link.c gssapictx.c hmac_link.c key.c openssl_link.c
	    openssldh_link.c openssldsa_link.c opensslrsa_link.c
	src/dist/bind/lib/dns/sec/dst/include: Makefile.in
	src/dist/bind/lib/dns/sec/dst/include/dst: Makefile.in dst.h gssapi.h
	    lib.h result.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/KNOWN_DEFECTS
cvs rdiff -r1.13 -r1.14 src/dist/bind/README
cvs rdiff -r1.11 -r1.12 src/dist/bind/bin/dig/dig.c
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/bin/dnssec/dnssec-makekeyset.8 \
    src/dist/bind/bin/dnssec/dnssec-makekeyset.html \
    src/dist/bind/bin/dnssec/dnssec-signkey.8 \
    src/dist/bind/bin/dnssec/dnssec-signkey.html
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/bin/dnssec/dnssec-makekeyset.c \
    src/dist/bind/bin/dnssec/dnssec-makekeyset.docbook \
    src/dist/bind/bin/dnssec/dnssec-signkey.c \
    src/dist/bind/bin/dnssec/dnssec-signkey.docbook
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/bin/dnssec/win32/makekeyset.dsp \
    src/dist/bind/bin/dnssec/win32/makekeyset.dsw \
    src/dist/bind/bin/dnssec/win32/signkey.dsp \
    src/dist/bind/bin/dnssec/win32/signkey.dsw
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/bin/dnssec/win32/makekeyset.mak \
    src/dist/bind/bin/dnssec/win32/signkey.mak
cvs rdiff -r1.4 -r1.5 src/dist/bind/bin/named/main.c
cvs rdiff -r1.10 -r1.11 src/dist/bind/bin/nsupdate/nsupdate.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/doc/arm/isc.color.gif \
    src/dist/bind/doc/arm/nominum-docbook-html.dsl.in \
    src/dist/bind/doc/arm/nominum-docbook-print.dsl.in
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/doc/arm/validate.sh.in
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-insensitive-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-interop3597-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-mdns-33.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-respsize-01.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-serverid-02.txt \
    src/dist/bind/doc/draft/draft-ietf-ipseckey-rr-09.txt
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/bind/libtool.m4
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/bind/ltmain.sh
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/dns/rbt.c \
    src/dist/bind/lib/dns/validator.c
cvs rdiff -r0 -r1.3 src/dist/bind/lib/dns/rdata/generic/dlv_65323.c \
    src/dist/bind/lib/dns/rdata/generic/dlv_65323.h \
    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 -r0 -r1.3 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.3 -r1.4 src/dist/bind/lib/dns/rdata/in_1/wks_11.c
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/dns/sec/Makefile.in
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/dns/sec/dst/Makefile.in \
    src/dist/bind/lib/dns/sec/dst/dst_internal.h \
    src/dist/bind/lib/dns/sec/dst/dst_lib.c \
    src/dist/bind/lib/dns/sec/dst/dst_parse.c \
    src/dist/bind/lib/dns/sec/dst/dst_parse.h \
    src/dist/bind/lib/dns/sec/dst/gssapi_link.c \
    src/dist/bind/lib/dns/sec/dst/gssapictx.c \
    src/dist/bind/lib/dns/sec/dst/hmac_link.c \
    src/dist/bind/lib/dns/sec/dst/key.c \
    src/dist/bind/lib/dns/sec/dst/openssl_link.c \
    src/dist/bind/lib/dns/sec/dst/openssldh_link.c \
    src/dist/bind/lib/dns/sec/dst/openssldsa_link.c \
    src/dist/bind/lib/dns/sec/dst/opensslrsa_link.c
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/lib/dns/sec/dst/dst_api.c \
    src/dist/bind/lib/dns/sec/dst/dst_result.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/dns/sec/dst/dst_openssl.h
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/dns/sec/dst/include/Makefile.in
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/dns/sec/dst/include/dst/Makefile.in \
    src/dist/bind/lib/dns/sec/dst/include/dst/gssapi.h \
    src/dist/bind/lib/dns/sec/dst/include/dst/lib.h
cvs rdiff -r1.1.1.3 -r0 src/dist/bind/lib/dns/sec/dst/include/dst/dst.h \
    src/dist/bind/lib/dns/sec/dst/include/dst/result.h
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/isc/assertions.c
cvs rdiff -r1.3 -r1.4 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/unix/app.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/isc/unix/os.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/lwres/getaddrinfo.c
cvs rdiff -r1.4 -r1.5 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.