Module Name:	basesrc
Committed By:	mellon
Date:		Sat Jun 24 06:38:49 UTC 2000

Update of /cvsroot/basesrc/usr.sbin/dhcp
In directory nb00:/var/tmp/cvs-serv4069

Log Message:
3.0b2 as of June 23 - fixes two important glitches.


Vendor Tag:	ISC
Release Tags:	ISC_20000623
		
C basesrc/usr.sbin/dhcp/.cvsignore
U basesrc/usr.sbin/dhcp/ANONCVS
U basesrc/usr.sbin/dhcp/CHANGES
U basesrc/usr.sbin/dhcp/COPYRIGHT
U basesrc/usr.sbin/dhcp/DOCUMENTATION
U basesrc/usr.sbin/dhcp/ISC-LICENSE
C basesrc/usr.sbin/dhcp/Makefile
C basesrc/usr.sbin/dhcp/Makefile.conf
C basesrc/usr.sbin/dhcp/Makefile.dist
U basesrc/usr.sbin/dhcp/README
U basesrc/usr.sbin/dhcp/RELNOTES
C basesrc/usr.sbin/dhcp/configure
U basesrc/usr.sbin/dhcp/site.conf
U basesrc/usr.sbin/dhcp/doc/IANA-arp-parameters
U basesrc/usr.sbin/dhcp/doc/api+protocol
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-authentication-03.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-09.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-dns-02.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-new-options-00.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-options-1533update-06.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-options-opt127-02.txt
U basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-renumbering-00.txt
U basesrc/usr.sbin/dhcp/doc/rfc2131.txt
U basesrc/usr.sbin/dhcp/doc/rfc2132.txt
U basesrc/usr.sbin/dhcp/doc/rfc951.txt
U basesrc/usr.sbin/dhcp/client/.cvsignore
C basesrc/usr.sbin/dhcp/client/Makefile.dist
C basesrc/usr.sbin/dhcp/client/clparse.c
U basesrc/usr.sbin/dhcp/client/dhclient-script.8
U basesrc/usr.sbin/dhcp/client/dhclient-script.cat8
U basesrc/usr.sbin/dhcp/client/dhclient.8
C basesrc/usr.sbin/dhcp/client/dhclient.c
U basesrc/usr.sbin/dhcp/client/dhclient.cat8
U basesrc/usr.sbin/dhcp/client/dhclient.conf
U basesrc/usr.sbin/dhcp/client/dhclient.conf.5
U basesrc/usr.sbin/dhcp/client/dhclient.conf.cat5
U basesrc/usr.sbin/dhcp/client/dhclient.leases.5
U basesrc/usr.sbin/dhcp/client/dhclient.leases.cat5
U basesrc/usr.sbin/dhcp/client/scripts/bsdos
U basesrc/usr.sbin/dhcp/client/scripts/freebsd
U basesrc/usr.sbin/dhcp/client/scripts/linux
U basesrc/usr.sbin/dhcp/client/scripts/netbsd
U basesrc/usr.sbin/dhcp/client/scripts/nextstep
U basesrc/usr.sbin/dhcp/client/scripts/openbsd
U basesrc/usr.sbin/dhcp/client/scripts/solaris
U basesrc/usr.sbin/dhcp/common/.cvsignore
C basesrc/usr.sbin/dhcp/common/Makefile.dist
U basesrc/usr.sbin/dhcp/common/alloc.c
U basesrc/usr.sbin/dhcp/common/auth.c
U basesrc/usr.sbin/dhcp/common/bpf.c
U basesrc/usr.sbin/dhcp/common/comapi.c
U basesrc/usr.sbin/dhcp/common/conflex.c
U basesrc/usr.sbin/dhcp/common/convert.c
U basesrc/usr.sbin/dhcp/common/dhcp-contrib.5
U basesrc/usr.sbin/dhcp/common/dhcp-contrib.cat5
U basesrc/usr.sbin/dhcp/common/dhcp-eval.5
U basesrc/usr.sbin/dhcp/common/dhcp-eval.cat5
U basesrc/usr.sbin/dhcp/common/dhcp-options.5
U basesrc/usr.sbin/dhcp/common/dhcp-options.cat5
U basesrc/usr.sbin/dhcp/common/discover.c
U basesrc/usr.sbin/dhcp/common/dispatch.c
U basesrc/usr.sbin/dhcp/common/dlpi.c
U basesrc/usr.sbin/dhcp/common/dns.c
U basesrc/usr.sbin/dhcp/common/ethernet.c
U basesrc/usr.sbin/dhcp/common/execute.c
U basesrc/usr.sbin/dhcp/common/fddi.c
C basesrc/usr.sbin/dhcp/common/hash.c
U basesrc/usr.sbin/dhcp/common/icmp.c
U basesrc/usr.sbin/dhcp/common/inet.c
U basesrc/usr.sbin/dhcp/common/inet_addr.c
U basesrc/usr.sbin/dhcp/common/lpf.c
U basesrc/usr.sbin/dhcp/common/memory.c
U basesrc/usr.sbin/dhcp/common/nit.c
C basesrc/usr.sbin/dhcp/common/options.c
U basesrc/usr.sbin/dhcp/common/packet.c
U basesrc/usr.sbin/dhcp/common/parse.c
U basesrc/usr.sbin/dhcp/common/print.c
U basesrc/usr.sbin/dhcp/common/raw.c
U basesrc/usr.sbin/dhcp/common/resolv.c
U basesrc/usr.sbin/dhcp/common/socket.c
U basesrc/usr.sbin/dhcp/common/tables.c
U basesrc/usr.sbin/dhcp/common/tr.c
U basesrc/usr.sbin/dhcp/common/tree.c
U basesrc/usr.sbin/dhcp/common/upf.c
U basesrc/usr.sbin/dhcp/contrib/dhcp.spec
U basesrc/usr.sbin/dhcp/contrib/sethostname.sh
U basesrc/usr.sbin/dhcp/contrib/solaris.init
U basesrc/usr.sbin/dhcp/dhcpctl/.cvsignore
U basesrc/usr.sbin/dhcp/dhcpctl/Makefile.dist
U basesrc/usr.sbin/dhcp/dhcpctl/callback.c
U basesrc/usr.sbin/dhcp/dhcpctl/cltest.c
U basesrc/usr.sbin/dhcp/dhcpctl/dhcpctl.3
U basesrc/usr.sbin/dhcp/dhcpctl/dhcpctl.c
U basesrc/usr.sbin/dhcp/dhcpctl/dhcpctl.h
U basesrc/usr.sbin/dhcp/dhcpctl/remote.c
U basesrc/usr.sbin/dhcp/dhcpctl/test.c
U basesrc/usr.sbin/dhcp/includes/auth.h
U basesrc/usr.sbin/dhcp/includes/cdefs.h
U basesrc/usr.sbin/dhcp/includes/dhcp.h
C basesrc/usr.sbin/dhcp/includes/dhcpd.h
U basesrc/usr.sbin/dhcp/includes/dhctoken.h
U basesrc/usr.sbin/dhcp/includes/failover.h
U basesrc/usr.sbin/dhcp/includes/hash.h
U basesrc/usr.sbin/dhcp/includes/inet.h
U basesrc/usr.sbin/dhcp/includes/osdep.h
C basesrc/usr.sbin/dhcp/includes/site.h
U basesrc/usr.sbin/dhcp/includes/statement.h
U basesrc/usr.sbin/dhcp/includes/tree.h
U basesrc/usr.sbin/dhcp/includes/version.h
U basesrc/usr.sbin/dhcp/includes/cf/aix.h
U basesrc/usr.sbin/dhcp/includes/cf/alphaosf.h
U basesrc/usr.sbin/dhcp/includes/cf/bsdos.h
U basesrc/usr.sbin/dhcp/includes/cf/cygwin32.h
U basesrc/usr.sbin/dhcp/includes/cf/freebsd.h
U basesrc/usr.sbin/dhcp/includes/cf/hpux.h
U basesrc/usr.sbin/dhcp/includes/cf/irix.h
U basesrc/usr.sbin/dhcp/includes/cf/linux.h
U basesrc/usr.sbin/dhcp/includes/cf/netbsd.h
U basesrc/usr.sbin/dhcp/includes/cf/nextstep.h
U basesrc/usr.sbin/dhcp/includes/cf/openbsd.h
U basesrc/usr.sbin/dhcp/includes/cf/qnx.h
U basesrc/usr.sbin/dhcp/includes/cf/rhapsody.h
U basesrc/usr.sbin/dhcp/includes/cf/sample.h
U basesrc/usr.sbin/dhcp/includes/cf/sco.h
U basesrc/usr.sbin/dhcp/includes/cf/sunos4.h
U basesrc/usr.sbin/dhcp/includes/cf/sunos5-5.h
U basesrc/usr.sbin/dhcp/includes/cf/ultrix.h
U basesrc/usr.sbin/dhcp/includes/arpa/nameser.h
U basesrc/usr.sbin/dhcp/includes/arpa/nameser_compat.h
U basesrc/usr.sbin/dhcp/includes/isc/boolean.h
U basesrc/usr.sbin/dhcp/includes/isc/dst.h
U basesrc/usr.sbin/dhcp/includes/isc/int.h
U basesrc/usr.sbin/dhcp/includes/isc/lang.h
U basesrc/usr.sbin/dhcp/includes/isc/list.h
U basesrc/usr.sbin/dhcp/includes/isc/result.h
U basesrc/usr.sbin/dhcp/includes/isc/types.h
U basesrc/usr.sbin/dhcp/includes/minires/minires.h
U basesrc/usr.sbin/dhcp/includes/minires/res_update.h
U basesrc/usr.sbin/dhcp/includes/minires/resolv.h
U basesrc/usr.sbin/dhcp/includes/netinet/if_ether.h
U basesrc/usr.sbin/dhcp/includes/netinet/ip.h
U basesrc/usr.sbin/dhcp/includes/netinet/ip_icmp.h
U basesrc/usr.sbin/dhcp/includes/netinet/udp.h
U basesrc/usr.sbin/dhcp/includes/omapip/alloc.h
U basesrc/usr.sbin/dhcp/includes/omapip/buffer.h
U basesrc/usr.sbin/dhcp/includes/omapip/omapip.h
U basesrc/usr.sbin/dhcp/includes/omapip/omapip_p.h
U basesrc/usr.sbin/dhcp/minires/.cvsignore
U basesrc/usr.sbin/dhcp/minires/Makefile.dist
U basesrc/usr.sbin/dhcp/minires/base64.c
U basesrc/usr.sbin/dhcp/minires/dst_api.c
U basesrc/usr.sbin/dhcp/minires/dst_internal.h
U basesrc/usr.sbin/dhcp/minires/hmac_link.c
U basesrc/usr.sbin/dhcp/minires/md5.h
U basesrc/usr.sbin/dhcp/minires/md5_dgst.c
U basesrc/usr.sbin/dhcp/minires/md5_locl.h
U basesrc/usr.sbin/dhcp/minires/ns_date.c
U basesrc/usr.sbin/dhcp/minires/ns_name.c
U basesrc/usr.sbin/dhcp/minires/ns_parse.c
U basesrc/usr.sbin/dhcp/minires/ns_samedomain.c
U basesrc/usr.sbin/dhcp/minires/ns_sign.c
U basesrc/usr.sbin/dhcp/minires/ns_verify.c
U basesrc/usr.sbin/dhcp/minires/prandom.c
U basesrc/usr.sbin/dhcp/minires/res_comp.c
U basesrc/usr.sbin/dhcp/minires/res_findzonecut.c
U basesrc/usr.sbin/dhcp/minires/res_init.c
U basesrc/usr.sbin/dhcp/minires/res_mkquery.c
U basesrc/usr.sbin/dhcp/minires/res_mkupdate.c
U basesrc/usr.sbin/dhcp/minires/res_query.c
U basesrc/usr.sbin/dhcp/minires/res_send.c
U basesrc/usr.sbin/dhcp/minires/res_sendsigned.c
U basesrc/usr.sbin/dhcp/minires/res_update.c
U basesrc/usr.sbin/dhcp/minires/support.c
U basesrc/usr.sbin/dhcp/omapip/.cvsignore
C basesrc/usr.sbin/dhcp/omapip/Makefile.dist
U basesrc/usr.sbin/dhcp/omapip/alloc.c
U basesrc/usr.sbin/dhcp/omapip/buffer.c
U basesrc/usr.sbin/dhcp/omapip/connection.c
U basesrc/usr.sbin/dhcp/omapip/dispatch.c
U basesrc/usr.sbin/dhcp/omapip/errwarn.c
U basesrc/usr.sbin/dhcp/omapip/generic.c
U basesrc/usr.sbin/dhcp/omapip/handle.c
U basesrc/usr.sbin/dhcp/omapip/listener.c
U basesrc/usr.sbin/dhcp/omapip/message.c
U basesrc/usr.sbin/dhcp/omapip/omapi.3
U basesrc/usr.sbin/dhcp/omapip/protocol.c
U basesrc/usr.sbin/dhcp/omapip/result.c
U basesrc/usr.sbin/dhcp/omapip/support.c
U basesrc/usr.sbin/dhcp/omapip/test.c
U basesrc/usr.sbin/dhcp/relay/.cvsignore
C basesrc/usr.sbin/dhcp/relay/Makefile.dist
U basesrc/usr.sbin/dhcp/relay/dhcrelay.8
U basesrc/usr.sbin/dhcp/relay/dhcrelay.c
U basesrc/usr.sbin/dhcp/relay/dhcrelay.cat8
U basesrc/usr.sbin/dhcp/server/.cvsignore
C basesrc/usr.sbin/dhcp/server/Makefile.dist
U basesrc/usr.sbin/dhcp/server/bootp.c
U basesrc/usr.sbin/dhcp/server/class.c
C basesrc/usr.sbin/dhcp/server/confpars.c
U basesrc/usr.sbin/dhcp/server/db.c
C basesrc/usr.sbin/dhcp/server/dhcp.c
U basesrc/usr.sbin/dhcp/server/dhcpd.8
C basesrc/usr.sbin/dhcp/server/dhcpd.c
U basesrc/usr.sbin/dhcp/server/dhcpd.cat8
U basesrc/usr.sbin/dhcp/server/dhcpd.conf
U basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
U basesrc/usr.sbin/dhcp/server/dhcpd.conf.cat5
U basesrc/usr.sbin/dhcp/server/dhcpd.leases.5
U basesrc/usr.sbin/dhcp/server/dhcpd.leases.cat5
U basesrc/usr.sbin/dhcp/server/failover.c
U basesrc/usr.sbin/dhcp/server/mdb.c
C basesrc/usr.sbin/dhcp/server/omapi.c
U basesrc/usr.sbin/dhcp/server/salloc.c
U basesrc/usr.sbin/dhcp/server/stables.c

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

	cvs checkout -jISC:yesterday -jISC basesrc/usr.sbin/dhcp