Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/usr.sbin/dhcp Pull up HEAD [taca]:
details: https://anonhg.NetBSD.org/src/rev/3212870f08e5
branches: netbsd-1-5
changeset: 489893:3212870f08e5
user: tv <tv%NetBSD.org@localhost>
date: Wed Oct 18 04:10:54 2000 +0000
description:
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.)
diffstat:
usr.sbin/dhcp/DOCUMENTATION | 13 -
usr.sbin/dhcp/ISC-LICENSE | 161 -
usr.sbin/dhcp/Makefile.inc | 4 +-
usr.sbin/dhcp/README | 310 +-
usr.sbin/dhcp/RELNOTES | 500 +-
usr.sbin/dhcp/client/clparse.c | 33 +-
usr.sbin/dhcp/client/dhclient.c | 220 +-
usr.sbin/dhcp/client/dhclient.conf.5 | 11 +
usr.sbin/dhcp/client/scripts/bsdos | 14 +-
usr.sbin/dhcp/client/scripts/freebsd | 14 +-
usr.sbin/dhcp/client/scripts/linux | 21 +-
usr.sbin/dhcp/client/scripts/openbsd | 14 +-
usr.sbin/dhcp/client/scripts/solaris | 14 +-
usr.sbin/dhcp/common/Makefile | 4 +-
usr.sbin/dhcp/common/alloc.c | 222 +-
usr.sbin/dhcp/common/bpf.c | 39 +-
usr.sbin/dhcp/common/comapi.c | 12 +-
usr.sbin/dhcp/common/conflex.c | 30 +-
usr.sbin/dhcp/common/dhcp-eval.5 | 51 +-
usr.sbin/dhcp/common/dhcp-options.5 | 127 +-
usr.sbin/dhcp/common/discover.c | 66 +-
usr.sbin/dhcp/common/dlpi.c | 22 +-
usr.sbin/dhcp/common/dns.c | 127 +-
usr.sbin/dhcp/common/execute.c | 179 +-
usr.sbin/dhcp/common/icmp.c | 8 +-
usr.sbin/dhcp/common/inet_addr.c | 150 -
usr.sbin/dhcp/common/lpf.c | 100 +-
usr.sbin/dhcp/common/nit.c | 47 +-
usr.sbin/dhcp/common/options.c | 1030 +-
usr.sbin/dhcp/common/packet.c | 22 +-
usr.sbin/dhcp/common/parse.c | 630 +-
usr.sbin/dhcp/common/print.c | 77 +-
usr.sbin/dhcp/common/socket.c | 40 +-
usr.sbin/dhcp/common/tables.c | 348 +-
usr.sbin/dhcp/common/tree.c | 462 +-
usr.sbin/dhcp/common/upf.c | 33 +-
usr.sbin/dhcp/dhcpctl/Makefile.dist | 8 +-
usr.sbin/dhcp/dhcpctl/cltest.c | 79 +-
usr.sbin/dhcp/dhcpctl/dhcpctl.c | 76 +-
usr.sbin/dhcp/dhcpctl/dhcpctl.h | 12 +-
usr.sbin/dhcp/dhcpctl/remote.c | 62 +-
usr.sbin/dhcp/dhcpctl/test.c | 239 +-
usr.sbin/dhcp/doc/draft-ietf-dhc-authentication-14.txt | 893 ++
usr.sbin/dhcp/doc/draft-ietf-dhc-dhcp-dns-12.txt | 1072 ++
usr.sbin/dhcp/doc/draft-ietf-dhc-failover-07.txt | 6778 ++++++++++++++++
usr.sbin/dhcp/doc/rfc2485.txt | 227 +
usr.sbin/dhcp/doc/rfc2489.txt | 283 +
usr.sbin/dhcp/includes/cf/irix.h | 39 +-
usr.sbin/dhcp/includes/cf/sunos4.h | 2 +
usr.sbin/dhcp/includes/cf/ultrix.h | 1 +
usr.sbin/dhcp/includes/dhcp.h | 10 +
usr.sbin/dhcp/includes/dhcpd.h | 277 +-
usr.sbin/dhcp/includes/dhctoken.h | 19 +-
usr.sbin/dhcp/includes/failover.h | 64 +-
usr.sbin/dhcp/includes/isc/result.h | 3 +-
usr.sbin/dhcp/includes/minires/minires.h | 3 +-
usr.sbin/dhcp/includes/minires/resolv.h | 3 +-
usr.sbin/dhcp/includes/netinet/udp.h | 4 +-
usr.sbin/dhcp/includes/omapip/convert.h | 61 +
usr.sbin/dhcp/includes/omapip/hash.h | 141 +
usr.sbin/dhcp/includes/omapip/omapip.h | 57 +-
usr.sbin/dhcp/includes/omapip/omapip_p.h | 40 +-
usr.sbin/dhcp/includes/site.h | 2 +-
usr.sbin/dhcp/includes/statement.h | 14 +-
usr.sbin/dhcp/includes/tree.h | 50 +-
usr.sbin/dhcp/includes/version.h | 2 +-
usr.sbin/dhcp/minires/dst_api.c | 8 +-
usr.sbin/dhcp/minires/res_findzonecut.c | 7 +-
usr.sbin/dhcp/minires/res_mkquery.c | 2 +-
usr.sbin/dhcp/minires/res_mkupdate.c | 2 +-
usr.sbin/dhcp/minires/res_query.c | 2 +-
usr.sbin/dhcp/minires/res_send.c | 2 +-
usr.sbin/dhcp/minires/res_update.c | 15 +-
usr.sbin/dhcp/omapip/Makefile | 3 +-
usr.sbin/dhcp/omapip/alloc.c | 2 +
usr.sbin/dhcp/omapip/auth.c | 272 +
usr.sbin/dhcp/omapip/buffer.c | 33 +
usr.sbin/dhcp/omapip/connection.c | 274 +-
usr.sbin/dhcp/omapip/convert.c | 193 +
usr.sbin/dhcp/omapip/dispatch.c | 41 +-
usr.sbin/dhcp/omapip/errwarn.c | 33 +-
usr.sbin/dhcp/omapip/hash.c | 336 +
usr.sbin/dhcp/omapip/inet_addr.c | 150 +
usr.sbin/dhcp/omapip/listener.c | 56 +
usr.sbin/dhcp/omapip/message.c | 186 +-
usr.sbin/dhcp/omapip/protocol.c | 470 +-
usr.sbin/dhcp/omapip/result.c | 1 +
usr.sbin/dhcp/omapip/support.c | 118 +-
usr.sbin/dhcp/relay/dhcrelay.c | 60 +-
usr.sbin/dhcp/server/bootp.c | 19 +-
usr.sbin/dhcp/server/class.c | 66 +-
usr.sbin/dhcp/server/confpars.c | 125 +-
usr.sbin/dhcp/server/db.c | 21 +-
usr.sbin/dhcp/server/dhcp.c | 499 +-
usr.sbin/dhcp/server/dhcpd.c | 52 +-
usr.sbin/dhcp/server/dhcpd.conf | 37 +-
usr.sbin/dhcp/server/dhcpd.conf.5 | 352 +-
usr.sbin/dhcp/server/failover.c | 1532 +++-
usr.sbin/dhcp/server/mdb.c | 67 +-
usr.sbin/dhcp/server/omapi.c | 206 +-
usr.sbin/dhcp/server/salloc.c | 2 +-
usr.sbin/dhcp/server/stables.c | 25 +-
102 files changed, 17738 insertions(+), 3207 deletions(-)
diffs (truncated from 27364 to 300 lines):
diff -r f768c51e2c4a -r 3212870f08e5 usr.sbin/dhcp/DOCUMENTATION
--- a/usr.sbin/dhcp/DOCUMENTATION Wed Oct 18 03:44:59 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-README
-RELNOTES
-common/dhcp-options.5
-common/dhcp-eval.5
-client/dhclient.8
-client/dhclient.conf.5
-client/dhclient.leases.5
-client/dhcp-script.5
-relay/dhcrelay.8
-server/dhcpd.8
-server/dhcpd.conf.5
-server/dhcpd.leases.5
-common/dhcp-contrib.html (the Contributions Manual Page)
diff -r f768c51e2c4a -r 3212870f08e5 usr.sbin/dhcp/ISC-LICENSE
--- a/usr.sbin/dhcp/ISC-LICENSE Wed Oct 18 03:44:59 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
- ISC LICENSE, Version 1.0
-
-1. This license covers any file containing a statement following its
- copyright message indicating that it is covered by this license.
- It also covers any text or binary file, executable, electronic or
- printed image that is derived from a file that is covered by this
- license, or is a modified version of a file covered by this
- license, whether such works exist now or in the future.
- Hereafter, such works will be referred to as "works covered by
- this license," or "covered works."
-
-2. Each source file covered by this license contains a sequence of
- text starting with the copyright message and ending with "Support
- and other services are available for ISC products - see
- http://www.isc.org for more information." This will hereafter be
- referred to as the file's Bootstrap License.
-
-3. If you take significant portions of any source file covered by
- this license and include those portions in some other file, then
- you must also copy the Bootstrap License into that other file,
- and that file becomes a covered file. You may make a good-faith
- judgement as to where in this file the bootstrap license should
- appear.
-
-4. The acronym "ISC", when used in this license or generally in the
- context of works covered by this license, is an abbreviation for
- the words "Internet Software Consortium."
-
-5. A distribution, as referred to hereafter, is any file, collection
- of printed text, CD ROM, boxed set, or other collection, physical
- or electronic, which can be distributed as a single object and which
- contains one or more works covered by this license.
-
-6. You may make distributions containing covered files and provide
- copies of such distributions to whomever you choose, with or
- without charge, as long as you obey the other terms of this
- license. Except as stated in (9), you may include as many or as
- few covered files as you choose in such distributions.
-
-7. When making copies of covered works to distribute to others, you
- must not remove or alter the Bootstrap License. You may not place
- your own copyright message, license, or similar statements in the
- file prior to the original copyright message or anywhere within
- the Bootstrap License. Object files and executable files are
- exempt from the restrictions specified in this clause.
-
-8. If the version of a covered source file as you received it, when
- compiled, would normally produce executable code that would print
- a copyright message followed by a message referring to an ISC web
- page or other ISC documentation, you may not modify the the file
- in such a way that, when compiled, it no longer produces
- executable code to print such a message when invoked in the same way.
-
-9. Any source file covered by this license will specify within the
- Bootstrap License the name of the ISC distribution from which it
- came, as well as a list of associated documentation files. The
- associated documentation for a binary file is the same as the
- associated documentation for the source file or files from which
- it was derived. Associated documentation files contain
- human-readable documentation which the ISC intends to accompany
- any distribution.
-
- If you produce a distribution, then for every covered file in that
- distribution, you must include all of the associated documentation
- files for that file. You need only include one copy of each such
- documentation file in such distributions.
-
- Absence of required documentation files from a distribution you
- receive or absence of the list of documentation files from a
- source file covered by this license does not excuse you from this
- from this requirement. If the distribution you receive does not
- contain these files, you must obtain them from the ISC and include
- them in any redistribution of any work covered by this license.
- For information on how to obtain required documentation not
- included with your distribution, see:
-
- http://www.isc.org/getting-documentation.html.
-
- If the list of documentation files was removed from your copy of a
- covered work, you must obtain such a list from the ISC. The
- web page at http://www.isc.org/getting-documentation.html contains
- pointers to lists of files for each ISC distribution covered by
- this license.
-
- It is permissible in a source or binary distribution containing
- covered works to include reformatted versions of the documentation
- files. It is also permissible to add to or modify the
- documentation files, as long as the formatting is similar in
- legibility, readability, font, and font size to other documentation
- in the derived product, as long as any sections labeled
- CONTRIBUTIONS in these files are unchanged except with respect to
- formatting, as long as the order in which the CONTRIBUTIONS section
- appears in these files is not changed, and as long as the manual
- page which describes how to contribute to the Internet Software
- Consortium (hereafter referred to as the Contributions Manual Page)
- is unchanged except with respect to formatting.
-
- Documentation that has been translated into another natural
- language may be included in place of or in addition to the
- required documentation, so long as the CONTRIBUTIONS section and
- the Contributions Manual Page are either left in their original
- language or translated into the new language with such care and
- diligence as is required to preserve the original meaning.
-
-10. You must include this license with any distribution that you make,
- in such a way that it is clearly associated with such covered works
- as are present in that distribution. In any electronic
- distribution, the license must be in a file called "ISC-LICENSE".
-
- If you make a distribution that contains works from more than one
- ISC distribution, you may either include a copy of the ISC-LICENSE
- file that accompanied each such ISC distribution in such a way that
- works covered by each license are all clearly grouped with that
- license, or you may include the single copy of the ISC-LICENSE that
- has the highest version number of all the ISC-LICENSE files
- included with such distributions, in which case all covered works
- will be covered by that single license file. The version number
- of a license appears at the top of the file containing the text of
- that license, or if in printed form, at the top of the first page
- of that license.
-
-11. If the list of associated documentation is in a seperated file,
- you must include that file with any distribution you make, in such
- a way that the relationship between that file and the files that
- refer to it is clear. It is not permissible to merge such files
- in the event that you make a distribution including files from
- more than one ISC distribution, unless all the Bootstrap Licenses
- refer to files for their lists of associated documentation, and
- those references all list the same filename.
-
-12. If a distribution that includes covered works includes a mechanism
- for automatically installing covered works, following that
- installation process must not cause the person following that
- process to violate this license, knowingly or unknowingly. In the
- event that the producer of a distribution containing covered files
- accidentally or wilfully violates this clause, persons other than
- the producer of such a distribution shall not be held liable for
- such violations, but are not otherwise excused from any
- requirement of this license.
-
-13. COVERED WORKS ARE PROVIDED "AS IS". ISC DISCLAIMS ALL WARRANTIES
- WITH REGARD TO COVERED WORKS INCLUDING THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-14. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OF COVERED WORKS.
-
-Use of covered works under different terms is prohibited unless you
-have first obtained a license from ISC granting use pursuant to
-different terms. Such terms may be negotiated by contacting ISC as
-follows:
-
- Internet Software Consortium
- 950 Charter Street
- Redwood City, CA 94063
- Tel: 1-888-868-1001
- Fax: 1-650-779-7055
- Email: licensing%isc.org@localhost
diff -r f768c51e2c4a -r 3212870f08e5 usr.sbin/dhcp/Makefile.inc
--- a/usr.sbin/dhcp/Makefile.inc Wed Oct 18 03:44:59 2000 +0000
+++ b/usr.sbin/dhcp/Makefile.inc Wed Oct 18 04:10:54 2000 +0000
@@ -40,8 +40,8 @@
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
CPPFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../includes
-LDADD= ${COBJDIR}/libdhcp.a ${OMOBJDIR}/libomapi.a ${MROBJDIR}/libminires.a
-DPADD= ${COBJDIR}/libdhcp.a ${OMOBJDIR}/libomapi.a ${MROBJDIR}/libminires.a
+LDADD= ${OMOBJDIR}/libomapi.a ${COBJDIR}/libdhcp.a ${MROBJDIR}/libminires.a
+DPADD= ${OMOBJDIR}/libomapi.a ${COBJDIR}/libdhcp.a ${MROBJDIR}/libminires.a
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
diff -r f768c51e2c4a -r 3212870f08e5 usr.sbin/dhcp/README
--- a/usr.sbin/dhcp/README Wed Oct 18 03:44:59 2000 +0000
+++ b/usr.sbin/dhcp/README Wed Oct 18 04:10:54 2000 +0000
@@ -1,7 +1,6 @@
- Internet Software Consortium
- Dynamic Host Configuration Protocol Distribution
- Version 3, Beta 2, Patchlevel 0
- January 21, 2000
+ Internet Software Consortium DHCP Distribution
+ Version 3, Beta 2, Patchlevel 9
+ October 15, 2000
README FILE
@@ -19,33 +18,35 @@
3.3 BUILDING IT
4 INSTALLING THE DHCP DISTRIBUTION
5 USING THE DHCP DISTRIBUTION
- 5.1 LINUX
- 5.1.1 IF_TR.H NOT FOUND
- 5.1.2 SO_ATTACH_FILTER UNDECLARED
- 5.1.3 PROTOCOL NOT CONFIGURED
- 5.1.4 BROADCAST
- 5.1.5 FIREWALL RULES
- 5.1.6 IP BOOTP AGENT
- 5.1.7 MULTIPLE INTERFACES
- 5.2 SCO
- 5.3 HP-UX
- 5.4 ULTRIX
- 5.5 FreeBSD
- 5.6 NeXTSTEP
- 5.7 SOLARIS
+ 5.1 FIREWALL RULES
+ 5.2 LINUX
+ 5.2.1 IF_TR.H NOT FOUND
+ 5.2.2 SO_ATTACH_FILTER UNDECLARED
+ 5.2.3 PROTOCOL NOT CONFIGURED
+ 5.2.4 BROADCAST
+ 5.2.6 IP BOOTP AGENT
+ 5.2.7 MULTIPLE INTERFACES
+ 5.3 SCO
+ 5.4 HP-UX
+ 5.5 ULTRIX
+ 5.6 FreeBSD
+ 5.7 NeXTSTEP
+ 5.8 SOLARIS
6 SUPPORT
6.1 HOW TO REPORT BUGS
- 7 KNOWN BUGS
WHERE TO FIND DOCUMENTATION
Documentation for this software includes this README file, the
RELNOTES file, and the manual pages, which are in the server, common,
-client and relay subdirectories. Internet standards relating to the
-DHCP protocol are stored in the doc subdirectory. You will have the
-best luck reading the manual pages if you build this software and then
-install it, although you can read them directly out of the
-distribution if you need to.
+client and relay subdirectories. The README file (this file) includes
+late-breaking operational and system-specific information that you
+should read even if you don't want to read the manual pages, and that
+you should *certainly* read if you run into trouble. Internet
+standards relating to the DHCP protocol are stored in the doc
+subdirectory. You will have the best luck reading the manual pages if
+you build this software and then install it, although you can read
+them directly out of the distribution if you need to.
DHCP server documentation is in the dhcpd man page. Information about
the DHCP server lease database is in the dhcpd.leases man page.
@@ -94,33 +95,38 @@
RELEASE STATUS
-This is the first beta release of version 3.0 of the ISC DHCP
-Distribution. Development of this release is approaching the point
-at which it will be frozen, and no significant new features will be
+This is the second beta release of version 3.0 of the ISC DHCP
+Distribution. Development of this release is approaching the point at
+which it will be frozen, and no significant new features will be
added.
-In this release, the server and relay agent currently work well on
-NetBSD, Linux after kernel version 2.0.30, FreeBSD, BSD/OS, Ultrix,
-Digital Alpha OSF/1, Solaris and SunOS 4.1.4. They run on AIX, HPUX,
-IRIX and Linux 2.0.30 and earlier kernels but support only a single
-broadcast network interface. They also runs on QNX as long as only
-one broadcast network interface is configured and a host route is
-added from that interface to the 255.255.255.255 broadcast address.
+In this release, the server and relay agent are currently fully
+functional on NetBSD, Linux systems with kernel version 2.2 or later,
+FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The
+software will also run on HP-UX, but only supports a single network
+interface. Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but
+are not in wide use, with all that implies. We are not aware of an
+easy way to get this software running on HP-UX.
The DHCP client currently only knows how to configure the network on
-NetBSD, FreeBSD, BSD/os, Linux, Solaris and NextStep. The client
-depends on a system-dependent shell script to do network
+NetBSD, FreeBSD, OpenBSD, BSD/os, Linux, Solaris and NextStep. The
+client depends on a system-dependent shell script to do network
configuration - support for other operating systems is simply a matter
of porting this shell script to the new platform.
Home |
Main Index |
Thread Index |
Old Index