summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE2
-rw-r--r--README10
-rw-r--r--RELNOTES4
-rw-r--r--client/dhclient.82
-rw-r--r--client/dhclient.c2
-rw-r--r--common/alloc.c3
-rw-r--r--common/bpf.c3
-rw-r--r--common/comapi.c3
-rw-r--r--common/discover.c3
-rw-r--r--common/dlpi.c3
-rw-r--r--common/execute.c3
-rw-r--r--common/inet.c4
-rw-r--r--common/print.c3
-rw-r--r--common/tables.c3
-rw-r--r--common/tests/test_alloc.c2
-rw-r--r--common/tree.c3
-rw-r--r--configure.ac2
-rw-r--r--includes/dhcp6.h3
-rw-r--r--includes/dhctoken.h3
-rw-r--r--omapip/listener.c3
-rw-r--r--relay/dhcrelay.83
-rw-r--r--relay/dhcrelay.c2
-rw-r--r--server/bootp.c3
-rw-r--r--server/db.c3
-rw-r--r--server/dhcpd.83
-rw-r--r--server/dhcpd.c2
-rw-r--r--server/dhcpd.leases.53
-rw-r--r--server/dhcpleasequery.c3
-rw-r--r--server/mdb.c3
-rw-r--r--server/omapi.c3
-rw-r--r--server/salloc.c3
-rw-r--r--server/stables.c2
-rw-r--r--server/tests/simple_unittest.c2
-rw-r--r--util/bind.sh3
34 files changed, 40 insertions, 62 deletions
diff --git a/LICENSE b/LICENSE
index 27e76752..f9fd7d6c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2016 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 2d30fd57..5777ab41 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.3
- 03 September 2015
+ Version 4.3.4b1
+ 09 March 2016
README FILE
@@ -142,12 +142,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.3.3.tar.gz
- tar xvf dhcp-4.3.3.tar
+ gunzip dhcp-4.3.4b1.tar.gz
+ tar xvf dhcp-4.3.4b1.tar
CONFIGURING IT
-Now, cd to the dhcp-4.3.3 subdirectory that you've just created and
+Now, cd to the dhcp-4.3.4b1 subdirectory that you've just created and
configure the source tree by typing:
./configure
diff --git a/RELNOTES b/RELNOTES
index 47e30303..30dfce95 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
- Version 4.3.3
- 03 September 2015
+ Version 4.3.4b1
+ 09 March 2016
Release Notes
diff --git a/client/dhclient.8 b/client/dhclient.8
index 1946d9bb..22505a39 100644
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -1,6 +1,6 @@
.\" $Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp $
.\"
-.\" Copyright (c) 2004,2007-2016 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2016 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
diff --git a/client/dhclient.c b/client/dhclient.c
index 98e691b5..f7486c6a 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -72,7 +72,7 @@ int std_dhcid = 0;
#define ASSERT_STATE(state_is, state_shouldbe) {}
#ifndef UNIT_TEST
-static const char copyright[] = "Copyright 2004-2015 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2016 Internet Systems Consortium.";
static const char arr [] = "All rights reserved.";
static const char message [] = "Internet Systems Consortium DHCP Client";
static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
diff --git a/common/alloc.c b/common/alloc.c
index f90556fc..ae389d09 100644
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -3,8 +3,7 @@
Memory allocation... */
/*
- * Copyright (c) 2009,2013-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/common/bpf.c b/common/bpf.c
index 0bb140ee..1816496c 100644
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -3,8 +3,7 @@
BPF socket interface code, originally contributed by Archie Cobbs. */
/*
- * Copyright (c) 2009,2012-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/common/comapi.c b/common/comapi.c
index 46282158..230ea483 100644
--- a/common/comapi.c
+++ b/common/comapi.c
@@ -3,8 +3,7 @@
OMAPI object interfaces for the DHCP server. */
/*
- * Copyright (c) 2012,2014-2015 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/common/discover.c b/common/discover.c
index b5f297e7..819dcc07 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -3,8 +3,7 @@
Find and identify the network interfaces. */
/*
- * Copyright (c) 2013-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2009,2011 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/dlpi.c b/common/dlpi.c
index ff4094ba..57816817 100644
--- a/common/dlpi.c
+++ b/common/dlpi.c
@@ -3,8 +3,7 @@
Data Link Provider Interface (DLPI) network interface code. */
/*
- * Copyright (c) 2009-2011,2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/common/execute.c b/common/execute.c
index da68201d..ba393d3b 100644
--- a/common/execute.c
+++ b/common/execute.c
@@ -3,8 +3,7 @@
Support for executable statements. */
/*
- * Copyright (c) 2009,2013-2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1998-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/common/inet.c b/common/inet.c
index 52852d83..2e3449cc 100644
--- a/common/inet.c
+++ b/common/inet.c
@@ -4,9 +4,7 @@
way... */
/*
- * Copyright (c) 2011,2013,2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2007-2009 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2005 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/print.c b/common/print.c
index 40b64fb6..a694fedd 100644
--- a/common/print.c
+++ b/common/print.c
@@ -3,8 +3,7 @@
Turn data structures into printable text. */
/*
- * Copyright (c) 2009-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/tables.c b/common/tables.c
index 7617b7ef..64d17016 100644
--- a/common/tables.c
+++ b/common/tables.c
@@ -3,8 +3,7 @@
Tables of information... */
/*
- * Copyright (c) 2011-2014, 2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/test_alloc.c b/common/tests/test_alloc.c
index 41e3848f..a17a61e5 100644
--- a/common/tests/test_alloc.c
+++ b/common/tests/test_alloc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007,2009-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2007-2016 by Internet Systems Consortium, Inc. ("ISC")
*
* We test the functions provided in alloc.c here. These are very
* basic functions, and it is very important that they work correctly.
diff --git a/common/tree.c b/common/tree.c
index c4965ff1..5698be58 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -3,8 +3,7 @@
Routines for manipulating parse trees... */
/*
- * Copyright (c) 2011-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/configure.ac b/configure.ac
index ba252d34..3cabf647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP],[4.3.3],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.3.4b1],[dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,
# like AUTHORS, COPYING, and such
diff --git a/includes/dhcp6.h b/includes/dhcp6.h
index 4d7a9e34..bf8205c3 100644
--- a/includes/dhcp6.h
+++ b/includes/dhcp6.h
@@ -3,8 +3,7 @@
DHCPv6 Protocol structures... */
/*
- * Copyright (c) 2013,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2006-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2006-2016 by Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index fa3c0bc2..15bbd1c8 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -3,8 +3,7 @@
Tokens for config file lexer and parser. */
/*
- * Copyright (c) 2011-2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/omapip/listener.c b/omapip/listener.c
index 61473cf5..0e715aac 100644
--- a/omapip/listener.c
+++ b/omapip/listener.c
@@ -3,8 +3,7 @@
Subroutines that support the generic listener object. */
/*
- * Copyright (c) 2012,2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/relay/dhcrelay.8 b/relay/dhcrelay.8
index 3c2a81e4..675ed01d 100644
--- a/relay/dhcrelay.8
+++ b/relay/dhcrelay.8
@@ -1,7 +1,6 @@
.\" dhcrelay.8
.\"
-.\" Copyright (c) 2009-2013,2016 by Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2016 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
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 9ec39cd1..4113789a 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -137,7 +137,7 @@ static int strip_relay_agent_options(struct interface_info *,
struct dhcp_packet *, unsigned);
static const char copyright[] =
-"Copyright 2004-2015 Internet Systems Consortium.";
+"Copyright 2004-2016 Internet Systems Consortium.";
static const char arr[] = "All rights reserved.";
static const char message[] =
"Internet Systems Consortium DHCP Relay Agent";
diff --git a/server/bootp.c b/server/bootp.c
index 2e752c5b..a48098ae 100644
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -3,8 +3,7 @@
BOOTP Protocol support. */
/*
- * Copyright (c) 2009,2012-2014,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004,2005,2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/server/db.c b/server/db.c
index 0eaa8d12..94f1584f 100644
--- a/server/db.c
+++ b/server/db.c
@@ -3,8 +3,7 @@
Persistent database management routines for DHCPD... */
/*
- * Copyright (c) 2012-2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/server/dhcpd.8 b/server/dhcpd.8
index 55466766..c097bcf0 100644
--- a/server/dhcpd.8
+++ b/server/dhcpd.8
@@ -1,7 +1,6 @@
.\" dhcpd.8
.\"
-.\" Copyright (c) 2009-2012,2015-2016 by Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2016 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
diff --git a/server/dhcpd.c b/server/dhcpd.c
index abf333d1..a42d7591 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -27,7 +27,7 @@
*/
static const char copyright[] =
-"Copyright 2004-2015 Internet Systems Consortium.";
+"Copyright 2004-2016 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.leases.5 b/server/dhcpd.leases.5
index df59d825..e16c375e 100644
--- a/server/dhcpd.leases.5
+++ b/server/dhcpd.leases.5
@@ -1,7 +1,6 @@
.\" dhcpd.leases.5
.\"
-.\" Copyright (c) 2014-2016 by Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2016 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
diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c
index 91ca870c..75a0e72a 100644
--- a/server/dhcpleasequery.c
+++ b/server/dhcpleasequery.c
@@ -1,6 +1,5 @@
/*
- * Copyright (C) 2011-2013,2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2006-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2016 by Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/server/mdb.c b/server/mdb.c
index 148659fb..48947c51 100644
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -3,8 +3,7 @@
Server-specific in-memory database support. */
/*
- * Copyright (c) 2011-2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/server/omapi.c b/server/omapi.c
index 60e35f3f..e3992805 100644
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -3,8 +3,7 @@
OMAPI object interfaces for the DHCP server. */
/*
- * Copyright (c) 2012-2016 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/server/salloc.c b/server/salloc.c
index 164b2e59..e95eb875 100644
--- a/server/salloc.c
+++ b/server/salloc.c
@@ -3,8 +3,7 @@
Memory allocation for the DHCP server... */
/*
- * Copyright (c) 2009,2012,2014-2015 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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
diff --git a/server/stables.c b/server/stables.c
index f34a6721..3a83acbe 100644
--- a/server/stables.c
+++ b/server/stables.c
@@ -3,7 +3,7 @@
Tables of information only used by server... */
/*
- * Copyright (c) 2004-2011,2013-2016 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 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/server/tests/simple_unittest.c b/server/tests/simple_unittest.c
index c345aefd..6544d828 100644
--- a/server/tests/simple_unittest.c
+++ b/server/tests/simple_unittest.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012,2015-2016 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/util/bind.sh b/util/bind.sh
index 015fe54f..248a8710 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2009-2015 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2016 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@@ -59,6 +59,7 @@ case $# in
### For ease of use, this records the sticky tag of versions
### released with each point release.
###
+ 4.3.4b1) BINDTAG=v9_9_8_P4 ;;
4.3.3) BINDTAG=v9_9_7_P3 ;;
4.3.3b1) BINDTAG=v9_9_7_P2 ;;
4.3.2|4.3.2rc2) BINDTAG=v9_9_7 ;;
View Lorry Controller Status