mellon
Mon Jun  2 19:50:00 PDT 1997
Update of /cvsroot/src/usr.sbin/dhcp
In directory netbsd1:/var/slash-tmp/cvs-serv2833

Log Message:
970602 snapshot

Status:

Vendor Tag:	ISC
Release Tags:	DHCP-970602
		
N src/usr.sbin/dhcp/CHANGES
C src/usr.sbin/dhcp/Makefile.conf
C src/usr.sbin/dhcp/README
U src/usr.sbin/dhcp/Makefile.dist
U src/usr.sbin/dhcp/RELNOTES
C src/usr.sbin/dhcp/TODO
U src/usr.sbin/dhcp/configure
U src/usr.sbin/dhcp/doc/IANA-arp-parameters
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-authentication-03.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-09.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-dns-02.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-new-options-00.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-options-1533update-06.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-options-opt127-02.txt
U src/usr.sbin/dhcp/doc/draft-ietf-dhc-renumbering-00.txt
U src/usr.sbin/dhcp/client/Makefile.dist
U src/usr.sbin/dhcp/client/dhclient.8
U src/usr.sbin/dhcp/client/clparse.c
U src/usr.sbin/dhcp/client/dhclient.c
I src/usr.sbin/dhcp/client/dhclient.cat8
U src/usr.sbin/dhcp/client/dhclient.conf
U src/usr.sbin/dhcp/client/dhclient.conf.5
I src/usr.sbin/dhcp/client/dhclient.conf.cat5
N src/usr.sbin/dhcp/client/scripts/freebsd
U src/usr.sbin/dhcp/client/scripts/netbsd
N src/usr.sbin/dhcp/client/scripts/linux
N src/usr.sbin/dhcp/client/scripts/solaris
C src/usr.sbin/dhcp/common/Makefile.dist
U src/usr.sbin/dhcp/common/inet.c
U src/usr.sbin/dhcp/common/alloc.c
U src/usr.sbin/dhcp/common/bpf.c
U src/usr.sbin/dhcp/common/conflex.c
U src/usr.sbin/dhcp/common/convert.c
U src/usr.sbin/dhcp/common/dispatch.c
U src/usr.sbin/dhcp/common/dns.c
U src/usr.sbin/dhcp/common/errwarn.c
U src/usr.sbin/dhcp/common/hash.c
U src/usr.sbin/dhcp/common/icmp.c
U src/usr.sbin/dhcp/common/inet_addr.c
U src/usr.sbin/dhcp/common/memory.c
U src/usr.sbin/dhcp/common/nit.c
U src/usr.sbin/dhcp/common/options.c
U src/usr.sbin/dhcp/common/packet.c
U src/usr.sbin/dhcp/common/parse.c
U src/usr.sbin/dhcp/common/print.c
U src/usr.sbin/dhcp/common/raw.c
N src/usr.sbin/dhcp/common/resolv.c
U src/usr.sbin/dhcp/common/socket.c
U src/usr.sbin/dhcp/common/tables.c
U src/usr.sbin/dhcp/common/tree.c
U src/usr.sbin/dhcp/common/upf.c
U src/usr.sbin/dhcp/includes/cdefs.h
U src/usr.sbin/dhcp/includes/dhcp.h
U src/usr.sbin/dhcp/includes/dhcpd.h
U src/usr.sbin/dhcp/includes/dhctoken.h
U src/usr.sbin/dhcp/includes/hash.h
U src/usr.sbin/dhcp/includes/inet.h
U src/usr.sbin/dhcp/includes/osdep.h
U src/usr.sbin/dhcp/includes/site.h
U src/usr.sbin/dhcp/includes/tree.h
U src/usr.sbin/dhcp/includes/cf/alphaosf.h
U src/usr.sbin/dhcp/includes/cf/bsdos.h
N src/usr.sbin/dhcp/includes/cf/cygwin32.h
U src/usr.sbin/dhcp/includes/cf/freebsd.h
U src/usr.sbin/dhcp/includes/cf/hpux.h
U src/usr.sbin/dhcp/includes/cf/linux.h
U src/usr.sbin/dhcp/includes/cf/netbsd.h
U src/usr.sbin/dhcp/includes/cf/qnx.h
U src/usr.sbin/dhcp/includes/cf/sample.h
U src/usr.sbin/dhcp/includes/cf/sco.h
U src/usr.sbin/dhcp/includes/cf/sunos4.h
U src/usr.sbin/dhcp/includes/cf/sunos5-5.h
U src/usr.sbin/dhcp/includes/cf/ultrix.h
U src/usr.sbin/dhcp/includes/netinet/if_ether.h
U src/usr.sbin/dhcp/includes/netinet/ip.h
U src/usr.sbin/dhcp/includes/netinet/ip_icmp.h
U src/usr.sbin/dhcp/includes/netinet/udp.h
U src/usr.sbin/dhcp/relay/Makefile.dist
U src/usr.sbin/dhcp/relay/dhcrelay.8
U src/usr.sbin/dhcp/relay/dhcrelay.c
I src/usr.sbin/dhcp/relay/dhcrelay.cat8
U src/usr.sbin/dhcp/server/Makefile.dist
U src/usr.sbin/dhcp/server/dhcpd.8
U src/usr.sbin/dhcp/server/bootp.c
U src/usr.sbin/dhcp/server/confpars.c
U src/usr.sbin/dhcp/server/db.c
U src/usr.sbin/dhcp/server/dhcp.c
I src/usr.sbin/dhcp/server/dhcpd.cat8
U src/usr.sbin/dhcp/server/dhcpd.c
U src/usr.sbin/dhcp/server/dhcpd.conf
U src/usr.sbin/dhcp/server/dhcpd.conf.5
I src/usr.sbin/dhcp/server/dhcpd.conf.cat5

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

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