Module Name:	basesrc
Committed By:	drochner
Date:		Tue Jun 11 14:00:05 UTC 2002

Modified Files:
	basesrc/dist/dhcp: Makefile.conf README RELNOTES configure
	basesrc/dist/dhcp/client: clparse.c dhclient-script.8 dhclient.8
	    dhclient.c dhclient.conf.5 dhclient.leases.5
	basesrc/dist/dhcp/client/scripts: freebsd linux
	basesrc/dist/dhcp/common: Makefile.dist alloc.c bpf.c comapi.c
	    conflex.c dhcp-eval.5 dhcp-options.5 discover.c dns.c execute.c
	    icmp.c memory.c options.c parse.c print.c socket.c tables.c tree.c
	basesrc/dist/dhcp/dhcpctl: dhcpctl.c omshell.c
	basesrc/dist/dhcp/includes: dhcp.h dhcpd.h dhctoken.h failover.h site.h
	    tree.h version.h
	basesrc/dist/dhcp/includes/cf: freebsd.h linux.h
	basesrc/dist/dhcp/includes/omapip: alloc.h hash.h omapip.h
	basesrc/dist/dhcp/omapip: alloc.c auth.c hash.c protocol.c support.c
	basesrc/dist/dhcp/relay: dhcrelay.8 dhcrelay.c
	basesrc/dist/dhcp/server: class.c confpars.c db.c ddns.c dhcp.c dhcpd.8
	    dhcpd.c dhcpd.conf.5 dhcpd.leases.5 failover.c mdb.c omapi.c
	    stables.c
Removed Files:
	basesrc/dist/dhcp/common: auth.c dhcp-contrib.5

Log Message:
merge dhcp-3.0.1rc9


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/Makefile.conf \
    basesrc/dist/dhcp/README basesrc/dist/dhcp/RELNOTES \
    basesrc/dist/dhcp/configure
cvs rdiff -r1.3 -r1.4 basesrc/dist/dhcp/client/clparse.c \
    basesrc/dist/dhcp/client/dhclient.8
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/client/dhclient-script.8 \
    basesrc/dist/dhcp/client/dhclient.conf.5 \
    basesrc/dist/dhcp/client/dhclient.leases.5
cvs rdiff -r1.5 -r1.6 basesrc/dist/dhcp/client/dhclient.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/client/scripts/freebsd \
    basesrc/dist/dhcp/client/scripts/linux
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/common/Makefile.dist \
    basesrc/dist/dhcp/common/conflex.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/common/alloc.c \
    basesrc/dist/dhcp/common/execute.c basesrc/dist/dhcp/common/memory.c \
    basesrc/dist/dhcp/common/options.c basesrc/dist/dhcp/common/tables.c \
    basesrc/dist/dhcp/common/tree.c
cvs rdiff -r1.1 -r0 basesrc/dist/dhcp/common/auth.c \
    basesrc/dist/dhcp/common/dhcp-contrib.5
cvs rdiff -r1.4 -r1.5 basesrc/dist/dhcp/common/bpf.c \
    basesrc/dist/dhcp/common/dhcp-eval.5
cvs rdiff -r1.3 -r1.4 basesrc/dist/dhcp/common/comapi.c \
    basesrc/dist/dhcp/common/dhcp-options.5 \
    basesrc/dist/dhcp/common/discover.c basesrc/dist/dhcp/common/dns.c \
    basesrc/dist/dhcp/common/icmp.c basesrc/dist/dhcp/common/parse.c \
    basesrc/dist/dhcp/common/print.c basesrc/dist/dhcp/common/socket.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/dhcpctl/dhcpctl.c \
    basesrc/dist/dhcp/dhcpctl/omshell.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/includes/dhcp.h \
    basesrc/dist/dhcp/includes/dhcpd.h basesrc/dist/dhcp/includes/dhctoken.h \
    basesrc/dist/dhcp/includes/site.h
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/includes/failover.h \
    basesrc/dist/dhcp/includes/tree.h basesrc/dist/dhcp/includes/version.h
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/includes/cf/freebsd.h \
    basesrc/dist/dhcp/includes/cf/linux.h
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/includes/omapip/alloc.h \
    basesrc/dist/dhcp/includes/omapip/hash.h \
    basesrc/dist/dhcp/includes/omapip/omapip.h
cvs rdiff -r1.3 -r1.4 basesrc/dist/dhcp/omapip/alloc.c \
    basesrc/dist/dhcp/omapip/protocol.c basesrc/dist/dhcp/omapip/support.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/omapip/auth.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/omapip/hash.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/dhcp/relay/dhcrelay.8 \
    basesrc/dist/dhcp/relay/dhcrelay.c
cvs rdiff -r1.1 -r1.2 basesrc/dist/dhcp/server/class.c \
    basesrc/dist/dhcp/server/stables.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/dhcp/server/confpars.c \
    basesrc/dist/dhcp/server/db.c basesrc/dist/dhcp/server/ddns.c \
    basesrc/dist/dhcp/server/dhcp.c basesrc/dist/dhcp/server/dhcpd.8 \
    basesrc/dist/dhcp/server/dhcpd.c basesrc/dist/dhcp/server/dhcpd.leases.5 \
    basesrc/dist/dhcp/server/mdb.c basesrc/dist/dhcp/server/omapi.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.4 -r1.5 basesrc/dist/dhcp/server/failover.c

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