CVS commit: src/dist/dhcp

[Matthias Drochner <drochner%netbsd.org@localhost>]

Module Name:    src
Committed By:   drochner
Date:           Thu Aug 11 17:03:28 UTC 2005

Update of /cvsroot/src/dist/dhcp
In directory ivanova.netbsd.org:/tmp/cvs-serv10555

Log Message:
arrgh - what I've just imported as "ISC_V3-0-3" was already patched.
Import the unmodified again for sanity.

Status:

Vendor Tag:     ISC
Release Tags:   ISC_V3-0-3_CORRECT
                
U src/dist/dhcp/Makefile.conf
U src/dist/dhcp/LICENSE
U src/dist/dhcp/Makefile
U src/dist/dhcp/Makefile.dist
U src/dist/dhcp/README
U src/dist/dhcp/RELNOTES
U src/dist/dhcp/configure
U src/dist/dhcp/site.conf
C src/dist/dhcp/client/dhclient-script.8
U src/dist/dhcp/client/Makefile.dist
C src/dist/dhcp/client/clparse.c
U src/dist/dhcp/client/dhclient.conf
C src/dist/dhcp/client/dhclient.8
C src/dist/dhcp/client/dhclient.c
C src/dist/dhcp/client/dhclient.leases.5
C src/dist/dhcp/client/dhclient.conf.5
U src/dist/dhcp/client/scripts/freebsd
U src/dist/dhcp/client/scripts/bsdos
U src/dist/dhcp/client/scripts/nextstep
U src/dist/dhcp/client/scripts/linux
U src/dist/dhcp/client/scripts/netbsd
U src/dist/dhcp/client/scripts/openbsd
U src/dist/dhcp/client/scripts/solaris
U src/dist/dhcp/common/Makefile.dist
C src/dist/dhcp/common/alloc.c
C src/dist/dhcp/common/bpf.c
C src/dist/dhcp/common/comapi.c
C src/dist/dhcp/common/conflex.c
U src/dist/dhcp/common/ctrace.c
C src/dist/dhcp/common/dhcp-eval.5
U src/dist/dhcp/common/dhcp-options.5
C src/dist/dhcp/common/discover.c
U src/dist/dhcp/common/dispatch.c
U src/dist/dhcp/common/dlpi.c
C src/dist/dhcp/common/dns.c
U src/dist/dhcp/common/ethernet.c
C src/dist/dhcp/common/execute.c
C src/dist/dhcp/common/fddi.c
C src/dist/dhcp/common/icmp.c
C src/dist/dhcp/common/inet.c
U src/dist/dhcp/common/lpf.c
C src/dist/dhcp/common/memory.c
U src/dist/dhcp/common/nit.c
C src/dist/dhcp/common/options.c
C src/dist/dhcp/common/packet.c
C src/dist/dhcp/common/parse.c
C src/dist/dhcp/common/print.c
C src/dist/dhcp/common/raw.c
U src/dist/dhcp/common/tr.c
C src/dist/dhcp/common/resolv.c
C src/dist/dhcp/common/socket.c
C src/dist/dhcp/common/tables.c
C src/dist/dhcp/common/tree.c
U src/dist/dhcp/common/upf.c
U src/dist/dhcp/contrib/3.0b1-lease-convert
U src/dist/dhcp/contrib/dhcp.spec
U src/dist/dhcp/contrib/sethostname.sh
U src/dist/dhcp/contrib/solaris.init
U src/dist/dhcp/contrib/ms2isc/Registry.pm
U src/dist/dhcp/contrib/ms2isc/ms2isc.pl
U src/dist/dhcp/contrib/ms2isc/readme.txt
U src/dist/dhcp/dhcpctl/Makefile.dist
C src/dist/dhcp/dhcpctl/callback.c
U src/dist/dhcp/dhcpctl/cltest.c
C src/dist/dhcp/dhcpctl/dhcpctl.3
C src/dist/dhcp/dhcpctl/dhcpctl.c
U src/dist/dhcp/dhcpctl/dhcpctl.h
U src/dist/dhcp/dhcpctl/omshell.1
C src/dist/dhcp/dhcpctl/omshell.c
C src/dist/dhcp/dhcpctl/remote.c
U src/dist/dhcp/doc/IANA-arp-parameters
U src/dist/dhcp/doc/api+protocol
U src/dist/dhcp/doc/rfc1542.txt
U src/dist/dhcp/doc/rfc2131.txt
U src/dist/dhcp/doc/draft-ietf-dhc-authentication-14.txt
U src/dist/dhcp/doc/draft-ietf-dhc-dhcp-dns-12.txt
U src/dist/dhcp/doc/draft-ietf-dhc-failover-07.txt
U src/dist/dhcp/doc/rfc2132.txt
U src/dist/dhcp/doc/rfc2485.txt
U src/dist/dhcp/doc/rfc2489.txt
U src/dist/dhcp/doc/rfc951.txt
U src/dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8
U src/dist/dhcp/doc/ja_JP.eucJP/dhclient.8
U src/dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5
U src/dist/dhcp/doc/ja_JP.eucJP/dhclient.leases.5
U src/dist/dhcp/doc/ja_JP.eucJP/dhcp-eval.5
U src/dist/dhcp/doc/ja_JP.eucJP/dhcp-options.5
U src/dist/dhcp/dst/Makefile.dist
U src/dist/dhcp/dst/base64.c
C src/dist/dhcp/dst/dst_api.c
U src/dist/dhcp/dst/dst_internal.h
U src/dist/dhcp/dst/dst_support.c
U src/dist/dhcp/dst/hmac_link.c
U src/dist/dhcp/dst/md5.h
U src/dist/dhcp/dst/md5_dgst.c
U src/dist/dhcp/dst/md5_locl.h
C src/dist/dhcp/dst/prandom.c
U src/dist/dhcp/includes/dhctoken.h
U src/dist/dhcp/includes/cdefs.h
U src/dist/dhcp/includes/ctrace.h
C src/dist/dhcp/includes/dhcp.h
C src/dist/dhcp/includes/dhcpd.h
U src/dist/dhcp/includes/failover.h
U src/dist/dhcp/includes/inet.h
U src/dist/dhcp/includes/osdep.h
C src/dist/dhcp/includes/site.h
U src/dist/dhcp/includes/statement.h
U src/dist/dhcp/includes/tree.h
U src/dist/dhcp/includes/version.h
C src/dist/dhcp/includes/arpa/nameser_compat.h
C src/dist/dhcp/includes/arpa/nameser.h
U src/dist/dhcp/includes/cf/alphaosf.h
U src/dist/dhcp/includes/cf/aix.h
U src/dist/dhcp/includes/cf/bsdos.h
U src/dist/dhcp/includes/cf/cygwin32.h
U src/dist/dhcp/includes/cf/freebsd.h
U src/dist/dhcp/includes/cf/hpux.h
U src/dist/dhcp/includes/cf/irix.h
U src/dist/dhcp/includes/cf/linux.h
C src/dist/dhcp/includes/cf/netbsd.h
U src/dist/dhcp/includes/cf/nextstep.h
U src/dist/dhcp/includes/cf/openbsd.h
U src/dist/dhcp/includes/cf/qnx.h
U src/dist/dhcp/includes/cf/rhapsody.h
U src/dist/dhcp/includes/cf/sample.h
U src/dist/dhcp/includes/cf/sco.h
U src/dist/dhcp/includes/cf/sunos4.h
U src/dist/dhcp/includes/cf/sunos5-5.h
U src/dist/dhcp/includes/cf/ultrix.h
U src/dist/dhcp/includes/minires/minires.h
U src/dist/dhcp/includes/minires/res_update.h
C src/dist/dhcp/includes/minires/resolv.h
U src/dist/dhcp/includes/isc-dhcp/boolean.h
U src/dist/dhcp/includes/isc-dhcp/dst.h
U src/dist/dhcp/includes/isc-dhcp/int.h
U src/dist/dhcp/includes/isc-dhcp/lang.h
U src/dist/dhcp/includes/isc-dhcp/list.h
U src/dist/dhcp/includes/isc-dhcp/result.h
U src/dist/dhcp/includes/isc-dhcp/types.h
C src/dist/dhcp/includes/netinet/if_ether.h
C src/dist/dhcp/includes/netinet/ip.h
C src/dist/dhcp/includes/netinet/ip_icmp.h
C src/dist/dhcp/includes/netinet/udp.h
U src/dist/dhcp/includes/omapip/convert.h
U src/dist/dhcp/includes/omapip/alloc.h
U src/dist/dhcp/includes/omapip/buffer.h
U src/dist/dhcp/includes/omapip/omapip_p.h
U src/dist/dhcp/includes/omapip/hash.h
C src/dist/dhcp/includes/omapip/omapip.h
U src/dist/dhcp/includes/omapip/trace.h
C src/dist/dhcp/minires/res_findzonecut.c
U src/dist/dhcp/minires/Makefile.dist
C src/dist/dhcp/minires/ns_date.c
C src/dist/dhcp/minires/ns_name.c
C src/dist/dhcp/minires/ns_parse.c
U src/dist/dhcp/minires/ns_samedomain.c
U src/dist/dhcp/minires/ns_sign.c
U src/dist/dhcp/minires/ns_verify.c
C src/dist/dhcp/minires/res_comp.c
C src/dist/dhcp/minires/res_mkquery.c
C src/dist/dhcp/minires/res_init.c
C src/dist/dhcp/minires/res_mkupdate.c
C src/dist/dhcp/minires/res_query.c
C src/dist/dhcp/minires/res_send.c
U src/dist/dhcp/minires/res_sendsigned.c
C src/dist/dhcp/minires/res_update.c
U src/dist/dhcp/omapip/Makefile.dist
C src/dist/dhcp/omapip/alloc.c
C src/dist/dhcp/omapip/array.c
U src/dist/dhcp/omapip/auth.c
C src/dist/dhcp/omapip/buffer.c
C src/dist/dhcp/omapip/connection.c
C src/dist/dhcp/omapip/convert.c
C src/dist/dhcp/omapip/dispatch.c
C src/dist/dhcp/omapip/errwarn.c
C src/dist/dhcp/omapip/generic.c
C src/dist/dhcp/omapip/handle.c
C src/dist/dhcp/omapip/hash.c
C src/dist/dhcp/omapip/inet_addr.c
U src/dist/dhcp/omapip/iscprint.c
C src/dist/dhcp/omapip/listener.c
C src/dist/dhcp/omapip/message.c
C src/dist/dhcp/omapip/mrtrace.c
U src/dist/dhcp/omapip/omapi.3
C src/dist/dhcp/omapip/protocol.c
C src/dist/dhcp/omapip/result.c
C src/dist/dhcp/omapip/support.c
U src/dist/dhcp/omapip/test.c
U src/dist/dhcp/omapip/toisc.c
C src/dist/dhcp/omapip/trace.c
U src/dist/dhcp/relay/Makefile.dist
C src/dist/dhcp/relay/dhcrelay.8
C src/dist/dhcp/relay/dhcrelay.c
U src/dist/dhcp/server/Makefile.dist
C src/dist/dhcp/server/bootp.c
U src/dist/dhcp/server/class.c
C src/dist/dhcp/server/confpars.c
C src/dist/dhcp/server/db.c
C src/dist/dhcp/server/ddns.c
C src/dist/dhcp/server/dhcp.c
C src/dist/dhcp/server/dhcpd.8
C src/dist/dhcp/server/dhcpd.c
C src/dist/dhcp/server/dhcpd.conf
C src/dist/dhcp/server/dhcpd.conf.5
C src/dist/dhcp/server/dhcpd.leases.5
C src/dist/dhcp/server/failover.c
C src/dist/dhcp/server/mdb.c
C src/dist/dhcp/server/omapi.c
U src/dist/dhcp/server/salloc.c
U src/dist/dhcp/server/stables.c
U src/dist/dhcp/tests/failover/dhcp-1.cf
U src/dist/dhcp/tests/failover/dhcp-2.cf
U src/dist/dhcp/tests/failover/new-failover

90 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jISC:yesterday -jISC src/dist/dhcp