Module Name:	basesrc
Committed By:	he
Date:		Thu Jul 27 17:17:44 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp [netbsd-1-4]: Makefile README RELNOTES
	basesrc/usr.sbin/dhcp/client [netbsd-1-4]: Makefile clparse.c
	    dhclient-script.8 dhclient.c
	basesrc/usr.sbin/dhcp/client/scripts [netbsd-1-4]: freebsd
	basesrc/usr.sbin/dhcp/common [netbsd-1-4]: Makefile bpf.c
	    dhcp-options.5 dispatch.c dlpi.c lpf.c memory.c packet.c raw.c
	    socket.c tables.c
	basesrc/usr.sbin/dhcp/includes [netbsd-1-4]: dhcpd.h osdep.h
	basesrc/usr.sbin/dhcp/includes/cf [netbsd-1-4]: aix.h alphaosf.h hpux.h
	    linux.h
	basesrc/usr.sbin/dhcp/includes/netinet [netbsd-1-4]: if_ether.h
	basesrc/usr.sbin/dhcp/relay [netbsd-1-4]: dhcrelay.c
	basesrc/usr.sbin/dhcp/server [netbsd-1-4]: bootp.c confpars.c db.c
	    dhcp.c dhcpd.c dhcpd.conf.5

Log Message:
Apply patch (requested by mellon):
  Merge/update DHCP client and server software to ISC 2.0pl3.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.3.2.1 basesrc/usr.sbin/dhcp/Makefile
cvs rdiff -r1.4.2.1 -r1.4.2.2 basesrc/usr.sbin/dhcp/README \
    basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.5.2.1 -r1.5.2.2 basesrc/usr.sbin/dhcp/client/Makefile
cvs rdiff -r1.1.1.7.2.1 -r1.1.1.7.2.2 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.5 -r1.5.2.1 basesrc/usr.sbin/dhcp/client/dhclient-script.8
cvs rdiff -r1.20.2.3 -r1.20.2.4 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.3 -r1.3.2.1 basesrc/usr.sbin/dhcp/client/scripts/freebsd
cvs rdiff -r1.11 -r1.11.2.1 basesrc/usr.sbin/dhcp/common/Makefile
cvs rdiff -r1.1.1.6 -r1.1.1.6.2.1 basesrc/usr.sbin/dhcp/common/bpf.c
cvs rdiff -r1.2.2.1 -r1.2.2.2 basesrc/usr.sbin/dhcp/common/dhcp-options.5
cvs rdiff -r1.1.1.11 -r1.1.1.11.2.1 basesrc/usr.sbin/dhcp/common/dispatch.c
cvs rdiff -r1.1.1.4 -r1.1.1.4.2.1 basesrc/usr.sbin/dhcp/common/dlpi.c \
    basesrc/usr.sbin/dhcp/common/lpf.c
cvs rdiff -r1.1.1.5 -r1.1.1.5.2.1 basesrc/usr.sbin/dhcp/common/memory.c
cvs rdiff -r1.1.1.5.2.1 -r1.1.1.5.2.2 basesrc/usr.sbin/dhcp/common/packet.c
cvs rdiff -r1.1.1.3.2.1 -r1.1.1.3.2.2 basesrc/usr.sbin/dhcp/common/raw.c
cvs rdiff -r1.1.1.8 -r1.1.1.8.2.1 basesrc/usr.sbin/dhcp/common/socket.c
cvs rdiff -r1.1.1.3 -r1.1.1.3.2.1 basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.5.2.2 -r1.5.2.3 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.1.1.7 -r1.1.1.7.2.1 basesrc/usr.sbin/dhcp/includes/osdep.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.2.1 basesrc/usr.sbin/dhcp/includes/cf/aix.h
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 \
    basesrc/usr.sbin/dhcp/includes/cf/alphaosf.h
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 basesrc/usr.sbin/dhcp/includes/cf/hpux.h
cvs rdiff -r1.1.1.6 -r1.1.1.6.2.1 basesrc/usr.sbin/dhcp/includes/cf/linux.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 \
    basesrc/usr.sbin/dhcp/includes/netinet/if_ether.h
cvs rdiff -r1.1.1.12.2.2 -r1.1.1.12.2.3 \
    basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.7.2.1 -r1.7.2.2 basesrc/usr.sbin/dhcp/server/bootp.c
cvs rdiff -r1.1.1.7.2.1 -r1.1.1.7.2.2 basesrc/usr.sbin/dhcp/server/confpars.c
cvs rdiff -r1.1.1.7 -r1.1.1.7.2.1 basesrc/usr.sbin/dhcp/server/db.c
cvs rdiff -r1.8.2.2 -r1.8.2.3 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.11.2.2 -r1.11.2.3 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.5.2.1 -r1.5.2.2 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.