Module Name:	basesrc
Committed By:	mellon
Date:		Mon Sep  4 23:19:43 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp: README RELNOTES
	basesrc/usr.sbin/dhcp/client: clparse.c dhclient.c
	basesrc/usr.sbin/dhcp/common: bpf.c comapi.c discover.c options.c
	    tables.c
	basesrc/usr.sbin/dhcp/includes: dhcpd.h failover.h site.h version.h
	basesrc/usr.sbin/dhcp/omapip: dispatch.c
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: bootp.c confpars.c dhcp.c dhcpd.c
	    dhcpd.conf.5 omapi.c

Log Message:
Merge 3.0b2pl2 with head.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/README \
    basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.31 -r1.32 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/common/bpf.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/common/comapi.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/common/discover.c \
    basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/includes/failover.h
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/includes/site.h \
    basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/dhcp/server/bootp.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/server/confpars.c
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.21 -r1.22 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/server/omapi.c

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