Update version info.

diff --git a/README b/README
index f52f4c89e90729b3ece0b643c65269bcfdc4df53..7d1f3d0143161c82a9adbc668a4f62c6e1949f61 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                     Internet Software Consortium
           Dynamic Host Configuration Protocol Distribution
                      Version 3, Alpha Snapshot
-                            May 6, 1999
+                            May 7, 1999
 
 This is an alpha test snapshot of Version 3 of the Internet Software
 Consortium DHCP Distribution.  In version 3, this distribution
@@ -89,12 +89,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:
 
-       zcat dhcp-3.0-alpha-19990506.tar.gz |tar xvf -
+       zcat dhcp-3.0-alpha-19990507.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.
 
-Now, cd to the dhcp-3.0-alpha-19990506 subdirectory that you've just
+Now, cd to the dhcp-3.0-alpha-19990507 subdirectory that you've just
 created and configure the source tree by typing:
 
                ./configure

diff --git a/client/dhclient.c b/client/dhclient.c
index 111fae1931ff8491acc0c29476b5ed440ac3b870..1000b03d3668e86d96221ee4f3610f1ac2a2a551 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -22,10 +22,11 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.76 1999/05/06 20:44:58 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.77 1999/05/07 17:32:37 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
+#include "version.h"
 
 TIME cur_time;
 TIME default_lease_time = 43200; /* 12 hours... */
@@ -54,7 +55,7 @@ struct sockaddr_in sockaddr_broadcast;
 static char copyright[] =
 "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Client V3.0-alpha-19990506";
+static char message [] = "Internet Software Consortium DHCP Client";
 static char contrib [] = "\nPlease contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";
 
@@ -133,7 +134,7 @@ int main (argc, argv, envp)
        }
 
        if (!quiet) {
-               log_info (message);
+               log_info ("%s %s", message, DHCP_VERSION);
                log_info (copyright);
                log_info (arr);
                log_info (contrib);

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index b884ddcc09f02c14e057c3f19c17b7f77c771b3a..bd8a741de73a988d3eba5f52e15c34253ae41910 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -22,10 +22,11 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcrelay.c,v 1.32 1999/05/06 20:44:58 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.33 1999/05/07 17:32:38 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
+#include "version.h"
 
 static void usage PROTO ((void));
 
@@ -91,7 +92,7 @@ struct server_list {
 static char copyright [] =
 "Copyright 1997, 1998, 1999 The Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Relay Agent V3.0-alpha 19990506";
+static char message [] = "Internet Software Consortium DHCP Relay Agent";
 static char contrib [] = "\nPlease contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";
 
@@ -193,7 +194,7 @@ int main (argc, argv, envp)
        }
 
        if (!quiet) {
-               log_info (message);
+               log_info ("%s %s", message, DHCP_VERSION);
                log_info (copyright);
                log_info (arr);
                log_info (contrib);

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 0096372ab101b8856aa5dd7f1f7b26a758959077..8b7d770675dfa5af2acf7d9abc5f33df57f8d368 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -22,17 +22,18 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.69 1999/05/06 20:44:57 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.70 1999/05/07 17:32:38 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 #endif
 
   static char copyright[] =
 "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Server V3.0-alpha 980506";
+static char message [] = "Internet Software Consortium DHCP Server";
 static char contrib [] = "\nPlease contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";
 
 #include "dhcpd.h"
+#include "version.h"
 
 static void usage PROTO ((void));
 
@@ -154,7 +155,7 @@ int main (argc, argv, envp)
        }
 
        if (!quiet) {
-               log_info (message);
+               log_info ("%s %s", message, DHCP_VERSION);
                log_info (copyright);
                log_info (arr);
                log_info (contrib);