Date: Sun, 5 Aug 2001 09:02:30 -0700 (PDT) From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/bind CHANGES INSTALL Makefile README Version src/contrib/bind/bin/dig dig.c src/contrib/bind/bin/dnskeygen dnskeygen.c src/contrib/bind/bin/host host.c src/contrib/bind/bin/named db_defs.h db_dump.c db_ixfr.c ... Message-ID: <200108051602.f75G2UX32821@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
asmodai 2001/08/05 09:02:30 PDT
Modified files: (Branch: RELENG_4)
contrib/bind CHANGES INSTALL Makefile README Version
contrib/bind/bin/dig dig.c
contrib/bind/bin/dnskeygen dnskeygen.c
contrib/bind/bin/host host.c
contrib/bind/bin/named db_defs.h db_dump.c db_ixfr.c db_load.c
db_update.c named.h ns_config.c
ns_defs.h ns_func.h ns_glue.c ns_init.c
ns_ixfr.c ns_main.c ns_maint.c
ns_notify.c ns_parser.y ns_req.c
ns_resp.c ns_update.c ns_xfr.c
contrib/bind/bin/named-xfer named-xfer.c
contrib/bind/bin/ndc ndc.c
contrib/bind/bin/nslookup Makefile getinfo.c
contrib/bind/doc/html controls.html master.html options.html
contrib/bind/doc/man named.8
contrib/bind/include resolv.h
contrib/bind/lib/dst bsafe_link.c cylink_link.c dst_api.c
eay_dss_link.c prandom.c rsaref_link.c
support.c
contrib/bind/lib/inet nsap_addr.c
contrib/bind/lib/irs gethostent.c
contrib/bind/lib/isc ev_timers.c memcluster.c
contrib/bind/lib/nameser ns_print.c
contrib/bind/lib/resolv res_debug.c res_init.c res_send.c
res_update.c
contrib/bind/port/freebsd/include port_after.h port_before.h
prand_conf.h
contrib/bind/port/prand_conf prand_conf.c
Log:
Fix conflicts after MFC of BIND 8.2.4.
Revision Changes Path
1.1.1.7.2.4 +166 -0 src/contrib/bind/CHANGES
1.1.1.7.2.4 +16 -1 src/contrib/bind/INSTALL
1.1.1.6.2.2 +51 -4 src/contrib/bind/Makefile
1.1.1.7.2.3 +15 -0 src/contrib/bind/README
1.1.1.3.2.4 +1 -1 src/contrib/bind/Version
1.1.1.2.2.4 +3 -2 src/contrib/bind/bin/dig/dig.c
1.1.1.1.4.2 +5 -2 src/contrib/bind/bin/dnskeygen/dnskeygen.c
1.1.1.2.2.4 +12 -7 src/contrib/bind/bin/host/host.c
1.1.1.2.2.3 +2 -2 src/contrib/bind/bin/named/db_defs.h
1.1.1.2.2.3 +7 -5 src/contrib/bind/bin/named/db_dump.c
1.1.1.1.4.3 +16 -4 src/contrib/bind/bin/named/db_ixfr.c
1.1.1.2.2.4 +11 -9 src/contrib/bind/bin/named/db_load.c
1.1.1.2.2.3 +4 -4 src/contrib/bind/bin/named/db_update.c
1.1.1.2.2.2 +2 -1 src/contrib/bind/bin/named/named.h
1.1.1.3.2.3 +63 -20 src/contrib/bind/bin/named/ns_config.c
1.1.1.3.2.3 +5 -3 src/contrib/bind/bin/named/ns_defs.h
1.1.1.2.2.3 +2 -1 src/contrib/bind/bin/named/ns_func.h
1.1.1.2.2.4 +12 -1 src/contrib/bind/bin/named/ns_glue.c
1.1.1.2.2.3 +34 -29 src/contrib/bind/bin/named/ns_init.c
1.1.1.1.4.3 +15 -9 src/contrib/bind/bin/named/ns_ixfr.c
1.1.1.3.2.4 +51 -28 src/contrib/bind/bin/named/ns_main.c
1.1.1.3.2.4 +13 -10 src/contrib/bind/bin/named/ns_maint.c
1.1.1.1.4.3 +13 -3 src/contrib/bind/bin/named/ns_notify.c
1.1.1.2.2.3 +17 -4 src/contrib/bind/bin/named/ns_parser.y
1.1.1.2.2.6 +58 -23 src/contrib/bind/bin/named/ns_req.c
1.1.1.2.2.4 +28 -22 src/contrib/bind/bin/named/ns_resp.c
1.1.1.3.2.5 +24 -33 src/contrib/bind/bin/named/ns_update.c
1.1.1.2.2.3 +8 -3 src/contrib/bind/bin/named/ns_xfr.c
1.3.2.4 +10 -6 src/contrib/bind/bin/named-xfer/named-xfer.c
1.1.1.1.4.3 +5 -2 src/contrib/bind/bin/ndc/ndc.c
1.1.1.2.2.3 +2 -2 src/contrib/bind/bin/nslookup/Makefile
1.3.2.3 +3 -3 src/contrib/bind/bin/nslookup/getinfo.c
1.1.1.1.4.1 +6 -1 src/contrib/bind/doc/html/controls.html
1.1.1.1.4.2 +1 -1 src/contrib/bind/doc/html/master.html
1.1.1.3.2.3 +4 -5 src/contrib/bind/doc/html/options.html
1.1.1.3.2.2 +6 -6 src/contrib/bind/doc/man/named.8
1.1.1.6.2.3 +5 -1 src/contrib/bind/include/resolv.h
1.1.1.1.4.2 +2 -9 src/contrib/bind/lib/dst/bsafe_link.c
1.1.1.1.4.2 +3 -11 src/contrib/bind/lib/dst/cylink_link.c
1.1.1.1.4.3 +32 -11 src/contrib/bind/lib/dst/dst_api.c
1.1.1.1.4.2 +3 -11 src/contrib/bind/lib/dst/eay_dss_link.c
1.1.1.1.4.3 +2 -2 src/contrib/bind/lib/dst/prandom.c
1.1.1.1.4.3 +3 -9 src/contrib/bind/lib/dst/rsaref_link.c
1.1.1.1.4.2 +7 -14 src/contrib/bind/lib/dst/support.c
1.1.1.2.2.1 +8 -2 src/contrib/bind/lib/inet/nsap_addr.c
1.1.1.2.2.2 +3 -2 src/contrib/bind/lib/irs/gethostent.c
1.1.1.2.2.2 +2 -1 src/contrib/bind/lib/isc/ev_timers.c
1.1.1.3.2.1 +13 -1 src/contrib/bind/lib/isc/memcluster.c
1.1.1.2.2.3 +2 -2 src/contrib/bind/lib/nameser/ns_print.c
1.1.1.2.2.3 +5 -1 src/contrib/bind/lib/resolv/res_debug.c
1.1.1.2.2.3 +6 -3 src/contrib/bind/lib/resolv/res_init.c
1.1.1.2.2.3 +5 -1 src/contrib/bind/lib/resolv/res_send.c
1.1.1.2.2.2 +3 -2 src/contrib/bind/lib/resolv/res_update.c
1.6.2.4 +2 -1 src/contrib/bind/port/freebsd/include/port_after.h
1.1.1.2.2.2 +0 -1 src/contrib/bind/port/freebsd/include/port_before.h
1.1.1.1.4.1 +5 -5 src/contrib/bind/port/freebsd/include/prand_conf.h
1.1.1.1.4.1 +7 -6 src/contrib/bind/port/prand_conf/prand_conf.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108051602.f75G2UX32821>