Subject: CVS commit: basesrc
To: None <source-changes@netbsd.org>
From: Todd Vierling <tv@netbsd.org>
List: source-changes
Date: 10/18/2000 07:11:48
Module Name: basesrc
Committed By: tv
Date: Wed Oct 18 04:11:47 UTC 2000
Modified Files:
basesrc/usr.sbin/dhcp [netbsd-1-5]: Makefile.inc README RELNOTES
basesrc/usr.sbin/dhcp/client [netbsd-1-5]: clparse.c dhclient.c
dhclient.conf.5
basesrc/usr.sbin/dhcp/client/scripts [netbsd-1-5]: bsdos freebsd linux
openbsd solaris
basesrc/usr.sbin/dhcp/common [netbsd-1-5]: Makefile alloc.c bpf.c
comapi.c conflex.c dhcp-eval.5 dhcp-options.5 discover.c dlpi.c
dns.c execute.c icmp.c lpf.c nit.c options.c packet.c parse.c
print.c socket.c tables.c tree.c upf.c
basesrc/usr.sbin/dhcp/dhcpctl [netbsd-1-5]: Makefile.dist cltest.c
dhcpctl.c dhcpctl.h remote.c test.c
basesrc/usr.sbin/dhcp/includes [netbsd-1-5]: dhcp.h dhcpd.h dhctoken.h
failover.h site.h statement.h tree.h version.h
basesrc/usr.sbin/dhcp/includes/cf [netbsd-1-5]: irix.h sunos4.h
ultrix.h
basesrc/usr.sbin/dhcp/includes/isc [netbsd-1-5]: result.h
basesrc/usr.sbin/dhcp/includes/minires [netbsd-1-5]: minires.h resolv.h
basesrc/usr.sbin/dhcp/includes/netinet [netbsd-1-5]: udp.h
basesrc/usr.sbin/dhcp/includes/omapip [netbsd-1-5]: omapip.h omapip_p.h
basesrc/usr.sbin/dhcp/minires [netbsd-1-5]: dst_api.c res_findzonecut.c
res_mkquery.c res_mkupdate.c res_query.c res_send.c res_update.c
basesrc/usr.sbin/dhcp/omapip [netbsd-1-5]: Makefile alloc.c buffer.c
connection.c dispatch.c errwarn.c listener.c message.c protocol.c
result.c support.c
basesrc/usr.sbin/dhcp/relay [netbsd-1-5]: dhcrelay.c
basesrc/usr.sbin/dhcp/server [netbsd-1-5]: bootp.c class.c confpars.c
db.c dhcp.c dhcpd.c dhcpd.conf dhcpd.conf.5 failover.c mdb.c
omapi.c salloc.c stables.c
Added Files:
basesrc/usr.sbin/dhcp/doc [netbsd-1-5]:
draft-ietf-dhc-authentication-14.txt draft-ietf-dhc-dhcp-dns-12.txt
draft-ietf-dhc-failover-07.txt rfc2485.txt rfc2489.txt
basesrc/usr.sbin/dhcp/includes/omapip [netbsd-1-5]: convert.h hash.h
basesrc/usr.sbin/dhcp/omapip [netbsd-1-5]: auth.c convert.c hash.c
inet_addr.c
Removed Files:
basesrc/usr.sbin/dhcp [netbsd-1-5]: DOCUMENTATION ISC-LICENSE
basesrc/usr.sbin/dhcp/common [netbsd-1-5]: inet_addr.c
Log Message:
Pull up HEAD [taca]:
There are some inconsistencies with the branch vs. the trunk, so pull up
the whole of dhcp to get it in sync as of this commit. (We're expecting
more pullups further down the branch, so this will help future merges.)
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.10 -r1.10.4.1 basesrc/usr.sbin/dhcp/Makefile.inc
cvs rdiff -r1.7 -r1.7.4.1 basesrc/usr.sbin/dhcp/README \
basesrc/usr.sbin/dhcp/RELNOTES
cvs rdiff -r1.5.2.2 -r1.5.2.3 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.26.2.6 -r1.26.2.7 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 \
basesrc/usr.sbin/dhcp/client/dhclient.conf.5
cvs rdiff -r1.4 -r1.4.2.1 basesrc/usr.sbin/dhcp/client/scripts/bsdos
cvs rdiff -r1.5 -r1.5.2.1 basesrc/usr.sbin/dhcp/client/scripts/freebsd
cvs rdiff -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
basesrc/usr.sbin/dhcp/client/scripts/linux
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 \
basesrc/usr.sbin/dhcp/client/scripts/openbsd
cvs rdiff -r1.1.1.5 -r1.1.1.5.2.1 \
basesrc/usr.sbin/dhcp/client/scripts/solaris
cvs rdiff -r1.13 -r1.13.2.1 basesrc/usr.sbin/dhcp/common/Makefile
cvs rdiff -r1.1.1.6.2.1 -r1.1.1.6.2.2 basesrc/usr.sbin/dhcp/common/alloc.c \
basesrc/usr.sbin/dhcp/common/parse.c
cvs rdiff -r1.3 -r1.3.2.1 basesrc/usr.sbin/dhcp/common/bpf.c
cvs rdiff -r1.1.1.1.2.1 -r1.1.1.1.2.2 basesrc/usr.sbin/dhcp/common/comapi.c
cvs rdiff -r1.1.1.8.2.1 -r1.1.1.8.2.2 basesrc/usr.sbin/dhcp/common/conflex.c \
basesrc/usr.sbin/dhcp/common/icmp.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/common/dhcp-eval.5
cvs rdiff -r1.5.4.1 -r1.5.4.2 basesrc/usr.sbin/dhcp/common/dhcp-options.5
cvs rdiff -r1.4.2.1 -r1.4.2.2 basesrc/usr.sbin/dhcp/common/discover.c
cvs rdiff -r1.1.1.7 -r1.1.1.7.2.1 basesrc/usr.sbin/dhcp/common/dlpi.c
cvs rdiff -r1.1.1.5.2.1 -r1.1.1.5.2.2 basesrc/usr.sbin/dhcp/common/dns.c
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 basesrc/usr.sbin/dhcp/common/execute.c
cvs rdiff -r1.1.1.3 -r0 basesrc/usr.sbin/dhcp/common/inet_addr.c
cvs rdiff -r1.1.1.6 -r1.1.1.6.2.1 basesrc/usr.sbin/dhcp/common/lpf.c
cvs rdiff -r1.1.1.8 -r1.1.1.8.2.1 basesrc/usr.sbin/dhcp/common/nit.c
cvs rdiff -r1.3.2.1 -r1.3.2.2 basesrc/usr.sbin/dhcp/common/options.c
cvs rdiff -r1.2 -r1.2.2.1 basesrc/usr.sbin/dhcp/common/packet.c
cvs rdiff -r1.1.1.6 -r1.1.1.6.4.1 basesrc/usr.sbin/dhcp/common/print.c
cvs rdiff -r1.1.1.10.2.1 -r1.1.1.10.2.2 basesrc/usr.sbin/dhcp/common/socket.c
cvs rdiff -r1.5 -r1.5.2.1 basesrc/usr.sbin/dhcp/common/tables.c
cvs rdiff -r1.1.1.4.2.1 -r1.1.1.4.2.2 basesrc/usr.sbin/dhcp/common/tree.c
cvs rdiff -r1.1.1.9 -r1.1.1.9.2.1 basesrc/usr.sbin/dhcp/common/upf.c
cvs rdiff -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
basesrc/usr.sbin/dhcp/dhcpctl/Makefile.dist
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/dhcpctl/cltest.c \
basesrc/usr.sbin/dhcp/dhcpctl/remote.c \
basesrc/usr.sbin/dhcp/dhcpctl/test.c
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 basesrc/usr.sbin/dhcp/dhcpctl/dhcpctl.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 basesrc/usr.sbin/dhcp/dhcpctl/dhcpctl.h
cvs rdiff -r0 -r1.1.2.1 \
basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-authentication-14.txt \
basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-dns-12.txt \
basesrc/usr.sbin/dhcp/doc/draft-ietf-dhc-failover-07.txt \
basesrc/usr.sbin/dhcp/doc/rfc2485.txt \
basesrc/usr.sbin/dhcp/doc/rfc2489.txt
cvs rdiff -r1.2 -r1.2.4.1 basesrc/usr.sbin/dhcp/includes/dhcp.h
cvs rdiff -r1.12.2.2 -r1.12.2.3 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
basesrc/usr.sbin/dhcp/includes/dhctoken.h
cvs rdiff -r1.2 -r1.2.2.1 basesrc/usr.sbin/dhcp/includes/failover.h
cvs rdiff -r1.2.2.1 -r1.2.2.2 basesrc/usr.sbin/dhcp/includes/site.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/includes/statement.h
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 basesrc/usr.sbin/dhcp/includes/tree.h
cvs rdiff -r1.2.2.2 -r1.2.2.3 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.1.1.2 -r1.1.1.2.4.1 basesrc/usr.sbin/dhcp/includes/cf/irix.h
cvs rdiff -r1.1.1.5 -r1.1.1.5.4.1 basesrc/usr.sbin/dhcp/includes/cf/sunos4.h
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 basesrc/usr.sbin/dhcp/includes/cf/ultrix.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/includes/isc/result.h
cvs rdiff -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
basesrc/usr.sbin/dhcp/includes/minires/minires.h
cvs rdiff -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
basesrc/usr.sbin/dhcp/includes/minires/resolv.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.12.1 \
basesrc/usr.sbin/dhcp/includes/netinet/udp.h
cvs rdiff -r0 -r1.1.2.1 basesrc/usr.sbin/dhcp/includes/omapip/convert.h \
basesrc/usr.sbin/dhcp/includes/omapip/hash.h
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
basesrc/usr.sbin/dhcp/includes/omapip/omapip.h
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 \
basesrc/usr.sbin/dhcp/includes/omapip/omapip_p.h
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/minires/dst_api.c
cvs rdiff -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
basesrc/usr.sbin/dhcp/minires/res_findzonecut.c
cvs rdiff -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
basesrc/usr.sbin/dhcp/minires/res_mkquery.c \
basesrc/usr.sbin/dhcp/minires/res_mkupdate.c \
basesrc/usr.sbin/dhcp/minires/res_query.c \
basesrc/usr.sbin/dhcp/minires/res_send.c
cvs rdiff -r1.1.1.2.2.3 -r1.1.1.2.2.4 \
basesrc/usr.sbin/dhcp/minires/res_update.c
cvs rdiff -r1.1 -r1.1.4.1 basesrc/usr.sbin/dhcp/omapip/Makefile
cvs rdiff -r1.1.1.2.2.2 -r1.1.1.2.2.3 basesrc/usr.sbin/dhcp/omapip/alloc.c \
basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r0 -r1.1.2.1 basesrc/usr.sbin/dhcp/omapip/auth.c \
basesrc/usr.sbin/dhcp/omapip/convert.c \
basesrc/usr.sbin/dhcp/omapip/hash.c \
basesrc/usr.sbin/dhcp/omapip/inet_addr.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.4.1 basesrc/usr.sbin/dhcp/omapip/buffer.c \
basesrc/usr.sbin/dhcp/omapip/result.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 basesrc/usr.sbin/dhcp/omapip/connection.c \
basesrc/usr.sbin/dhcp/omapip/listener.c \
basesrc/usr.sbin/dhcp/omapip/message.c
cvs rdiff -r1.1.1.1.4.2 -r1.1.1.1.4.3 basesrc/usr.sbin/dhcp/omapip/errwarn.c
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 basesrc/usr.sbin/dhcp/omapip/protocol.c \
basesrc/usr.sbin/dhcp/omapip/support.c
cvs rdiff -r1.4.2.1 -r1.4.2.2 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.12 -r1.12.2.1 basesrc/usr.sbin/dhcp/server/bootp.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 basesrc/usr.sbin/dhcp/server/class.c
cvs rdiff -r1.2.2.1 -r1.2.2.2 basesrc/usr.sbin/dhcp/server/confpars.c \
basesrc/usr.sbin/dhcp/server/omapi.c
cvs rdiff -r1.1.1.10.2.1 -r1.1.1.10.2.2 basesrc/usr.sbin/dhcp/server/db.c
cvs rdiff -r1.13.2.1 -r1.13.2.2 basesrc/usr.sbin/dhcp/server/dhcp.c
cvs rdiff -r1.17.2.2 -r1.17.2.3 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.10.1 basesrc/usr.sbin/dhcp/server/dhcpd.conf
cvs rdiff -r1.8.2.3 -r1.8.2.4 basesrc/usr.sbin/dhcp/server/dhcpd.conf.5
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 basesrc/usr.sbin/dhcp/server/failover.c \
basesrc/usr.sbin/dhcp/server/mdb.c basesrc/usr.sbin/dhcp/server/stables.c
cvs rdiff -r1.1.1.1.2.1 -r1.1.1.1.2.2 basesrc/usr.sbin/dhcp/server/salloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.