Module Name:	basesrc
Committed By:	mellon
Date:		Sat Jun 10 18:17:22 UTC 2000

Modified Files:
	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 discover.c dispatch.c hash.c
	    options.c tables.c
	basesrc/usr.sbin/dhcp/includes: dhcpd.h site.h
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: bootp.c dhcp.c dhcpd.c dhcpd.conf.5

Log Message:
Fix conflicts in merge.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/dhcp/client/dhclient.8
cvs rdiff -r1.25 -r1.26 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/client/scripts/bsdos
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/client/scripts/freebsd
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/dhcp/client/scripts/netbsd
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/dhcp/common/bpf.c \
    basesrc/usr.sbin/dhcp/common/hash.c \
    basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/common/discover.c \
    basesrc/usr.sbin/dhcp/common/dispatch.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.1.1.3 -r1.2 basesrc/usr.sbin/dhcp/includes/site.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/dhcp/server/bootp.c
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.15 -r1.16 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/dhcp/server/dhcpd.conf.5

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