Module Name:	basesrc
Committed By:	mellon
Date:		Fri Apr  6 17:08:56 UTC 2001

Modified Files:
	basesrc/usr.sbin/dhcp: README RELNOTES
	basesrc/usr.sbin/dhcp/client: clparse.c dhclient.8 dhclient.c
	basesrc/usr.sbin/dhcp/common: bpf.c discover.c
	basesrc/usr.sbin/dhcp/dhcpctl: omshell.c
	basesrc/usr.sbin/dhcp/includes: dhcpd.h version.h
	basesrc/usr.sbin/dhcp/omapip: mrtrace.c trace.c
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: confpars.c dhcpd.c omapi.c

Log Message:
Merge 3.0b2pl24


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/README \
    basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/dhcp/client/dhclient.8
cvs rdiff -r1.35 -r1.36 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/common/bpf.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/dhcp/common/discover.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/dhcpctl/omshell.c
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/omapip/mrtrace.c \
    basesrc/usr.sbin/dhcp/omapip/trace.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/server/confpars.c \
    basesrc/usr.sbin/dhcp/server/omapi.c
cvs rdiff -r1.24 -r1.25 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.