Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/dhcp merge dhcp-3.0.3
details: https://anonhg.NetBSD.org/src/rev/dfc2ddbd3c30
branches: trunk
changeset: 583553:dfc2ddbd3c30
user: drochner <drochner%NetBSD.org@localhost>
date: Thu Aug 11 17:13:21 2005 +0000
description:
merge dhcp-3.0.3
diffstat:
dist/dhcp/Makefile | 50 +-
dist/dhcp/Makefile.conf | 61 +-
dist/dhcp/Makefile.dist | 33 +-
dist/dhcp/README | 85 +-
dist/dhcp/RELNOTES | 380 ++++++++-
dist/dhcp/client/Makefile.dist | 32 +-
dist/dhcp/client/clparse.c | 86 +-
dist/dhcp/client/dhclient-script.8 | 57 +-
dist/dhcp/client/dhclient.8 | 39 +-
dist/dhcp/client/dhclient.c | 173 ++-
dist/dhcp/client/dhclient.conf.5 | 76 +-
dist/dhcp/client/dhclient.leases.5 | 62 +-
dist/dhcp/client/scripts/freebsd | 23 +-
dist/dhcp/common/Makefile.dist | 28 +-
dist/dhcp/common/alloc.c | 51 +-
dist/dhcp/common/bpf.c | 61 +-
dist/dhcp/common/comapi.c | 51 +-
dist/dhcp/common/conflex.c | 126 +-
dist/dhcp/common/ctrace.c | 56 +-
dist/dhcp/common/dhcp-eval.5 | 72 +-
dist/dhcp/common/dhcp-options.5 | 103 +-
dist/dhcp/common/discover.c | 63 +-
dist/dhcp/common/dispatch.c | 51 +-
dist/dhcp/common/dlpi.c | 53 +-
dist/dhcp/common/dns.c | 71 +-
dist/dhcp/common/ethernet.c | 51 +-
dist/dhcp/common/execute.c | 65 +-
dist/dhcp/common/fddi.c | 53 +-
dist/dhcp/common/icmp.c | 51 +-
dist/dhcp/common/inet.c | 151 +-
dist/dhcp/common/lpf.c | 47 +-
dist/dhcp/common/memory.c | 51 +-
dist/dhcp/common/nit.c | 53 +-
dist/dhcp/common/options.c | 334 ++++--
dist/dhcp/common/packet.c | 115 +-
dist/dhcp/common/parse.c | 182 ++--
dist/dhcp/common/print.c | 120 +-
dist/dhcp/common/raw.c | 51 +-
dist/dhcp/common/resolv.c | 51 +-
dist/dhcp/common/socket.c | 51 +-
dist/dhcp/common/tables.c | 1361 ++++++++++++++---------------
dist/dhcp/common/tr.c | 45 +-
dist/dhcp/common/tree.c | 79 +-
dist/dhcp/common/upf.c | 59 +-
dist/dhcp/configure | 29 +-
dist/dhcp/contrib/3.0b1-lease-convert | 4 +-
dist/dhcp/dhcpctl/Makefile.dist | 33 +-
dist/dhcp/dhcpctl/callback.c | 54 +-
dist/dhcp/dhcpctl/cltest.c | 53 +-
dist/dhcp/dhcpctl/dhcpctl.3 | 33 +-
dist/dhcp/dhcpctl/dhcpctl.c | 54 +-
dist/dhcp/dhcpctl/dhcpctl.h | 51 +-
dist/dhcp/dhcpctl/omshell.1 | 51 +-
dist/dhcp/dhcpctl/omshell.c | 55 +-
dist/dhcp/dhcpctl/remote.c | 54 +-
dist/dhcp/dst/Makefile.dist | 32 +-
dist/dhcp/dst/base64.c | 28 +-
dist/dhcp/dst/dst_api.c | 4 +-
dist/dhcp/dst/dst_support.c | 4 +-
dist/dhcp/dst/hmac_link.c | 4 +-
dist/dhcp/dst/prandom.c | 4 +-
dist/dhcp/includes/arpa/nameser.h | 26 +-
dist/dhcp/includes/arpa/nameser_compat.h | 2 +-
dist/dhcp/includes/cf/freebsd.h | 54 +-
dist/dhcp/includes/cf/linux.h | 52 +-
dist/dhcp/includes/cf/netbsd.h | 49 +-
dist/dhcp/includes/dhcp.h | 49 +-
dist/dhcp/includes/dhcpd.h | 84 +-
dist/dhcp/includes/dhctoken.h | 52 +-
dist/dhcp/includes/failover.h | 51 +-
dist/dhcp/includes/minires/minires.h | 24 +-
dist/dhcp/includes/minires/res_update.h | 2 +-
dist/dhcp/includes/minires/resolv.h | 26 +-
dist/dhcp/includes/netinet/udp.h | 25 +-
dist/dhcp/includes/omapip/alloc.h | 49 +-
dist/dhcp/includes/omapip/hash.h | 49 +-
dist/dhcp/includes/omapip/omapip.h | 49 +-
dist/dhcp/includes/osdep.h | 63 +-
dist/dhcp/includes/tree.h | 49 +-
dist/dhcp/includes/version.h | 2 +-
dist/dhcp/minires/ns_date.c | 26 +-
dist/dhcp/minires/ns_name.c | 26 +-
dist/dhcp/minires/ns_parse.c | 26 +-
dist/dhcp/minires/ns_samedomain.c | 26 +-
dist/dhcp/minires/ns_sign.c | 26 +-
dist/dhcp/minires/ns_verify.c | 26 +-
dist/dhcp/minires/res_comp.c | 26 +-
dist/dhcp/minires/res_findzonecut.c | 26 +-
dist/dhcp/minires/res_init.c | 26 +-
dist/dhcp/minires/res_mkquery.c | 26 +-
dist/dhcp/minires/res_mkupdate.c | 133 +-
dist/dhcp/minires/res_query.c | 26 +-
dist/dhcp/minires/res_send.c | 26 +-
dist/dhcp/minires/res_update.c | 26 +-
dist/dhcp/omapip/alloc.c | 62 +-
dist/dhcp/omapip/array.c | 49 +-
dist/dhcp/omapip/auth.c | 51 +-
dist/dhcp/omapip/buffer.c | 49 +-
dist/dhcp/omapip/connection.c | 53 +-
dist/dhcp/omapip/convert.c | 51 +-
dist/dhcp/omapip/dispatch.c | 105 +-
dist/dhcp/omapip/errwarn.c | 75 +-
dist/dhcp/omapip/generic.c | 51 +-
dist/dhcp/omapip/handle.c | 49 +-
dist/dhcp/omapip/hash.c | 51 +-
dist/dhcp/omapip/inet_addr.c | 6 +-
dist/dhcp/omapip/listener.c | 49 +-
dist/dhcp/omapip/message.c | 53 +-
dist/dhcp/omapip/mrtrace.c | 53 +-
dist/dhcp/omapip/protocol.c | 49 +-
dist/dhcp/omapip/result.c | 53 +-
dist/dhcp/omapip/support.c | 49 +-
dist/dhcp/omapip/trace.c | 49 +-
dist/dhcp/relay/dhcrelay.8 | 82 +-
dist/dhcp/relay/dhcrelay.c | 101 +-
dist/dhcp/server/Makefile.dist | 31 +-
dist/dhcp/server/bootp.c | 157 +--
dist/dhcp/server/class.c | 51 +-
dist/dhcp/server/confpars.c | 146 +-
dist/dhcp/server/db.c | 86 +-
dist/dhcp/server/ddns.c | 99 +-
dist/dhcp/server/dhcp.c | 500 ++++++----
dist/dhcp/server/dhcpd.8 | 60 +-
dist/dhcp/server/dhcpd.c | 101 +-
dist/dhcp/server/dhcpd.conf.5 | 178 ++-
dist/dhcp/server/dhcpd.leases.5 | 57 +-
dist/dhcp/server/failover.c | 307 ++++-
dist/dhcp/server/mdb.c | 58 +-
dist/dhcp/server/omapi.c | 111 +-
dist/dhcp/server/salloc.c | 51 +-
dist/dhcp/server/stables.c | 53 +-
131 files changed, 5270 insertions(+), 4654 deletions(-)
diffs (truncated from 14918 to 300 lines):
diff -r 5d0162ca4068 -r dfc2ddbd3c30 dist/dhcp/Makefile
--- a/dist/dhcp/Makefile Thu Aug 11 16:54:17 2005 +0000
+++ b/dist/dhcp/Makefile Thu Aug 11 17:13:21 2005 +0000
@@ -1,42 +1,32 @@
# Makefile
#
-# Copyright (c) 2002 Internet Software Consortium.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1995-2003 by Internet Software Consortium
#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Internet Software Consortium nor the names
-# of its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
#
-# THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, 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 OR PERFORMANCE OF THIS SOFTWARE.
#
-# This software has been written for the Internet Software Consortium
+# Internet Systems Consortium, Inc.
+# 950 Charter Street
+# Redwood City, CA 94063
+# <info%isc.org@localhost>
+# http://www.isc.org/
+#
+# This software has been written for Internet Systems Consortium
# by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-# To learn more about the Internet Software Consortium, see
+# To learn more about Internet Systems Consortium, see
# ``http://www.isc.org/''. To learn more about Vixie Enterprises,
# see ``http://www.vix.com''. To learn more about Nominum, Inc., see
# ``http://www.nominum.com''.
-#
all:
@sysname=`./configure --print-sysname`; \
diff -r 5d0162ca4068 -r dfc2ddbd3c30 dist/dhcp/Makefile.conf
--- a/dist/dhcp/Makefile.conf Thu Aug 11 16:54:17 2005 +0000
+++ b/dist/dhcp/Makefile.conf Thu Aug 11 17:13:21 2005 +0000
@@ -1,21 +1,25 @@
# Makefile.conf
#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it. If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1995-2003 by Internet Software Consortium
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
#
-# http://www.isc.org/isc-license-1.0.html.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, 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 OR PERFORMANCE OF THIS SOFTWARE.
#
-# This file is part of the ISC DHCP distribution. The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
+# Internet Systems Consortium, Inc.
+# 950 Charter Street
+# Redwood City, CA 94063
+# <info%isc.org@localhost>
+# http://www.isc.org/
## Defaults...
SCRIPT = none
@@ -43,6 +47,7 @@
LIBS =
COPTS = $(BINDDEF) $(CC_OPTIONS)
DEBUG = -g
+#WARNERR = -Werror
RANLIB = ranlib
MKDEP = mkdep
CLIENT_PATH = '"PATH=/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"'
@@ -123,7 +128,7 @@
#LIBS = -lresolv -lsocket -lnsl -lgen
#CC=gcc
#COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
-# -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror \
+# -Wno-uninitialized -Wno-char-subscripts -Wno-switch $(WARNERR) \
# -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
# $(CC_OPTIONS)
#CF = cf/sunos5-5.h
@@ -199,6 +204,7 @@
## FreeBSD
##--freebsd--
#CF = cf/freebsd.h
+#COPTS = -O -Wall -Wno-unused $(WARNERR) $(CC_OPTIONS)
#SCRIPT=freebsd
##--freebsd--
@@ -206,7 +212,7 @@
##--rhapsody--
#CF = cf/rhapsody.h
#COPTS = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-# -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+# -Wno-uninitialized -Wno-switch $(WARNERR) -pipe $(BINDDEF) $(CC_OPTIONS)
##SCRIPT=rhapsody
##--rhapsody--
@@ -214,7 +220,7 @@
##--darwin--
#CF = cf/rhapsody.h
#COPTS = -Ddarwin -Wall -Wno-unused -Wno-implicit -Wno-comment \
-# -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+# -Wno-uninitialized -Wno-switch $(WARNERR) -pipe $(BINDDEF) $(CC_OPTIONS)
#SCRIPT=freebsd
##--darwin--
@@ -222,30 +228,13 @@
##--netbsd--
#CF = cf/netbsd.h
#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-comment \
-# -Wno-uninitialized -Werror \
-# -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
-# -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes \
-# -Wmissing-declarations -Wnested-externs \
-# -pipe $(BINDDEF) $(CC_OPTIONS)
-#SCRIPT=netbsd
-##MKDEP=makedepend
-##--netbsd--
-
-## NetBSD nocast
-## Some versions of the arm32 gcc have a problem in cast conversions.
-## The Alpha definitely has a problem - if you pass '6' where a size_t
-## is expected, you get a warning. So on these architectures, we do
-## not ask for that sort of warning.
-##--netbsd-nocast--
-#CF = cf/netbsd.h
-#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-comment \
-# -Wno-uninitialized -Werror \
+# -Wno-uninitialized $(WARNERR) \
# -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
# -Wwrite-strings -Wmissing-prototypes \
# -Wmissing-declarations -Wnested-externs \
# -pipe $(BINDDEF) $(CC_OPTIONS)
#SCRIPT=netbsd
-##--netbsd-nocast--
+##--netbsd--
## Ultrix
##--ultrix--
diff -r 5d0162ca4068 -r dfc2ddbd3c30 dist/dhcp/Makefile.dist
--- a/dist/dhcp/Makefile.dist Thu Aug 11 16:54:17 2005 +0000
+++ b/dist/dhcp/Makefile.dist Thu Aug 11 17:13:21 2005 +0000
@@ -1,21 +1,26 @@
# Makefile.dist
#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it. If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1995-2003 by Internet Software Consortium
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
#
-# http://www.isc.org/isc-license-1.0.html.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, 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 OR PERFORMANCE OF THIS SOFTWARE.
#
-# This file is part of the ISC DHCP distribution. The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
+# Internet Systems Consortium, Inc.
+# 950 Charter Street
+# Redwood City, CA 94063
+# <info%isc.org@localhost>
+# http://www.isc.org/
+
SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl
diff -r 5d0162ca4068 -r dfc2ddbd3c30 dist/dhcp/README
--- a/dist/dhcp/README Thu Aug 11 16:54:17 2005 +0000
+++ b/dist/dhcp/README Thu Aug 11 17:13:21 2005 +0000
@@ -1,7 +1,6 @@
- Internet Software Consortium DHCP Distribution
- Version 3.0.1
- Release Candidate 9
- April 28, 2002
+ Internet Systems Consortium DHCP Distribution
+ Version 3.0.3
+ July 22, 2005
README FILE
@@ -97,15 +96,15 @@
RELEASE STATUS
-This is the tenth release candidate of version 3.0.1 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.
+This is the first beta release of ISC DHCP 3.0.3. This is a maintenance
+release which seeks only to fix bugs present in versions 3.0.2 and
+earlier. No new features have or will be added in subsequent
+release candidates of this release.
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
+FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The software
+will also run on AIX and 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.
@@ -143,17 +142,17 @@
To build the DHCP Distribution, unpack the compressed tar file using
the tar utility and the gzip command - type something like:
- zcat dhcp-3.0.1rc11.tar.gz |tar xvf -
+ zcat dhcp-3.0.3.tar.gz |tar xvf -
On BSD/OS, you have to type gzcat, not zcat, and you may run into
similar problems on other operating systems.
CONFIGURING IT
-Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just
-created and configure the source tree by typing:
+Now, cd to the dhcp-3.0.3 subdirectory that you've just created and
+configure the source tree by typing:
- ./configure
+ ./configure
If the configure utility can figure out what sort of system you're
running on, it will create a custom Makefile for you for that
@@ -466,22 +465,46 @@
client is different (not necessarily better or worse) than that of the
ISC client, but in most cases it will be a lot easier for you to just
use that. Please do not ask for help in using the Solaris DHCP client
-on Internet Software Consortium mailing lists - that's why you're
+on Internet Systems Consortium mailing lists - that's why you're
paying Sun the big bucks. If you're having a problem with the
Solaris client interoperating with the ISC dhcp server, that's another
matter, but please check with Sun first.
+ AIX
+
+The AIX support uses the BSD socket API, which cannot differentiate on
Home |
Main Index |
Thread Index |
Old Index