Module Name:	basesrc
Committed By:	taca
Date:		Tue Oct 17 16:10:45 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp: README RELNOTES
	basesrc/usr.sbin/dhcp/client: clparse.c dhclient.c
	basesrc/usr.sbin/dhcp/client/scripts: bsdos freebsd
	basesrc/usr.sbin/dhcp/common: bpf.c comapi.c dhcp-options.5 discover.c
	    options.c packet.c parse.c print.c tables.c
	basesrc/usr.sbin/dhcp/includes: dhcp.h dhcpd.h version.h
	basesrc/usr.sbin/dhcp/minires: res_update.c
	basesrc/usr.sbin/dhcp/omapip: dispatch.c errwarn.c
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: bootp.c dhcp.c dhcpd.conf.5 omapi.c
Removed Files:
	basesrc/usr.sbin/dhcp: DOCUMENTATION ISC-LICENSE
	basesrc/usr.sbin/dhcp/common: inet_addr.c

Log Message:
Merge 3.0b2pl9 with head.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 basesrc/usr.sbin/dhcp/DOCUMENTATION \
    basesrc/usr.sbin/dhcp/ISC-LICENSE
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/README \
    basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.33 -r1.34 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/client/scripts/bsdos
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/client/scripts/freebsd
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/common/bpf.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/common/comapi.c
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/dhcp/common/dhcp-options.5 \
    basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/common/discover.c
cvs rdiff -r1.1.1.3 -r0 basesrc/usr.sbin/dhcp/common/inet_addr.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/common/packet.c \
    basesrc/usr.sbin/dhcp/common/parse.c basesrc/usr.sbin/dhcp/common/print.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/includes/dhcp.h
cvs rdiff -r1.16 -r1.17 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/minires/res_update.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/omapip/errwarn.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/dhcp/server/bootp.c \
    basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.16 -r1.17 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.5 -r1.6 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.