pre release changes

diff --git a/LICENSE b/LICENSE
index b7c85280b60a12eae1cb150bab45c277afa23d0b..cb3079169fd45d284264915bfc1e852684e4eaa0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2021 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

diff --git a/README b/README
index 63cafb1cefa6397e6ecb0d118a2eabb8b252149f..3fbd41a7d7d8bca76c9c65b3ce41a7aab2a58364 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
              Internet Systems Consortium DHCP Distribution
-                            Version 4.4.2
+                            Version 4.4.2-P1
                            22 January 2020
 
                              README FILE
@@ -97,12 +97,12 @@ directory, it may not have up-to-date information).
 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.tar.gz
-       tar xvf dhcp-4.4.2.tar
+       gunzip dhcp-4.4.2-P1.tar.gz
+       tar xvf dhcp-4.4.2-P1.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.4.2 subdirectory that you've just created and
+Now, cd to the dhcp-4.4.2-P1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index a4031096b0d3d391e345280f4994153d958c0fb8..df3683eeca04075149f6c008b28904e6a1da4700 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -9,84 +9,8 @@ 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.
 
-While release 4.4.2 is primarily a maintenance release that addresses a number
-of defects, it does introduce a few new features:
-
-- Keama - Keama is a migration utility that assists in converting ISC DHCP
-  server configuration files to Kea configuration files.  It is found in the
-  keama subdirectory and includes a README.md file with instructions on how
-  to build it as well as a manpage on its usage.
-
-- Two new server parameters related to ping checking were added:
-
-1. ping-cltt-secs which allows the user to specify the number of seconds
-   that must elapse since CLTT before a ping check is conducted.
-
-2. ping-timeout-ms which allows the user to specify the amount of time the
-   server waits for a ping-check response in milliseconds rather than in
-   seconds.
-
-In general, the areas of focus for ISC DHCP 4.4 were:
-
-1. Dynamic DNS additions
-2. dhclient improvements
-3. Support for dynamic shared libraries
-
-Dynamic DNS Improvements:
-
-- We added three new server configuration parameters which influence DDNS
-  conflict resolution:
-
-    1. ddns-dual-stack-mixed-mode - alters DNS conflict resolution behavior
-    to mitigate issues with non-compliant clients in dual stack environments.
-
-    2. ddns-guard-id-must-match - relaxes the DHCID RR client id matching
-    requirement of DNS conflict resolution.
-
-    3. ddns-other-guard-is-dynamic - alters dual-stack-mixed-mode behavior to
-    allow unguarded DNS entries to be overwritten in certain cases
-
-- The server now honors update-static-leases parameter for static DHCPv6
-  hosts.
-
-dhclient Improvements:
-
-  - We've added three command line parameters to dhclient:
-
-    1. --prefix-len-hint - directs dhclient to use the given length as
-    the prefix length hint when requesting prefixes
-
-    2. --decline-wait-time - instructs the client to wait the given number
-    of seconds after declining an IPv4 address before issuing a discover
-
-    3. --address-prefix-len - specifies the prefix length passed by dhclient
-    into the client script (via the environment variable ip6_prefixlen) with
-    each IPv6 address.  We added this parameter because we have changed the
-    default value from 64 to 128 in order to be compliant with RFC3315bis
-    draft (-09, page 64) and RFC5942, Section 4, point 1.
-    **WARNING**: The new default value of 128 may not be backwardly compatible
-    with your environment. If you are operating without a router, such as
-    between VMs on a host, you may find they cannot see each other with prefix
-    length of 128. In such cases, you'll need to either provide routing or use
-    the command line parameter to set the value to 64. Alternatively you may
-    change the default at compile time by setting DHCLIENT_DEFAULT_PREFIX_LEN
-    in includes/site.h.
-
-  - dhclient will now generate a DHCPv6 DECLINE message when the client script
-    indicates a DAD failure
-
-Dynamic shared library support:
-
-  Configure script, configure.ac+lt, which supports libtool is now provided
-  with the source tar ball.  This script can be used to configure ISC DHCP
-  to build with libtool and thus use dynamic shared libraries.
-
-Other Highlights:
-
- - The server now supports dhcp-cache-threshold for DHCPv6 operations
- - The server now supports DHPv6 address allocation based on EUI-64 DUIDs
- - Experimental support for alternate relay port in the both the server
-   and relay for IPv4, IPv6 and 4o6 (see: draft-ietf-dhc-relay-port-10.txt)
+Release 4.4.2-P1 is security release fixing possible buffer overwrite error
+in client and server while parsing haxadecimal literals in lease file.
 
 For information on how to install, configure and run this software, as
 well as how to find documentation and report bugs, please consult the

diff --git a/client/dhclient.c b/client/dhclient.c
index 189e527094e8adaaa71c4bb859e484018168b100..503a796d895160de53ba57de9743fea489bc904f 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/common/parse.c b/common/parse.c
index 8d88d7eec274005eb6ebbe50b4877656776e4b02..fc7b39c6899cb95bf53ba39aa81406f092d70cf8 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -3,7 +3,7 @@
    Common parser code for dhcpd and dhclient. */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/common/tests/option_unittest.c b/common/tests/option_unittest.c
index bea608372e49e6023764c2bcc95d744a36ac3924..b71a1add70646259b0a9a41328f552f167179c09 100644 (file)
--- a/common/tests/option_unittest.c
+++ b/common/tests/option_unittest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/configure.ac b/configure.ac
index 3a583a59c7c7933d87bb41b4e568c999efbdaf8d..2ca53ffda85dd00e1752df2ccdcb4f1e59eda841 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.4.2],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.2-P1],[dhcp-users@isc.org])
 
 
 # we specify "foreign" to avoid having to have the GNU mandated files,

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index d4ce5f27c9b6df76278880818edcb62ff198dedb..97e83923a72e159fa6bcaab1d18c4df71df7e922 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2020 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2021 by Internet Systems Consortium, Inc.("ISC")
  * Copyright(c) 1997-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 6c2ceedd7b7f7238352f272a7a3d0cdee0c757d4..099091290ff58ab51305a23010a1538efb4d0513 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/util/bind.sh b/util/bind.sh
index ce350cd84eb9a59ca82621dd3c4e9e386521c4aa..1a7180c20bdf229e37d958af24188d420261edde 100644 (file)
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -73,6 +73,7 @@ case $# in
        ### For ease of use, this records the sticky tag of versions
        ### released with each point release.
        ###
+       4.4.2-P1) noSNAP=snapshot BINDTAG=v9_11_14 ;;
        4.4.2) noSNAP=snapshot BINDTAG=v9_11_14 ;;
        4.4.2b1) noSNAP=snapshot BINDTAG=v9_11_14 ;;
        4.4.2-dev) noSNAP=snapshot BINDTAG=v9_11_8 ;;