Import ISC DHCP 3.0.1 RC6 client.

1 files changed, 236 insertions, 70 deletions

diff --git a/contrib/isc-dhcp/Makefile.conf b/contrib/isc-dhcp/Makefile.conf
index 509e32f..a8c64ac 100644
--- a/contrib/isc-dhcp/Makefile.conf
+++ b/contrib/isc-dhcp/Makefile.conf
@@ -1,53 +1,56 @@
 # Makefile.conf
 #
-# Copyright (c) 1996, 1997, 1998, 1999 The Internet Software Consortium.
-# All rights reserved.
+# Copyright (c) 1996-2000 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+#             http://www.isc.org/isc-license-1.0.html. 
 #
-# 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 The 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.
+# 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.
 #
-# 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.
+# Support and other services are available for ISC products - see
+# http://www.isc.org for more information.
 #
 
 ## Defaults...
 SCRIPT = none
+USERBINDIR = /usr/bin
 BINDIR = /usr/sbin
 CLIENTBINDIR=/sbin
-ADMMANEXT = .0
-FFMANEXT = .0
 ADMMANDIR = /usr/share/man/cat8
+ADMMANEXT = .0
 FFMANDIR = /usr/share/man/cat5
-INSTALL = install -c
-MANINSTALL = install -c -m 444
+FFMANEXT = .0
+LIBMANDIR = /usr/share/man/cat3
+LIBMANEXT = .0
+USRMANDIR = /usr/share/man/cat1
+USRMANEXT = .0
+MANCAT = cat
+INSTALL = install -c -m 444
+MANINSTALL = install -c
 CHMOD = chmod
 CATMANPAGES =
-MANCAT = cat
 ETC = /etc
 VARRUN = /var/run
 VARDB = /var/db
+LIBDIR=/usr/local/lib
+INCDIR=/usr/local/include
+LIBS =
+COPTS = $(BINDDEF) $(CC_OPTIONS)
+DEBUG = -g
+RANLIB = ranlib
+MKDEP = mkdep
 CLIENT_PATH = '"PATH=/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"'
 
+BINDLIB = ../minires/libres.a
+BINDINC =
+MINIRES = minires
+
 # Major version number (if applicable)
 ##--majver--
 MAJORVERSION=MajorVersion
@@ -70,12 +73,12 @@ MINORVERSION=MinorVersion
 # removes the comment characters from the appropriate set of
 # assignments, and writes the output to Makefile.
 
-## AIX 4.1.5.0
+## AIX 4.3
 ##--aix--
 #CF = cf/aix.h
 #CC=cc -Daix
-#INSTALL=/usr/ucb/install
-#MANINSTALL=/usr/ucb/install
+#INSTALL=/usr/ucb/install -c
+#MANINSTALL=/usr/ucb/install -c -m 444
 #ADMMANEXT = .8
 #FFMANEXT = .5
 #VARRUN = /etc
@@ -84,21 +87,25 @@ MINORVERSION=MinorVersion
 
 ## NEXTSTEP 3.x,4.x
 ##--nextstep--
-#LIBS =
 #CF = cf/nextstep.h
 #CC=cc
-#COPTS = -Wall
+#COPTS = -Wall $(BINDDEF) $(CC_OPTIONS)
 #BINDIR=/usr/etc
 #ADMMANDIR = /usr/local/man/cat8
 #FFMANDIR = /usr/local/man/cat5
+#LIBMANDIR = /usr/local/man/cat3
+#USRMANDIR = /usr/local/man/cat1
 #ADMMANEXT = .8
 #FFMANEXT = .5
+#LIBMANEXT = .3
+#USRMANEXT = .3
 #VARRUN = /etc
 #VARDB = /etc
 ##--nextstep--
 
 ## SunOS 4.1
 ##--sunos4--
+#CC = gcc
 #LIBS = -lresolv
 #CF = cf/sunos4.h
 #BINDIR=/usr/etc
@@ -115,13 +122,20 @@ MINORVERSION=MinorVersion
 #MANINSTALL=/usr/ucb/install
 #LIBS = -lresolv -lsocket -lnsl -lgen
 #CC=gcc
-#COPTS = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#	 -Wno-uninitialized -Wno-char-subscripts -Werror
+#COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#	 -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror \
+#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
+#	 $(CC_OPTIONS)
 #CF = cf/sunos5-5.h
-#ADMMANDIR = /usr/share/man/cat1m
+#ADMMANDIR = /usr/share/man/man1m
 #ADMMANEXT = .1m
-#FFMANDIR = /usr/share/man/cat4
+#FFMANDIR = /usr/share/man/man4
 #FFMANEXT = .4
+#LIBMANDIR = /usr/share/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/share/man/man1
+#USRMANEXT = .1
+#MANCAT = man
 #VARRUN = /etc
 #VARDB = /etc
 #SCRIPT=solaris
@@ -131,14 +145,21 @@ MINORVERSION=MinorVersion
 ##--sunos5-cc--
 #INSTALL=/usr/ucb/install
 #MANINSTALL=/usr/ucb/install
-#LIBS = -lresolv -lsocket -lnsl -lgen
+#LIBS = -lresolv -lsocket -lnsl -lgen 
 #CC=cc
-#COPTS = -D__svr4__
+#COPTS = -D__svr4__ $(BINDDEF) -erroff=E_END_OF_LOOP_CODE_NOT_REACHED \
+#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
+#	 $(CC_OPTIONS)
 #CF = cf/sunos5-5.h
-#ADMMANDIR = /usr/share/man/cat1m
+#ADMMANDIR = /usr/share/man/man1m
 #ADMMANEXT = .1m
-#FFMANDIR = /usr/share/man/cat4
+#FFMANDIR = /usr/share/man/man4
 #FFMANEXT = .4
+#LIBMANDIR = /usr/share/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/share/man/man1
+#USRMANEXT = .1
+#MANCAT = man
 #VARRUN = /etc
 #VARDB = /etc
 #SCRIPT=solaris
@@ -146,23 +167,35 @@ MINORVERSION=MinorVersion
 
 ## DEC Alpha/OSF1
 ##--alphaosf--
-#CC=cc -std0
-#INSTALL=/usr/ucb/installbsd
-#MANINSTALL=/usr/ucb/installbsd
-#LIBS=
+#COPTS = -std $(CC_OPTIONS)
+#INSTALL=/usr/ucb/installbsd -c
+#MANINSTALL=/usr/ucb/installbsd -c
 #CF = cf/alphaosf.h
 #ADMMANEXT = .8
 #FFMANEXT = .5
 #VARDB = /etc
 ##--alphaosf--
 
-## BSD/OS 2.1
+## BSD/OS 2.1 through 4.0
 ##--bsdos--
-#LIBS= -lresolv
+#LIBS = -lresolv
 #CC=gcc2
 #CF = cf/bsdos.h
+#SCRIPT=bsdos
 ##--bsdos--
 
+## BSD/OS 4.1 and higher.
+##--bsdos-4.1--
+#CF = cf/bsdos.h
+#SCRIPT=bsdos
+##--bsdos-4.1--
+
+## OpenBSD
+##--openbsd--
+#CF = cf/openbsd.h
+#SCRIPT=openbsd
+##--openbsd--
+
 ## FreeBSD
 ##--freebsd--
 #CF = cf/freebsd.h
@@ -173,18 +206,47 @@ MINORVERSION=MinorVersion
 ##--rhapsody--
 #CF = cf/rhapsody.h
 #COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#	  -Wno-uninitialized -Werror -pipe
-#SCRIPT=rhapsody
+#	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+##SCRIPT=rhapsody
 ##--rhapsody--
 
+## Darwin/MacOSX
+##--darwin--
+#CF = cf/rhapsody.h
+#COPTS  = -Ddarwin -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+##SCRIPT=rhapsody
+##--darwin--
+
 ## NetBSD
 ##--netbsd--
 #CF = cf/netbsd.h
-#COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
-#	  -Wno-uninitialized -Werror -pipe
+#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 \
+#	  -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
+#	  -Wwrite-strings -Wmissing-prototypes \
+#	  -Wmissing-declarations -Wnested-externs \
+#	  -pipe $(BINDDEF) $(CC_OPTIONS)
+#SCRIPT=netbsd
+##--netbsd-nocast--
+
 ## Ultrix
 ##--ultrix--
 #BINDIR = /usr/etc
@@ -196,66 +258,98 @@ MINORVERSION=MinorVersion
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/cat3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/cat1
+#USRMANEXT = .1
 ##--ultrix--
 
 ## Linux 1.x
 ##--linux-1--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp	# see rationale in includes/cf/linux.h
+#VARDB = /var/state/dhcp
 #SCRIPT=linux
 ##--linux-1--
 
 ## Linux 2.0
 ##--linux-2.0--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp	# see rationale in includes/cf/linux.h
+#VARDB = /var/state/dhcp
 #SCRIPT=linux
 ##--linux-2.0--
 
 ## Linux 2.1
 ##--linux-2.1--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
-#FFMANDIR = /usr/share/man/man5
+#FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp	# see rationale in includes/cf/linux.h
+#VARDB = /var/state/dhcp
 #SCRIPT=linux
 ##--linux-2.1--
 
 ## Linux 2.2
 ##--linux-2.2--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
-#FFMANDIR = /usr/share/man/man5
+#FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp	# see rationale in includes/cf/linux.h
+#VARDB = /var/state/dhcp
 #SCRIPT=linux
 ##--linux-2.2--
 
-## SCO
-##--sco--
+## SCO UnixWare 7
+##--uw7--
+#CF = cf/uw7.h
+#PREDEFINES=-DUW7
+#RANLIB=true
+#LIBS = -lresolv -lsocket -lnsl -lgen
+##--uw7--
+
+## SCO (with standard cc compiler)
+##--sco-cc--
 #CF = cf/sco.h
 #PREDEFINES=-DSCO -DBROKEN_ANSI
 #BINDIR = /usr/etc
@@ -271,7 +365,30 @@ MINORVERSION=MinorVersion
 #VARRUN = /etc
 #VARDB = /etc
 #CATMANPAGES=
-##--sco--
+##--sco-cc--
+
+## SCO (with GNU gcc compiler)
+##--sco-gcc--
+#CF = cf/sco.h
+#CC=gcc
+#PREDEFINES=-DSCO
+#LIBS = -lsocket
+#USERBINDIR = /usr/local/dhcp/bin
+#BINDIR = /usr/local/dhcp/bin
+#CLIENTBINDIR = /usr/local/dhcp/bin
+#ADMMANDIR = /usr/local/dhcp/man/cat.ADMN
+#ADMMANEXT = .ADMN.Z
+#FFMANDIR = /usr/local/dhcp/man/cat.SFF
+#FFMANEXT = .SFF.Z
+#INSTALL = /usr/local/bin/install
+#MANFROM = <
+#MANINSTALL = compress
+#MANTO = >
+#VARRUN = /usr/local/dhcp/var
+#VARDB = /usr/local/dhcp/var
+#CATMANPAGES=
+#CLIENT_PATH = '"PATH=/bin:/etc:/usr/bin:/tcb/bin:/usr/bin/X11:/usr/local/bin:/usr/local/dhcp/bin"'
+##--sco-gcc--
 
 ## QNX
 ##--qnx--
@@ -280,9 +397,13 @@ MINORVERSION=MinorVersion
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /etc
-#COPTS=-w3 -Dlint
+#COPTS=-w3 -Dlint $(BINDDEF) $(CC_OPTIONS)
 #LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket
 #MANINSTALL = /bin/true 
 #INSTALL = cp
@@ -290,6 +411,26 @@ MINORVERSION=MinorVersion
 #CLIENTBINDIR = /etc
 ##--qnx--
 
+
+## QNX RTP (v6, NTO)
+##--qnxnto--
+#CF = cf/qnx.h
+#ADMMANDIR = /opt/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /opt/man/man5
+#FFMANEXT = .5
+#LIBMANDIR = /opt/man/man3
+#LIBMANEXT = .3
+#MANCAT = man
+#COPTS=-w3 -Dlint $(BINDDEF)
+#LFLAGS=-l socket
+#MANINSTALL = /bin/cp
+#INSTALL = /bin/cp
+#BINDIR = /opt/sbin
+#USERBINDIR= /opt/bin
+#CLIENTBINDIR = /opt/sbin
+##--qnxnto--
+
 ## CygWin32
 ##--cygwin32--
 #CF = cf/cygwin32.h
@@ -297,6 +438,10 @@ MINORVERSION=MinorVersion
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #VARRUN = /etc
 #MANINSTALL = /bin/true 
 #INSTALL = cp
@@ -313,16 +458,19 @@ MINORVERSION=MinorVersion
 
 ## IRIX 6.x
 ##--irix--
-#LIBS = -lbind
-#LFLAGS=$(DEBUG) -L/usr/local/lib -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,134
+#LFLAGS=$(DEBUG) -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,134
 #CC=gcc
-#COPTS = -I/usr/local/include
+#COPTS = -I/usr/local/include $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/irix.h
 #BINDIR = /usr/local/etc
 #ADMMANDIR = /usr/local/man/man8
 #ADMMANEXT = .8
 #FFMANDIR = /usr/local/man/man5
 #FFMANEXT = .5
+#LIBMANDIR = /usr/local/man/man3
+#LIBMANEXT = .3
+#USRMANDIR = /usr/local/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #INSTALL = install
 #MANINSTALL = install
@@ -331,3 +479,21 @@ MINORVERSION=MinorVersion
 #VARRUN = /etc
 #VARDB = /usr/local/etc/dhcp
 ##--irix--
+
+## HP-UX
+##--hpux-cc--
+#COPTS = $(BINDDEF) $(CC_OPTIONS)
+#LFLAGS = -Wl,+vnocompatwarnings
+#INSTALL = install -i
+#MANINSTALL = install -i
+##--hpux-cc--
+
+## HP-UX with gcc
+##--hpux-gcc--
+#CC = gcc
+#CF = cf/hpux.h
+#INSTALL = install -i
+#ADMMANEXT = .8
+#FFMANEXT = .5
+#MANINSTALL = install -i -m 444
+##--hpux-gcc--