summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2020-01-20 08:35:13 -0500
committerThomas Markwalder <tmark@isc.org>2020-01-20 08:35:13 -0500
commitb2d5d63afc9b58f1d4bfa95713ace07a1f2bcdbc (patch)
tree3ced14df90953f7c486f238b7e6031a8bf9c2af7
parent2d00b7b15d464e6f702f9f8a27eac803dc38a17b (diff)
downloadisc-dhcp-b2d5d63afc9b58f1d4bfa95713ace07a1f2bcdbc.tar.gz
[v4_1_esv] Pre-release tag prep for 4.1-ESV-R16: version #, copyright etc...
Changes to be committed: modified: LICENSE modified: README modified: RELNOTES modified: client/dhclient.c modified: common/discover.c modified: configure.ac modified: relay/dhcrelay.c modified: relay/tests/relay_unittests.c modified: server/dhcpd.c
-rw-r--r--LICENSE2
-rw-r--r--README12
-rw-r--r--RELNOTES10
-rw-r--r--client/dhclient.c4
-rw-r--r--common/discover.c7
-rw-r--r--configure.ac2
-rw-r--r--relay/dhcrelay.c4
-rw-r--r--relay/tests/relay_unittests.c2
-rw-r--r--server/dhcpd.c4
9 files changed, 26 insertions, 21 deletions
diff --git a/LICENSE b/LICENSE
index eadd727a..cf4e6307 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2020 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 f3385bce..89084427 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.1-ESV-R16b1
- 18 December 2019
+ Version 4.1-ESV-R16
+ 01 January 2020
README FILE
@@ -98,7 +98,7 @@ directory, it may not have up-to-date information).
RELEASE STATUS
-This is ISC DHCP 4.1-ESV-R16b1, an extended support (ESV) release that
+This is ISC DHCP 4.1-ESV-R16, 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-R16b1.tar.gz
- tar xvf dhcp-4.1-ESV-R16b1.tar
+ gunzip dhcp-4.1-ESV-R16.tar.gz
+ tar xvf dhcp-4.1-ESV-R16.tar
CONFIGURING IT
-Now, cd to the dhcp-4.1-ESV-R16b1 subdirectory that you've just created and
+Now, cd to the dhcp-4.1-ESV-R16 subdirectory that you've just created and
configure the source tree by typing:
./configure
diff --git a/RELNOTES b/RELNOTES
index 0db52abd..42a90fb4 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,16 +1,18 @@
Internet Systems Consortium DHCP Distribution
- Version 4.1-ESV-R16b1
- 18 December 2019
+ Version 4.1-ESV-R16
+ 01 January 2020
Release Notes
NEW FEATURES
-Version 4.1-ESV-R16b1 is a maintenance release of an extended support version
+Version 4.1-ESV-R16 is a maintenance release of an extended support version
(ESV) release. ESVs are intended for users who have longer upgrade
-constraints. Please see our web page
+constraints. Please see our web page:
+
http://www.isc.org/downloads/software-support-policy/
+
for more information on ESVs.
ISC DHCP 4.1.x includes several new DHCPv6 features that were not included
diff --git a/client/dhclient.c b/client/dhclient.c
index 554256f9..d1824e9d 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
DHCP Client. */
/*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2020 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-2019 Internet Systems Consortium.";
+"Copyright 2004-2020 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/discover.c b/common/discover.c
index d6115b34..649ce3e5 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -3,7 +3,7 @@
Find and identify the network interfaces. */
/*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2020 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
@@ -39,7 +39,10 @@
# include <net/if6.h>
#endif
-struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
+struct interface_info *interfaces = 0;
+struct interface_info *dummy_interfaces = 0;
+struct interface_info *fallback_interface = 0;
+
int interfaces_invalidated;
int quiet_interface_discovery;
u_int16_t local_port;
diff --git a/configure.ac b/configure.ac
index 901b7765..e54cab1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.1-ESV-R16b1], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.1-ESV-R16], [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 73fd3054..ac9b6c8e 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
DHCP/BOOTP Relay Agent. */
/*
- * Copyright(c) 2004-2019 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2020 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-2019 Internet Systems Consortium.";
+"Copyright 2004-2020 Internet Systems Consortium.";
static const char arr[] = "All rights reserved.";
static const char message[] =
"Internet Systems Consortium DHCP Relay Agent";
diff --git a/relay/tests/relay_unittests.c b/relay/tests/relay_unittests.c
index 2297050a..cba14bd5 100644
--- a/relay/tests/relay_unittests.c
+++ b/relay/tests/relay_unittests.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2019-2020 by 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/server/dhcpd.c b/server/dhcpd.c
index 678ec9c5..e8b7e429 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
DHCP Server Daemon. */
/*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2020 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-2019 Internet Systems Consortium.";
+"Copyright 2004-2020 Internet Systems Consortium.";
static const char arr [] = "All rights reserved.";
static const char message [] = "Internet Systems Consortium DHCP Server";
static const char url [] =