Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcp/dist import new dhcp



details:   https://anonhg.NetBSD.org/src/rev/c450e3e7db82
branches:  trunk
changeset: 342835:c450e3e7db82
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 10 19:44:06 2016 +0000

description:
import new dhcp

diffstat:

 external/bsd/dhcp/dist/LICENSE                         |     2 +-
 external/bsd/dhcp/dist/Makefile.am                     |     4 +-
 external/bsd/dhcp/dist/Makefile.in                     |    12 +-
 external/bsd/dhcp/dist/README                          |    25 +-
 external/bsd/dhcp/dist/RELNOTES                        |  1878 ++++++++++-----
 external/bsd/dhcp/dist/aclocal.m4                      |    37 +
 external/bsd/dhcp/dist/client/Makefile.am              |     6 +
 external/bsd/dhcp/dist/client/Makefile.in              |   206 +-
 external/bsd/dhcp/dist/client/clparse.c                |    43 +-
 external/bsd/dhcp/dist/client/scripts/linux            |     8 +-
 external/bsd/dhcp/dist/client/scripts/openwrt          |     8 +-
 external/bsd/dhcp/dist/client/tests/Atffile            |     5 +
 external/bsd/dhcp/dist/client/tests/Makefile.am        |    39 +
 external/bsd/dhcp/dist/client/tests/Makefile.in        |   717 ++++++
 external/bsd/dhcp/dist/client/tests/duid0_test.txt     |    33 +
 external/bsd/dhcp/dist/client/tests/duid1_test.txt     |     3 +
 external/bsd/dhcp/dist/client/tests/duid2_test.txt     |    66 +
 external/bsd/dhcp/dist/client/tests/duid3_test.txt     |    66 +
 external/bsd/dhcp/dist/client/tests/duid_unittest.c    |   140 +
 external/bsd/dhcp/dist/common/Makefile.in              |     3 +
 external/bsd/dhcp/dist/common/dhcp-eval.5              |    92 +-
 external/bsd/dhcp/dist/common/dhcp-options.5           |    58 +-
 external/bsd/dhcp/dist/common/dlpi.c                   |     8 +-
 external/bsd/dhcp/dist/common/execute.c                |    22 +-
 external/bsd/dhcp/dist/common/lpf.c                    |   126 +-
 external/bsd/dhcp/dist/common/nit.c                    |     6 +-
 external/bsd/dhcp/dist/common/options.c                |   227 +-
 external/bsd/dhcp/dist/common/parse.c                  |   140 +-
 external/bsd/dhcp/dist/common/socket.c                 |    29 +-
 external/bsd/dhcp/dist/common/tests/Makefile.am        |    16 +-
 external/bsd/dhcp/dist/common/tests/Makefile.in        |    59 +-
 external/bsd/dhcp/dist/common/tests/dns_unittest.c     |    20 +-
 external/bsd/dhcp/dist/common/tests/misc_unittest.c    |   167 +
 external/bsd/dhcp/dist/common/tests/ns_name_test.c     |   161 +
 external/bsd/dhcp/dist/common/tests/test_alloc.c       |   106 +-
 external/bsd/dhcp/dist/common/tree.c                   |   252 +-
 external/bsd/dhcp/dist/common/upf.c                    |     6 +-
 external/bsd/dhcp/dist/configure                       |   342 ++-
 external/bsd/dhcp/dist/configure.ac                    |   158 +-
 external/bsd/dhcp/dist/contrib/ldap/README.ldap        |    41 +
 external/bsd/dhcp/dist/contrib/ldap/dhcp.schema        |    28 +-
 external/bsd/dhcp/dist/contrib/ldap/dhcpd-conf-to-ldap |    84 +-
 external/bsd/dhcp/dist/dhcpctl/Makefile.in             |     3 +
 external/bsd/dhcp/dist/dhcpctl/dhcpctl.c               |     5 +-
 external/bsd/dhcp/dist/dhcpctl/omshell.c               |     6 +-
 external/bsd/dhcp/dist/doc/devel/atf.dox               |   123 +-
 external/bsd/dhcp/dist/doc/examples/dhcpd-dhcpv6.conf  |     3 +-
 external/bsd/dhcp/dist/includes/Makefile.am            |     1 +
 external/bsd/dhcp/dist/includes/Makefile.in            |     4 +
 external/bsd/dhcp/dist/includes/dhctoken.h             |     7 +-
 external/bsd/dhcp/dist/includes/failover.h             |     4 +-
 external/bsd/dhcp/dist/includes/ldap_casa.h            |   103 +
 external/bsd/dhcp/dist/includes/ldap_krb_helper.h      |    50 +
 external/bsd/dhcp/dist/includes/minires.h              |     5 +-
 external/bsd/dhcp/dist/includes/omapip/isclib.h        |     9 +-
 external/bsd/dhcp/dist/includes/site.h                 |    73 +-
 external/bsd/dhcp/dist/includes/statement.h            |     8 +-
 external/bsd/dhcp/dist/includes/tree.h                 |     5 +-
 external/bsd/dhcp/dist/omapip/Makefile.in              |     3 +
 external/bsd/dhcp/dist/omapip/errwarn.c                |    13 +-
 external/bsd/dhcp/dist/omapip/inet_addr.c              |    12 +-
 external/bsd/dhcp/dist/omapip/test.c                   |    11 +-
 external/bsd/dhcp/dist/omapip/trace.c                  |    10 +-
 external/bsd/dhcp/dist/relay/Makefile.in               |     3 +
 external/bsd/dhcp/dist/server/Makefile.am              |     5 +-
 external/bsd/dhcp/dist/server/Makefile.in              |    44 +-
 external/bsd/dhcp/dist/server/bootp.c                  |    61 +-
 external/bsd/dhcp/dist/server/class.c                  |    61 +-
 external/bsd/dhcp/dist/server/db.c                     |    27 +-
 external/bsd/dhcp/dist/server/dhcp.c                   |   780 ++++-
 external/bsd/dhcp/dist/server/dhcpd.8                  |    73 +-
 external/bsd/dhcp/dist/server/dhcpd.conf.5             |   333 ++-
 external/bsd/dhcp/dist/server/dhcpd.leases.5           |   267 +-
 external/bsd/dhcp/dist/server/failover.c               |   322 +-
 external/bsd/dhcp/dist/server/ldap.c                   |  1722 ++++++++++++--
 external/bsd/dhcp/dist/server/ldap_casa.c              |     8 +-
 external/bsd/dhcp/dist/server/ldap_krb_helper.c        |   218 +
 external/bsd/dhcp/dist/server/leasechain.c             |   699 +++++
 external/bsd/dhcp/dist/server/stables.c                |    31 +-
 external/bsd/dhcp/dist/server/tests/Makefile.am        |    17 +-
 external/bsd/dhcp/dist/server/tests/Makefile.in        |   452 +---
 external/bsd/dhcp/dist/server/tests/leaseq_unittest.c  |   504 ++++
 external/bsd/dhcp/dist/tests/HOWTO-unit-test           |    48 +-
 external/bsd/dhcp/dist/tests/Makefile.in               |     9 +-
 external/bsd/dhcp/dist/tests/unittest.sh.in            |    79 +
 external/bsd/dhcp/dist/util/bindvar.sh                 |     2 +-
 86 files changed, 9316 insertions(+), 2356 deletions(-)

diffs (truncated from 16282 to 300 lines):

diff -r 9d3074057a3f -r c450e3e7db82 external/bsd/dhcp/dist/LICENSE
--- a/external/bsd/dhcp/dist/LICENSE    Sun Jan 10 19:06:08 2016 +0000
+++ b/external/bsd/dhcp/dist/LICENSE    Sun Jan 10 19:44:06 2016 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2015 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
diff -r 9d3074057a3f -r c450e3e7db82 external/bsd/dhcp/dist/Makefile.am
--- a/external/bsd/dhcp/dist/Makefile.am        Sun Jan 10 19:06:08 2016 +0000
+++ b/external/bsd/dhcp/dist/Makefile.am        Sun Jan 10 19:44:06 2016 +0000
@@ -22,10 +22,10 @@
             doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
             doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \
             doc/devel/omapi.dox doc/devel/qa.dox util/bindvar.sh \
-            bind/Makefile bind/bind.tar.gz bind/version.tmp \
+            bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
             common/tests/Atffile server/tests/Atffile
 
-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
+SUBDIRS = bind includes tests common omapip client dhcpctl relay server
 
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 
diff -r 9d3074057a3f -r c450e3e7db82 external/bsd/dhcp/dist/Makefile.in
--- a/external/bsd/dhcp/dist/Makefile.in        Sun Jan 10 19:06:08 2016 +0000
+++ b/external/bsd/dhcp/dist/Makefile.in        Sun Jan 10 19:44:06 2016 +0000
@@ -81,6 +81,7 @@
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
+       $(top_srcdir)/bind/Makefile.in \
        $(top_srcdir)/doc/devel/doxyfile.in $(nobase_include_HEADERS) \
        README compile config.guess config.sub depcomp install-sh \
        missing
@@ -92,7 +93,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/includes/config.h
-CONFIG_CLEAN_FILES = doc/devel/doxyfile
+CONFIG_CLEAN_FILES = bind/Makefile doc/devel/doxyfile
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -224,12 +225,14 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ATF_BIN = @ATF_BIN@
 ATF_CFLAGS = @ATF_CFLAGS@
 ATF_LDFLAGS = @ATF_LDFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BINDCONFIG = @BINDCONFIG@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -250,6 +253,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDAP_CFLAGS = @LDAP_CFLAGS@
+LDAP_LIBS = @LDAP_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -343,10 +347,10 @@
             doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
             doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \
             doc/devel/omapi.dox doc/devel/qa.dox util/bindvar.sh \
-            bind/Makefile bind/bind.tar.gz bind/version.tmp \
+            bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
             common/tests/Atffile server/tests/Atffile
 
-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
+SUBDIRS = bind includes tests common omapip client dhcpctl relay server
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 all: all-recursive
 
@@ -376,6 +380,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
+bind/Makefile: $(top_builddir)/config.status $(top_srcdir)/bind/Makefile.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 doc/devel/doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/devel/doxyfile.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
diff -r 9d3074057a3f -r c450e3e7db82 external/bsd/dhcp/dist/README
--- a/external/bsd/dhcp/dist/README     Sun Jan 10 19:06:08 2016 +0000
+++ b/external/bsd/dhcp/dist/README     Sun Jan 10 19:44:06 2016 +0000
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.3.0
-                            3 February 2014
+                            Version 4.3.3
+                          03 September 2015
 
                              README FILE
 
@@ -38,6 +38,7 @@
          5.8.3 Other Solaris Items
         5.9     AIX
         5.10    MacOS X
+         5.11    ATF
        6       SUPPORT
         6.1     HOW TO REPORT BUGS
        7       HISTORY
@@ -99,7 +100,7 @@
 
                            RELEASE STATUS
 
-This is ISC DHCP 4.3.0.  The major theme for this release is "ipv6 uplift",
+This is ISC DHCP 4.3.x  The major theme for this release is "ipv6 uplift",
 in which we enhance the v6 code to support many of the features found
 in the v4 code.  These include: support for v6, support for on_commit,
 on_expiry and on_release in v6, support for accessing v6 relay options
@@ -141,12 +142,12 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-       gunzip dhcp-4.3.0.tar.gz
-       tar xvf dhcp-4.3.0.tar
+       gunzip dhcp-4.3.3.tar.gz
+       tar xvf dhcp-4.3.3.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.3.0 subdirectory that you've just created and
+Now, cd to the dhcp-4.3.3 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure
@@ -585,6 +586,18 @@
 Running the dhclient-script reinstalls the resolv.conf.dhclient6
 configuration.
 
+
+                              ATF
+
+Please see the file DHCP/doc/devel/atf.dox for a description of building
+and using these tools.  
+
+The optional unit tests use ATF (Automated Testing Framework) including
+the atf-run and atf-report tools. ATF deprecated these tools in
+version 0.19 and removed these tools from its sources in version 0.20,
+requiring you to get an older version, use Kyua with an ATF compatibility
+package or use the version included in the Bind sources.
+
                               SUPPORT
 
 The Internet Systems Consortium DHCP server is developed and distributed
diff -r 9d3074057a3f -r c450e3e7db82 external/bsd/dhcp/dist/RELNOTES
--- a/external/bsd/dhcp/dist/RELNOTES   Sun Jan 10 19:06:08 2016 +0000
+++ b/external/bsd/dhcp/dist/RELNOTES   Sun Jan 10 19:44:06 2016 +0000
@@ -1,12 +1,12 @@
-             Internet Systems Consortium DHCP Distribution
-                             Version 4.3.0
-                            3 February 2014
-
-                             Release Notes
-
-                             NEW FEATURES
-
-The major "theme" for ISC DHCP 4.3.x was to update the suport for
+                Internet Systems Consortium DHCP Distribution
+                             Version 4.3.3
+                            03 September 2015
+
+                             Release Notes
+
+                              NEW FEATURES
+
+The major "theme" for ISC DHCP 4.3.x was to update the support for
 DHCPv6 to include several of the features that have been available
 for DHCPv4.  These include:
 
@@ -52,6 +52,569 @@
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay%cryptsoft.com@localhost).
 
+                       Changes since 4.3.3b1
+
+- None
+
+                       Changes since 4.3.2
+
+- The server now does a better check to see if it can allocate the memory
+  for large blocks of v4 leases and should provide a slightly better error
+  message.  Note well: the server pre-allocates v4 addresses, if you use
+  a large range, such as a /8, the server will attempt to use a large
+  amount of memory and may not start if there either isn't enough memory
+  or the size exceeds what the code supports.
+  [ISC-Bugs #38637]
+
+- The server will now reject unicast Request, Renew, Decline, and Release
+  messages from a client unless the server would have sent that client the
+  dhcp6.unicast option.  This behavior is in compliance with paragraph 1 in
+  each of the sections 18.2,1, 18.2.3, 18.2.6, and 18.2.7 of RFC 3315. Prior
+  to this, the server would simply accept the messages.  Now, in order for
+  the server to accept such a message, the server configuration must include
+  the dhcp6.unicast option either globally or within the shared network to
+  which the requested lease belongs. In other words, the server will map
+  the first IA_XX address found within the client message to a shared-network
+  and look for the presence of the unicast option there and then globally.
+  Thanks to Jiri Popelka at Red Hat for this issue and his patch which
+  inspired the fix.
+  [ISC-Bugs #21235]
+
+- The ATF (Automated Testing Framework) tools used for optional unit tests
+  can now be built from its embedded sources in bind, solving the
+  atf-run / atf-report issue with recent (>= 0.20) versions of ATF.
+  The new configuration option is "./configure --with-atf=bind".
+  [ISC-Bugs #38754, #39300]
+
+- Corrected a compilation error introduced by the fix for ISC-Bugs #22806.
+  On older linuxes that do not include the tpacket_auxdata structure don't
+  bother allocating the cmsgbuf as it isn't necessary and we don't have
+  a proper length for it.
+  [ISC-Bugs #39209]
+
+- Remove the dst directory.  This was replaced in 4.2.0 with the dst
+  code from the Bind libraries but we continued to include it for
+  backwards compatibility.  As we have now released 4.3.x it seems
+  reasonable to remove it.
+  [ISC-Buts #39019]
+
+- Write out the DUID server id on startup in all cases, previously if it
+  was read in from server-duid option in the config or lease files for 
+  DHCPv4 it would not be written to the new lease file.
+  [ISC-Bugs #37791]
+
+- When parsing dates for leases convert dates past 2038 to "never".
+  This avoids problems with integer overflows in the date and time
+  handling code for people that decide to use very large lease times
+  or add a lease entry with a date far in the future.
+  [ISC-Bugs #33056]
+
+- Leave the siaddr field clear when sending a NACK as per RFC 2131
+  table 3.
+  [ISC-Bugs #38769]
+
+- In the client don't send expired addresses to the script as part of
+  the binding process.  Thanks to Sven Trenkel at Google for reporting
+  the issue and suggesting the patch.
+  [ISC-Bugs #38631]
+
+- While parsing IPv6 addresses treat "add" as part of the address instead
+  of as a token.
+  [ISC-Bugs #39529]
+
+- Add support for accessing the v4 lease queues (active, free etc) in a
+  binary fashion instead of needing to walk through a linear list to
+  insert, find or remove an entry from the queues.  In addition add a
+  compile time option "--enable-binary-leases" to enable the new code
+  or to continue using the old code.  The old code is the default.
+  Thanks to Fernando Soto from BlueCat Networks for the patch.
+  [ISC-Bugs #39078]
+
+- Delayed-ack now works properly with Failover. Prior to this, bind updates
+  post startup were being queued but never delivered. Among other things, this
+  was causing leases to not transition from expired or released to free.
+  [ISC-Bugs #31474]
+
+- Clean up parsing of v6 lease files a bit to avoid infinite loops if the
+  lease file is corrupt in certain ways.
+  [ISC-Bugs #39760]
+
+- Corrected a crash in dhclient that occurs during lease renewal if the
+  client is performing its own DNS updates.  Thanks to Jiri Popelka at Red Hat
+  for the bug report.
+  [ISC-Bugs #38639]
+
+- Corrected an issue in v6 lease file parsing. Prior to this, when encountering
+  a lease with an address for which no configured pool exists, the server was
+  declaring the lease file corrupt and incorrectly skipping over the subsequent
+  entry in the file.  The server will now emit a log message indicating that
+  no pool was found for the address (or prefix) and correctly resume parsing
+  with the next entry in the lease file.  Our thanks to Michal Žejdl for 
+  reporting the issue.
+  [ISC-Bugs #39314]
+
+- Be more liberal in finding a subnet group associated with a static
+  prefix.  When we added the class matching code for v6 we also added
+  a requirement that the static prefix must be within a subnet the
+  client was in, in order to find the proper statements.  We now
+  look for a subnet based on the prefix, failing that on the static
+  address for the client and failing that on the shared network
+  itself.
+  [ISC-Bugs #38329]
+
+- Add a new action expression "parse_vendor_options", which can be used
+  to parse a vendor-encapsualted-option received by the server based on
+  the encoding specified by the vendor-option-space statement.
+  [ISC-Bugs #36449]
+
+- Enhance the PARANOIA patch to include fchown() the lease file to
+  allow it to be manipulated after the server does a chown().



Home | Main Index | Thread Index | Old Index