- README, RELNOTES, version update to 3.0.3b1.

- Copyright updates in files changed between 3.0.2 and 3.0.3.  LICENSE
  was updated on an earlier commit (for custom release to PBSG I think).

diff --git a/README b/README
index 4e90c1e313c807cfa7d6bf14dcdf7f1129decafe..53f983ace3e460636039c7e26d72e6212d3e834c 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
               Internet Systems Consortium DHCP Distribution
-                             Version 3.0.2
-                           February 15, 2005
+                            Version 3.0.3b1
+                             March 3, 2005
 
                              README FILE
 
@@ -96,9 +96,9 @@ system.
 
                            RELEASE STATUS
 
-This is the second release candidate of ISC DHCP 3.0.2.  This is a
-maintenance release which seeks only to fix bugs present in versions
-3.0.1 and earlier.  No new features have or will be added in subsequent
+This is the first beta release of ISC DHCP 3.0.3.  This is a maintenance
+release which seeks only to fix bugs present in versions 3.0.2 and
+earlier.  No new features have or will be added in subsequent
 release candidates of this release.
 
 In this release, the server and relay agent are currently fully
@@ -142,14 +142,14 @@ 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:
 
-       zcat dhcp-3.0.2.tar.gz |tar xvf -
+       zcat dhcp-3.0.3b1.tar.gz |tar xvf -
 
 On BSD/OS, you have to type gzcat, not zcat, and you may run into
 similar problems on other operating systems.
 
                            CONFIGURING IT
 
-Now, cd to the dhcp-3.0.2 subdirectory that you've just created and
+Now, cd to the dhcp-3.0.3b1 subdirectory that you've just created and
 configure the source tree by typing:
 
        ./configure

diff --git a/RELNOTES b/RELNOTES
index af8dfede1b7654851e9b0e1a9efe1b25ecbd3d23..9a32bf6b019b82953f5f3e1b654bf6eb28c174e3 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                             Version 3.0.2
-                           February 15, 2005
+                            Version 3.0.3b1
+                             March 3, 2005
 
                             Release Notes
 
@@ -104,16 +104,16 @@ and for prodding me into improving it.
   at Redhat.
 
 - Some inconsistencies in treating numbers that the lexer parsed as 'NUMBER'
-  or 'NUMBER_OR_NAME' was repaired.  Hexadecimal and octal parsing are
-  affected, and should work better.
+  or 'NUMBER_OR_NAME' was repaired.  Hexadecimal parsing is affected, and
+  should work better.
 
 - In several cases, parse warnings were being issued before the lexical
   token had been advanced to the token whose value was causing an error...
   causing parse warnings to claim the problem is on the wrong token.
 
 - Host declarations matching on client identifier for dynamic leases will
-  no longer match fixed-address host declarations (this is a dynamic/static
-  mixup, in effect).
+  no longer match fixed-address host declarations (this is now identical
+  to behaviour for host records matching on hardware address).
 
                        Changes since 3.0.2rc3
 

diff --git a/client/dhclient.c b/client/dhclient.c
index 398fa5a82919f8903ca23a004dd79ab01511f10c..22e80d8e05b14fc621a559500267abcda28f2da6 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3,7 +3,7 @@
    DHCP Client. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.129.2.26 2005/03/02 16:44:43 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.129.2.27 2005/03/03 16:55:22 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -61,7 +61,7 @@ struct in_addr giaddr;
    assert (state_is == state_shouldbe). */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
-static char copyright[] = "Copyright 2004 Internet Systems Consortium.";
+static char copyright[] = "Copyright 2004-2005 Internet Systems Consortium.";
 static char arr [] = "All rights reserved.";
 static char message [] = "Internet Systems Consortium DHCP Client";
 static char url [] = "For info, please visit http://www.isc.org/products/DHCP";

diff --git a/common/conflex.c b/common/conflex.c
index 8b263708741b9b891d6af1e9b3fa1f148a4d4212..20b940a7a026ac1b665b1cc60f7af0e5d0f0ff23 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -3,7 +3,7 @@
    Lexical scanner for dhcpd config file... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.92.2.12 2005/03/01 23:22:34 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.92.2.13 2005/03/03 16:55:22 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/common/discover.c b/common/discover.c
index b53ed472b8569dc0298ecb0033445850565aef2d..7e3075fcb22b027bcd091c17f7c5437853ac7e69 100644 (file)
--- a/common/discover.c
+++ b/common/discover.c
@@ -3,7 +3,7 @@
    Network input dispatcher... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.42.2.16 2005/02/22 20:48:01 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.42.2.17 2005/03/03 16:55:22 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/common/inet.c b/common/inet.c
index 41415b70460d8b3fca316ad28135cd9260cfb71e..3c86e5abc196798fe23de6def944b5c70c0fa413 100644 (file)
--- a/common/inet.c
+++ b/common/inet.c
@@ -4,7 +4,7 @@
    way... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: inet.c,v 1.8.2.6 2005/02/25 18:46:25 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: inet.c,v 1.8.2.7 2005/03/03 16:55:22 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/common/packet.c b/common/packet.c
index a302f1fb89bae061d74e0c76809b34250255b3e4..a1c662799e98dd6e20013cef59880b90ecac6142 100644 (file)
--- a/common/packet.c
+++ b/common/packet.c
@@ -3,7 +3,7 @@
    Packet assembly code, originally contributed by Archie Cobbs. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: packet.c,v 1.40.2.5 2005/02/22 20:54:24 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: packet.c,v 1.40.2.6 2005/03/03 16:55:23 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/common/parse.c b/common/parse.c
index 710a1e996fede0c1be2cae27086b56a291db4542..fc17edb93f509dcbfd76c707ac0cecfd43962308 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -3,7 +3,7 @@
    Common parser code for dhcpd and dhclient. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.104.2.22 2005/03/02 19:11:48 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.104.2.23 2005/03/03 16:55:23 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/dhcpctl/Makefile.dist b/dhcpctl/Makefile.dist
index 5f73a11f8688e1ee7e31d3154980ea31879fe182..e024dc33e62ddeb7bf91591e31ac46354aee4d97 100644 (file)
--- a/dhcpctl/Makefile.dist
+++ b/dhcpctl/Makefile.dist
@@ -1,6 +1,6 @@
 # Makefile.dist
 #
-# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2005 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/dhcpd.h b/includes/dhcpd.h
index 27a87da590c31557b1947d7392ce0e028f0304cc..36dbf009b5de6f1aad238fbb9861fb05de6fec2d 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
    Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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/failover.h b/includes/failover.h
index 622734123ad62f0ea87e6bfd682bd8660393440c..f4ff7e9ee32c0e248039d7f04d3138b0c666492f 100644 (file)
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -3,7 +3,7 @@
    Definitions for address trees... */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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/includes/version.h b/includes/version.h
index c58e0cf36d7dbb2835f7790036d5f659b4ee0137..c856429609c96961424a47749a041f1717a726cd 100644 (file)
--- a/includes/version.h
+++ b/includes/version.h
@@ -1,3 +1,3 @@
 /* Current version of ISC DHCP Distribution. */
 
-#define DHCP_VERSION   "V3.0.3-HEAD"
+#define DHCP_VERSION   "V3.0.3b1"

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 5d18ebd59ffe91b239c3046361a5c425c05d2ef2..ccffa4af1488427c2b0fdfbb03cb0dec8229e832 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -3,7 +3,7 @@
    DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcrelay.c,v 1.52.2.9 2004/11/24 17:39:18 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.52.2.10 2005/03/03 16:55:24 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -97,7 +97,7 @@ struct server_list {
        struct sockaddr_in to;
 } *servers;
 
-static char copyright [] = "Copyright 2004 Internet Systems Consortium.";
+static char copyright [] = "Copyright 2004-2005 Internet Systems Consortium.";
 static char arr [] = "All rights reserved.";
 static char message [] = "Internet Systems Consortium DHCP Relay Agent";
 static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";

diff --git a/server/ddns.c b/server/ddns.c
index 63ff11ca26cc55f2390ef4983c9c3caba794bac7..699a39c74d781d4f98fbb170911e0174de978f33 100644 (file)
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -3,7 +3,7 @@
    Dynamic DNS updates. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: ddns.c,v 1.15.2.16 2005/02/22 21:05:31 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: ddns.c,v 1.15.2.17 2005/03/03 16:55:24 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/server/dhcp.c b/server/dhcp.c
index c2828d61c956bdd8647d3f1d514e529515e2e736..2c5cc061f57319f5bf36002a0a5b1f10a6bafa08 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -3,7 +3,7 @@
    DHCP Protocol engine. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.192.2.48 2005/03/02 23:35:19 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.192.2.49 2005/03/03 16:55:24 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 61ca18a8887600b73215d4a665c22359183dce0e..abb4656b832683707d2f3f54c43f7212f018b212 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -3,7 +3,7 @@
    DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,11 +34,11 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.115.2.15 2004/09/29 23:01:50 dhankins Exp $ Copyright 2004 Internet Systems Consortium.";
+"$Id: dhcpd.c,v 1.115.2.16 2005/03/03 16:55:24 dhankins Exp $ Copyright 2004-2005 Internet Systems Consortium.";
 #endif
 
   static char copyright[] =
-"Copyright 2004 Internet Systems Consortium.";
+"Copyright 2004-2005 Internet Systems Consortium.";
 static char arr [] = "All rights reserved.";
 static char message [] = "Internet Systems Consortium DHCP Server";
 static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";

diff --git a/server/failover.c b/server/failover.c
index 535fc3c7efc14a14bbd21588a69e814ae0fe829c..f6f650604391b8835b88861a82490d010ff78f33 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -3,7 +3,7 @@
    Failover protocol support code... */
 
 /*
- * Copyright (c) 2004,2005 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: failover.c,v 1.53.2.37 2005/02/22 21:17:50 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: failover.c,v 1.53.2.38 2005/03/03 16:55:25 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

diff --git a/server/mdb.c b/server/mdb.c
index 5f2af0ad0b615d27fe7b7092581898d31dcd21db..4cf76c05fd1fd83d28a069745eb5891f860df9b4 100644 (file)
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -3,7 +3,7 @@
    Server-specific in-memory database support. */
 
 /*
- * Copyright (c) 2004,2005 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 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
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: mdb.c,v 1.67.2.21 2005/02/22 21:17:50 dhankins Exp $ Copyright (c) 2004,2005 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: mdb.c,v 1.67.2.22 2005/03/03 16:55:25 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"