CVS commit: src/external/bsd/bind/dist

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

Module Name:    src
Committed By:   christos
Date:           Thu Mar 10 04:01:34 UTC 2016

Modified Files:
        src/external/bsd/bind/dist: CHANGES README srcid version
        src/external/bsd/bind/dist/bin/dig: dighost.c
        src/external/bsd/bind/dist/bin/named: bind9.xsl.h client.c control.c
            controlconf.c query.c
        src/external/bsd/bind/dist/bin/rndc: rndc.c
        src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
            Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
            Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
            man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
            man.dnssec-dsfromkey.html man.dnssec-importkey.html
            man.dnssec-keyfromlabel.html man.dnssec-keygen.html
            man.dnssec-revoke.html man.dnssec-settime.html
            man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
            man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
            man.named-checkzone.html man.named-journalprint.html
            man.named-rrchecker.html man.named.html man.nsec3hash.html
            man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
            man.rndc.html
        src/external/bsd/bind/dist/lib/dns: api message.c resolver.c
        src/external/bsd/bind/dist/lib/isccc: cc.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/bin/dig/dighost.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/bin/named/bind9.xsl.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/dist/bin/named/client.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/bin/named/control.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/bin/named/controlconf.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/dist/bin/named/query.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/bin/rndc/rndc.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
    src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
    src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
    src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
    src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
    src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
    src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
    src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
    src/external/bsd/bind/dist/doc/arm/man.delv.html \
    src/external/bsd/bind/dist/doc/arm/man.dig.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
    src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
    src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
    src/external/bsd/bind/dist/doc/arm/man.host.html \
    src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
    src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
    src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
    src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
    src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
    src/external/bsd/bind/dist/doc/arm/man.named.html \
    src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
    src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
    src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
    src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
    src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/isccc/cc.c

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