Version, README, RELNOTES, Copyright++.

diff --git a/README b/README
index 39087c369fdc14a74edbbf1735eeb9f5307f80d3..338eadbb41d39d150ba0e5066f6a99ef0a353f6e 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.2.0a1
+                             Version 4.2.0a2
                              2 December 2009
 
                              README FILE
@@ -94,7 +94,8 @@ directory, it may not have up-to-date information).
 
                            RELEASE STATUS
 
-This is ISC DHCP 4.2.0a1, which modifies the DDNS code to be asynchronous.
+This is ISC DHCP 4.2.0a2, an ALPHA quality release containing new
+features.
 
 In this release, the DHCPv6 server should be fully functional on Linux,
 Solaris, or any BSD.  The DHCPv6 client should be similarly functional
@@ -130,12 +131,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.2.0a1.tar.gz
-       tar xvf dhcp-4.2.0a1.tar
+       gunzip dhcp-4.2.0a2.tar.gz
+       tar xvf dhcp-4.2.0a2.tar
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-4.2.0a1 subdirectory that you've just created and
+Now, cd to the dhcp-4.2.0a2 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index 1ea69c3f11862b8223c156b091e79f4b68434542..1502c62217dff816436d19ebf199c0c33b4b0461 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 4.2.0a1
-                             2 December 2009
+                             Version 4.2.0a2
+                            17 February 2010
 
                              Release Notes
 

diff --git a/client/dhclient.c b/client/dhclient.c
index 640530a8e9878bd78eb7561e6650db70ffae6aee..4a1f09b5bd06d3d5dc3377965934642f2f57e1ea 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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
@@ -64,7 +64,7 @@ int duid_type = 0;
    assert (state_is == state_shouldbe). */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
-static const char copyright[] = "Copyright 2004-2009 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2010 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/conflex.c b/common/conflex.c
index 77a40be31e83b3da37cb17666921ea35a47a40fa..81690c4f69c91e73a1477d5b008caf6ea20e2318 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -3,7 +3,7 @@
    Lexical scanner for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/dhcp-options.5 b/common/dhcp-options.5
index 0525d5dd089e01cd86094793182e389e59b19fe8..211fb209159801dffa11e544cf4012b9cd22324e 100644 (file)
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -1,6 +1,6 @@
-.\"    $Id: dhcp-options.5,v 1.45.18.2 2010/02/17 19:59:09 dhankins Exp $
+.\"    $Id: dhcp-options.5,v 1.45.18.3 2010/02/17 20:33:55 dhankins Exp $
 .\"
-.\" Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2010 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/dispatch.c b/common/dispatch.c
index fef2249f39a3c79c1db4a44c150bdcb93aeb175d..8355d38b363d11d3fadfb64596fefbbe266235dc 100644 (file)
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -3,7 +3,7 @@
    Network input dispatcher... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/options.c b/common/options.c
index 52003ab6f070da4fe9cee4a7a2308998c5fc635c..0f28f6c94184cdbcb768380448b77cf933c98065 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -3,7 +3,7 @@
    DHCP options parsing and reassembly. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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 f4dda1369258d77c040d4bbfaf66aeef643c16e2..5ca093a7643b7af95ae976c105679ffca1483e52 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -3,7 +3,8 @@
    Turn data structures into printable text. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009-2010
+ *                             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 8e5fd278c2ad7d72f90c98cec0da1817f0c36fb3..441afb1b59ee28faafc1d7211e3657601f4b1a95 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([DHCP], [4.2.0a1], [dhcp-users@isc.org])
+AC_INIT([DHCP], [4.2.0a2], [dhcp-users@isc.org])
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such

diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index af997ac70eee7d555054851ae1522a8e0ea252ac..2ccd192c32f39e8a3a528aa689468619b3ac8dd1 100644 (file)
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -3,7 +3,8 @@
    Examine and modify omapi objects. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009-2010
+ *                             by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/includes/dhcp6.h b/includes/dhcp6.h
index 03db160e93fac440d84be235168753cbed3dd7a1..920be801f2139466e86ea4a14993056417123f0b 100644 (file)
--- a/includes/dhcp6.h
+++ b/includes/dhcp6.h
@@ -3,7 +3,7 @@
    DHCPv6 Protocol structures... */
 
 /*
- * Copyright (c) 2006-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2006-2010 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/dhcpd.h b/includes/dhcpd.h
index 0c7037d7a0ea5903b63083b8c1fefb2e2dfa4d3d..7862107263e9a57c9bda593dbf5fcf8d54ad0602 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
    Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/includes/dhctoken.h b/includes/dhctoken.h
index 6cfa04b0dd68517917490bb49197dcde0d56de66..3d2253f11fed791e05d51602ff850cd0a5a07d5d 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -3,7 +3,7 @@
    Tokens for config file lexer and parser. */
 
 /*
- * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2010 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/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h
index 6376cdfa466a46598880d88402fc8bbecb1942f6..f6db2829f058ef509aa2770af5f889bc23bd14b5 100644 (file)
--- a/includes/omapip/omapip_p.h
+++ b/includes/omapip/omapip_p.h
@@ -3,7 +3,8 @@
    Private master include file for the OMAPI library. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009-2010
+ *                             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/hash.c b/omapip/hash.c
index e33f803e0a62133afca4416676ecb48a913c6633..9a7f16cb31403dc6fecd3580e97007251c8ec1dd 100644 (file)
--- a/omapip/hash.c
+++ b/omapip/hash.c
@@ -3,7 +3,8 @@
    Routines for manipulating hash tables... */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009-2010
+ *                             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/omapip/support.c b/omapip/support.c
index c82dcc8c3472c1446dc93976e97868830481d840..4c8be8e0b427e5a25564eac185ca69e4ccc3eec6 100644 (file)
--- a/omapip/support.c
+++ b/omapip/support.c
@@ -3,7 +3,8 @@
    Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009-2010
+ *                             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/omapip/test.c b/omapip/test.c
index 34017e09eadfed73efb734204898e6644ef6e005..3d525485f0bad8442b53f0e39eaabe28951cda15 100644 (file)
--- a/omapip/test.c
+++ b/omapip/test.c
@@ -3,7 +3,8 @@
    Test code for omapip... */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009-2010
+ *                             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.c b/relay/dhcrelay.c
index b127328af3475586cb2a9186157d8680aaa5503c..0a5ea1a4b3012eae525fb3747d4a810f0f95916b 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2009 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2010 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
@@ -127,7 +127,7 @@ static int strip_relay_agent_options(struct interface_info *,
                                     struct dhcp_packet *, unsigned);
 
 static const char copyright[] =
-"Copyright 2004-2009 Internet Systems Consortium.";
+"Copyright 2004-2010 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";

diff --git a/server/confpars.c b/server/confpars.c
index 27a692be076b0cdd722f48bde0d18d23237a1db3..5c5d0a06a6b26cb78f9937048335f33eca29ab75 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -3,7 +3,7 @@
    Parser for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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 9a903e04dc031faf8be33cd7fe91a95a119dbe04..14de9dbe2f0e70791af38945b15fdc219f095d84 100644 (file)
--- a/server/db.c
+++ b/server/db.c
@@ -3,7 +3,7 @@
    Persistent database management routines for DHCPD... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/ddns.c b/server/ddns.c
index b196147e0e11294d0cfcc31ae3f812c5548e2a4d..904c98e2b1c51c8d2a2b023f6bb0ddb7ba9850f9 100644 (file)
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -3,7 +3,8 @@
    Dynamic DNS updates. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009-2010
+ *                             by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2000-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/server/dhcp.c b/server/dhcp.c
index 0a970725943ed41771f62a73cd46cfa18653e257..26f664c9fd5ad277412e9d4ca5b7e58b3066a184 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -3,7 +3,7 @@
    DHCP Protocol engine. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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.c b/server/dhcpd.c
index 198436933900d5cf00ae43d4cec9c1cf69b5a40d..0678c73efcab6dadab3b821a596b12f1ec778613 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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
@@ -33,7 +33,7 @@
  */
 
 static const char copyright[] =
-"Copyright 2004-2009 Internet Systems Consortium.";
+"Copyright 2004-2010 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/dhcpv6.c b/server/dhcpv6.c
index 5cd7c4bc111bab4dd9ff5d965b6369aef89dc645..de812fa7f93662d84cc99674d8297363a67a3b40 100644 (file)
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2010 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/failover.c b/server/failover.c
index 53957bb1a75cbf937296b06600ea8a07418cef5c..b91aea5e570990950073c946ac39c709ae94ce02 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -3,7 +3,7 @@
    Failover protocol support code... */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/mdb.c b/server/mdb.c
index 5815659c3fa5c95da8a7c468e79172210ef83d1a..038b2ce3e3f972a68948976286be7c8869ab38f9 100644 (file)
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -3,7 +3,7 @@
    Server-specific in-memory database support. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/mdb6.c b/server/mdb6.c
index bbd671f4704f79956bd8640650112899de1fb5ee..87bd15278041efe240a9647ce2612a714eb12cba 100644 (file)
--- a/server/mdb6.c
+++ b/server/mdb6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2010 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/omapi.c b/server/omapi.c
index 262943524960b7e9f7079b51c3fe9ff0331b5a0f..bbddaf93041fdc9254ce1ba22cff93ba99ab2c8b 100644 (file)
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -3,7 +3,7 @@
    OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 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/util/Makefile.bind b/util/Makefile.bind
index ef3ea804aa9cf27a0bd55f0eaf047a469a00f435..354dc69e9a0fe3a173468cfc8ec60fc86610d16c 100644 (file)
--- a/util/Makefile.bind
+++ b/util/Makefile.bind
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2010 by 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
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.bind,v 1.2.2.3 2009/12/04 22:27:45 dhankins Exp $
+# $Id: Makefile.bind,v 1.2.2.4 2010/02/17 20:33:56 dhankins Exp $
 
 # Configure and build the bind libraries for use by DHCP