CVS commit: src/dist/bind

[Havard Eidnes <he%netbsd.org@localhost>]

Module Name:    src
Committed By:   he
Date:           Fri Aug 15 14:51:27 UTC 2008

Modified Files:
        src/dist/bind/bin/dig: dighost.c
        src/dist/bind/bin/named: statschannel.c
        src/dist/bind/bin/rndc: rndc.c
        src/dist/bind/lib/dns: message.c resolver.c
        src/dist/bind/lib/isc/unix: app.c

Log Message:
Resolve conflicts from import of bind 9.5.0-P2.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/dig/dighost.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/named/statschannel.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/rndc/rndc.c
cvs rdiff -r1.4 -r1.5 src/dist/bind/lib/dns/message.c
cvs rdiff -r1.6 -r1.7 src/dist/bind/lib/dns/resolver.c
cvs rdiff -r1.7 -r1.8 src/dist/bind/lib/isc/unix/app.c

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