Module Name:	basesrc
Committed By:	mellon
Date:		Sat Jun 24 06:50:05 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp/client: clparse.c dhclient.c
	basesrc/usr.sbin/dhcp/common: hash.c options.c
	basesrc/usr.sbin/dhcp/includes: dhcpd.h site.h
	basesrc/usr.sbin/dhcp/server: confpars.c dhcp.c dhcpd.c omapi.c

Log Message:
Merge latest version, fix conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.26 -r1.27 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/common/hash.c \
    basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/includes/site.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/server/confpars.c \
    basesrc/usr.sbin/dhcp/server/omapi.c
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.17 -r1.18 basesrc/usr.sbin/dhcp/server/dhcpd.c

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