pre r16-p2 release changes

10 files changed, 19 insertions, 29 deletions

diff --git a/LICENSE b/LICENSE
index 97d40f37..6a03a35d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# 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
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/README b/README
index 3d141467..a15e654f 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
               Internet Systems Consortium DHCP Distribution
-                          Version 4.1-ESV-R16-P1
-                              26 May 2021
+                          Version 4.1-ESV-R16-P2
+                              5 October 2021
 
-                             README FILE
+                               README FILE
 
 You should read this file carefully before trying to install or use
 the ISC DHCP Distribution.
@@ -98,7 +98,7 @@ directory, it may not have up-to-date information).
 
 			    RELEASE STATUS
 
-This is ISC DHCP 4.1-ESV-R16-P1, an extended support (ESV) release that
+This is ISC DHCP 4.1-ESV-R16-P12, an extended support (ESV) release that
 provides patches for several bugs.
 
 ESVs are intended for users who have longer upgrade constraints 
@@ -139,12 +139,12 @@ information.   On Digital Unix, type ``man pfilt''.
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	gunzip dhcp-4.1-ESV-R16-P1.tar.gz
-	tar xvf dhcp-4.1-ESV-R16-P1.tar
+	gunzip dhcp-4.1-ESV-R16-P2.tar.gz
+	tar xvf dhcp-4.1-ESV-R16-P2.tar
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-4.1-ESV-R16-P1 subdirectory that you've just created and
+Now, cd to the dhcp-4.1-ESV-R16-P2 subdirectory that you've just created and
 configure the source tree by typing:
 
 	./configure
diff --git a/RELNOTES b/RELNOTES
index e9d3a879..c51a42c7 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,7 +1,7 @@
               Internet Systems Consortium DHCP Distribution
 
                            Version 4.1-ESV-R16-P2
-                               ?? ???? 2022
+                              5 October 2022
                                Release Notes
 
 Version 4.1-ESV-R16-P2 is a security release of an extended support version
@@ -29,8 +29,6 @@ in DHCP 4.0.x.  These include:
 There are a number of DHCPv6 limitations and features missing in this
 release, which will be addressed in the future:
 
-- Only Solaris, Linux, FreeBSD, NetBSD, and OpenBSD are supported.
-
 - Only a single address is supported per IA.
 
 - DHCPv6 includes human-readable text in status code messages. These
@@ -74,7 +72,6 @@ dhcp-users@lists.isc.org.
 
 			Changes since 4.1-ESV-R16-P1
 
-<<<<<<< HEAD
 ! Corrected a reference count leak that occurs when the server builds
   responses to leasequery packets.  Thanks to VictorV of Cyber Kunlun
   Lab for reporting the issue.
@@ -85,13 +82,6 @@ dhcp-users@lists.isc.org.
   FQDN option (81) that contains a label whose lenght is greater than 63.
   [Gitblab #254]
   CVE: CVS-2022-2929
-=======
- ! Corrected a memory leak that occurs when unpacking a packet that has an
-   FQDN option (81) that contains a label whose lenght is greater than 63.
-   Thanks to VictorV of Cyber Kunlun Lab for reporting the issue.
-   [Gitblab #254]
-   CVE: CVS-2022-2929
->>>>>>> [#254] Updated RELNOTES
 
 			Changes since 4.1-ESV-R16
 
diff --git a/client/dhclient.c b/client/dhclient.c
index db1634aa..c09385e5 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -66,7 +66,7 @@ struct data_string default_duid;
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
 static const char copyright[] = 
-"Copyright 2004-2021 Internet Systems Consortium.";
+"Copyright 2004-2022 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Client";
 static const char url [] = 
diff --git a/common/options.c b/common/options.c
index 035ec64c..7f054886 100644
--- a/common/options.c
+++ b/common/options.c
@@ -3,7 +3,7 @@
    DHCP options parsing and reassembly. */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2022 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 --git a/common/tests/option_unittest.c b/common/tests/option_unittest.c
index 56d766f0..89e86155 100644
--- a/common/tests/option_unittest.c
+++ b/common/tests/option_unittest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018-2022 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 e9cf952a..17353cc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.1-ESV-R16-P1], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.1-ESV-R16-P2], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 69c351ee..31ffa825 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2021 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2022 by Internet Systems Consortium, Inc.("ISC")
  * Copyright(c) 1997-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -133,7 +133,7 @@ extern int strip_relay_agent_options(struct interface_info *,
 static void request_v4_interface(const char* name, int flags);
 
 static const char copyright[] =
-"Copyright 2004-2021 Internet Systems Consortium.";
+"Copyright 2004-2022 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";
diff --git a/server/dhcpd.c b/server/dhcpd.c
index 85fa5ffe..1254aa7e 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2022 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -27,7 +27,7 @@
  */
 
 static const char copyright[] =
-"Copyright 2004-2021 Internet Systems Consortium.";
+"Copyright 2004-2022 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Server";
 static const char url [] =
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index f3ea2387..4081c909 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -1,6 +1,6 @@
 .\"	dhcpd.conf.5
 .\"
-.\" Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2022 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any