resolved merge conflicts

Author: wwencel

.gitignore

@@ -1,5 +1,7 @@
 *.lo
 *.o
+*.a
+*.log
 doc/html
 .deps
 Makefile
@@ -9,6 +11,7 @@ client/tests/duid_unittests
 client/tests/test-suite.log
 common/tests/alloc_unittest
 common/tests/dns_unittest
+common/tests/domain_name_unittest
 common/tests/misc_unittest
 common/tests/ns_name_unittest
 common/tests/option_unittest
@@ -24,6 +27,7 @@ libtool
 ltmain.sh
 omapip/svtest
 relay/dhcrelay
+relay/tests/relay_unittests
 server/dhcpd
 server/tests/dhcpd_unittests
 server/tests/hash_unittests
@@ -34,3 +38,6 @@ server/tests/test-suite.log
 tests/libt_api.a
 tests/libt_api.la
 tests/unittest.sh
+
+bind/bind-*
+bind/include

CONTRIBUTING.md

@@ -7,6 +7,12 @@ We do not require a contributors agreement. By submitting a patch or merge reque
 you are agreeing that your code will be covered by the primary license for the project.
 ISC DHCP is currently licensed under the MPL2.0 license.
 
+**NOTE**: The client (dhclient) and relay (dhcrelay) component maintenance is coming to an end.
+The 4.4.3 release is the last one that included those components and they are now considered EOL.
+The 4.5.0 release will feature server (dhcpd) only. You may still submit bugs for a client or
+relay, but those will be kept for informational purposes only. There will not be any action
+taken by ISC team on those.
+
 Here's are the steps in contributing a patch:
 
 1. **create account** on [gitlab](https://gitlab.isc.org)
@@ -193,4 +199,4 @@ Outstanding, select a small number of them and move them to whatever the current
 that in mind if you plan to submit a patch and forget about it. We may accept it eventually, but
 it's a much, much faster process if you participate in it.
 
-#### Thank you for contributing your time and expertise to the ISC DHCP Project.
+**Thank you for contributing your time and expertise to the ISC DHCP Project.**

LICENSE

@@ -1,20 +1,6 @@
-# Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2022 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
-# 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.
-#
-#   Internet Systems Consortium, Inc.
-#   950 Charter Street
-#   Redwood City, CA 94063
-#   <info@isc.org>
-#   https://www.isc.org/
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0, included below.
 #

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -184,9 +184,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/doc/devel/doxyfile.in README compile \
 	config.guess config.sub depcomp install-sh missing
@@ -228,6 +225,8 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -259,6 +258,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -270,6 +271,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -558,7 +560,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -706,7 +707,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \

README

@@ -1,6 +1,6 @@
 	      Internet Systems Consortium DHCP Distribution
-			     Version 4.4.2-P1
-			       26 May 2021
+			     Version 4.4.3b1
+			    26 January 2022
 
 			      README FILE
 
@@ -62,13 +62,15 @@ documented in the dhclient-script man page.   The format of the DHCP
 client lease database is documented in the dhclient.leases man page.
 The source for all these man pages is in the client/ subdirectory in
 the distribution.   In addition, the dhcp-options man page should be
-referred to for information about DHCP options.
+referred to for information about DHCP options. The client component
+is End-of-Life and will not be part of future releases.
 
 DHCP relay agent documentation is in the dhcrelay man page, the source
-for which is distributed in the relay/ subdirectory.
+for which is distributed in the relay/ subdirectory. The relay component
+is End-of-Life and will not be part of future releases.
 
 KEA Migration Assistant documentation, including how to build, install
-and use it, is including in the keama directory.
+and use it, is included in the keama/ directory.
 
 To read installed manual pages, use the man command.  Type "man page"
 where page is the name of the manual page.   This will only work if
@@ -90,19 +92,25 @@ will not be correct for your operating system until after you iterate
 'make install' (so if you're reading a manpage out of the source
 directory, it may not have up-to-date information).
 
+				RELEASE STATUS
+
+Version 4.4.3b1 is a maintenance release of the DHCP client, relay and
+server. It is the final release for the client and relay components,
+which have reached end-of-life and will no longer be maintained.
+
 		    BUILDING THE DHCP DISTRIBUTION
 
 			     UNPACKING IT
 
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	gunzip dhcp-4.4.2-P1.tar.gz
-	tar xvf dhcp-4.4.2-P1.tar
+	gunzip dhcp-4.4.3b1.tar.gz
+	tar xvf dhcp-4.4.3b1.tar
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-4.4.2-P1 subdirectory that you've just created and
+Now, cd to the dhcp-4.4.3b1 subdirectory that you've just created and
 configure the source tree by typing:
 
 	./configure
@@ -348,7 +356,7 @@ more information, consult the vconfig man pages.
 			       ATF
 
 Please see the file DHCP/doc/devel/atf.dox for a description of building
-and using these tools.  
+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
@@ -384,7 +392,7 @@ the dhcp-users or dhcp-announce mailing lists.
 WHERE TO SEND FEATURE REQUESTS: We like to hear your feedback.  We may
 not respond to it all the time, but we do read it.  If ISC DHCP doesn't
 work well for you, or you have an idea that would improve it for your
-use, please create an issue at https://gitlab.isc.org/isc-projects/dhcp/issues.  
+use, please create an issue at https://gitlab.isc.org/isc-projects/dhcp/issues.
 This is also an excellent place to send patches that add new features.
 
 WHERE TO REPORT BUGS: If you want the act of sending in a bug report
@@ -393,17 +401,20 @@ software, you are asking for help.  Your bug report is helpful to us,
 but fundamentally you are making a support request, so please use the
 addresses described in the previous paragraphs.  If you are _sure_ that
 your problem is a bug, and not user error, or if your bug report
-includes a patch, you can submit it to our ticketing system at 
-https://gitlab.isc.org/isc-projects/dhcp/issues.  If you have not received 
+includes a patch, you can submit it to our ticketing system at
+https://gitlab.isc.org/isc-projects/dhcp/issues.  If you have not received
 a notice that the ticket has been resolved, then we're still working on it.
+Notice that this is the final release that features client and relay
+components. Reporting bugs in them makes limited sense. The ISC team
+will not be fixing any issues related to client or relay. They may be
+useful for other users to document some problems or perhaps discuss
+and share workarounds.
 
 PLEASE DO NOT REPORT BUGS IN OLD SOFTWARE RELEASES!  Fetch the latest
 release and see if the bug is still in that version of the software,
-and if it is still present, _then_ report it.  ISC release versions 
-always have three numbers, for example: 1.2.3.  The 'major release' is 
-1 here, the 'minor release' is 2, and the 'maintenance release' is 3.  
-ISC will accept bug reports against the most recent two major.minor
-releases: for example, 1.0.0 and 0.9.0, but not 0.8.* or prior.
+and if it is still present, _then_ report it.  ISC release versions
+always have three numbers, for example: 1.2.3.  The 'major release' is
+1 here, the 'minor release' is 2, and the 'maintenance release' is 3.
 
 PLEASE take a moment to determine where the ISC DHCP distribution
 that you're using came from.  ISC DHCP is sometimes heavily modified
@@ -483,7 +494,8 @@ agent. DHCP 3 was released in October 2001 and included DHCP failover
 support, OMAPI, Dynamic DNS, conditional behaviour, client classing,
 and more. Version 3 of the DHCP server was funded by Nominum, Inc.
 The 4.0 release in December 2007 introduced DHCPv6 protocol support
-for the server and client.
+for the server and client. The client and relay components reached
+their End-of-Life in January 2022.
 
 This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).

RELNOTES

@@ -1,16 +1,16 @@
                 Internet Systems Consortium DHCP Distribution
-                            Version 4.4.2-P1
-                              26 May 2021
+                            Version 4.4.3b1
+                            26 January 2022
                              Release Notes
 
                               NEW FEATURES
 
-Please note that that ISC DHCP is now licensed under the Mozilla Public License,
-MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0
-license terms.
+Please note that that ISC DHCP is now licensed under the Mozilla Public
+License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read
+the MPL 2.0 license terms.
 
-Release 4.4.2-P1 is a security release fixing possible buffer overwrite error
-in client and server while parsing haxadecimal literals in lease file.
+NOTE: The client and relay components are now End-Of-Life.
+4.4.3 is the final release for those components.
 
 For information on how to install, configure and run this software, as
 well as how to find documentation and report bugs, please consult the
@@ -19,21 +19,66 @@ README file.
 ISC DHCP uses standard GNU configure for installation. Please review the
 output of "./configure --help" to see what options are available.
 
-The system has only been tested on Linux, FreeBSD, and Solaris, and may not
-work on other platforms. Please report any problems and suggested fixes to
+The system has only been tested on Linux, and FreeBSD, and may not work on
+other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
 ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
+		Changes since 4.4.2-P1 (New Features)
+
+- BIND libraries updated to the latest version, 9.11.36. This fixes a number
+  of compilation issues on various systems, including OpenWRT. Thanks to
+  Philip Prindeville for testing on OpenWRT.
+  [Gitlab #218, #171, #180, #192]
+
+- Added support for the new DHCPv4 option v6-only-preferred specified
+  in RFC 8925. A new reason code, V6ONLY, was added to the client script
+  and the client Linux script sample was updated.
+  [Gitlab #132]
+
+		Changes since 4.4.2-P1 (Bug Fixes)
+
+- Minor corrections to allow compilation under gcc 10.
+  [Gitlab #117]
+
+- Corrected logic in dhclient that causes it to decline DHCPv4 leases if the
+  client script exits abnormally (i.e. crashes).
+  [Gitlab #123]
+
+- The limit on the size of lease file that can be loaded at start up
+  is now only enforced on 32-bit systems.
+  [Gitlab #92]
+
+- The PRNG initialization has been improved. It now uses the configure flag
+  `--with-randomdev=PATH`, which specifies the device from which to read the
+  initial seed. That is typically `/dev/random` (the default value) or
+  `/dev/urandom`, but may be specified otherwise on the local system. If not
+  explicitly specified, the default device (`/dev/random`) is used. The old
+  behavior can be forced by disabling this feature (`--with-randomdev=no`).
+  If the initialization is disabled or reading from the random device fails,
+  the previous algorithm (retrieve the last four bytes of hardware addresses
+  from all network interfaces that have them, and use the current time and
+  process ID) is used.
+  [Gitlab #197]
+
+- Minor dhclient code fix to remove compilation warnings.
+  [Gitlab #190]
+
+- Removed hard-coded MD5 algorithm name in OMAPI connection logic. Prior
+  to this using any other algorithm via key-algorithm statement would
+  allow OMAPI connections to made but subsequent actions such as updating
+  an object to fail.
+  [Gitlab #148]
+
 		Changes since 4.4.2 (Bug Fixes)
 
- ! Corrected a buffer overwrite possible when parsing hexadecimal
-   literals with more than 1024 octets. Reported by Jon Franklin from Dell,
-   and also by Pawel Wieczorkiewicz from Amazon Web Services.
-   [Gitlab #182]
-   CVE: CVE-2021-25217
+- Corrected a buffer overwrite possible when parsing hexadecimal
+  literals with more than 1024 octets.
+  [Gitlab #182]
+  CVE: CVE-2021-25217
 
 		Changes since 4.4.2b1 (Bug Fixes)
 
@@ -53,11 +98,11 @@ by Eric Young (eay@cryptsoft.com).
 - Corrected buffer pointer logic in dhcrelay functions that manipulate
   agent relay options. Thanks to Thomas Imbert of MSRC Vulnerabilities
   & Mitigations for reporting the issue.
-  [#71]
+  [Gitlab #71]
 
 - Corrected unresolved symbol errors building relay_unittests when
   configured to build using libtool.
-  [#80]
+  [Gitlab #80]
 
 		Changes since 4.4.1 (New Features)