Module Name:	basesrc
Committed By:	drochner
Date:		Mon Jun 18 19:02:01 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/client/scripts: bsdos freebsd netbsd
	basesrc/usr.sbin/dhcp/common: bpf.c comapi.c dhcp-options.5 discover.c
	    dns.c options.c packet.c parse.c print.c tables.c tr.c
	basesrc/usr.sbin/dhcp/dhcpctl: omshell.c
	basesrc/usr.sbin/dhcp/dst: dst_internal.h
	basesrc/usr.sbin/dhcp/includes: dhcp.h dhcpd.h failover.h site.h
	    version.h
	basesrc/usr.sbin/dhcp/minires: res_update.c
	basesrc/usr.sbin/dhcp/omapip: auth.c dispatch.c mrtrace.c protocol.c
	    support.c trace.c
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: bootp.c confpars.c ddns.c dhcp.c dhcpd.8
	    dhcpd.c dhcpd.conf.5 omapi.c salloc.c
Removed Files:
	basesrc/usr.sbin/dhcp/minires: toisc.c

Log Message:
merge 3.0rc8


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/dhcp/README \
    basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/dhcp/client/dhclient.8
cvs rdiff -r1.38 -r1.39 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/dhcp/client/scripts/bsdos
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/client/scripts/freebsd
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/dhcp/client/scripts/netbsd
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/common/bpf.c \
    basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/common/comapi.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/common/dhcp-options.5 \
    basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/dhcp/common/discover.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/common/dns.c \
    basesrc/usr.sbin/dhcp/common/parse.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/common/packet.c \
    basesrc/usr.sbin/dhcp/common/print.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/common/tr.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/dhcpctl/omshell.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/dst/dst_internal.h
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/includes/dhcp.h \
    basesrc/usr.sbin/dhcp/includes/failover.h
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/includes/site.h
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/minires/res_update.c
cvs rdiff -r1.1 -r0 basesrc/usr.sbin/dhcp/minires/toisc.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/omapip/auth.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/omapip/mrtrace.c \
    basesrc/usr.sbin/dhcp/omapip/support.c \
    basesrc/usr.sbin/dhcp/omapip/trace.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/omapip/protocol.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/dhcp/server/bootp.c \
    basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/server/confpars.c \
    basesrc/usr.sbin/dhcp/server/omapi.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/dhcp/server/ddns.c \
    basesrc/usr.sbin/dhcp/server/salloc.c
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/server/dhcpd.8
cvs rdiff -r1.25 -r1.26 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.