[src/trunk]: src/usr.sbin/dhcp Merge patchlevel 22.

[mellon <mellon%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c63a5fc8c2f
branches:  trunk
changeset: 467847:9c63a5fc8c2f
user:      mellon <mellon%NetBSD.org@localhost>
date:      Tue Mar 30 03:12:28 1999 +0000

description:
Merge patchlevel 22.

diffstat:

 usr.sbin/dhcp/README            |   6 +++---
 usr.sbin/dhcp/RELNOTES          |  13 ++++++++++++-
 usr.sbin/dhcp/client/dhclient.c |   4 ++--
 usr.sbin/dhcp/server/dhcpd.c    |   4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diffs (99 lines):

diff -r 9592d60550a9 -r 9c63a5fc8c2f usr.sbin/dhcp/README
--- a/usr.sbin/dhcp/README      Tue Mar 30 03:10:46 1999 +0000
+++ b/usr.sbin/dhcp/README      Tue Mar 30 03:12:28 1999 +0000
@@ -1,6 +1,6 @@
                     Internet Software Consortium
           Dynamic Host Configuration Protocol Distribution
-                  Version 2, Beta 1, Patchlevel 21
+                  Version 2, Beta 1, Patchlevel 22
                            March 29, 1998
 
 Documentation for this software includes this README file, the
@@ -88,9 +88,9 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-       zcat dhcp-2.0b1pl21.tar.gz |tar xvf -
+       zcat dhcp-2.0b1pl22.tar.gz |tar xvf -
 
-Now, cd to the dhcp-2.0b1pl21 subdirectory that you've just created and
+Now, cd to the dhcp-2.0b1pl22 subdirectory that you've just created and
 configure the source tree by typing:
 
                ./configure
diff -r 9592d60550a9 -r 9c63a5fc8c2f usr.sbin/dhcp/RELNOTES
--- a/usr.sbin/dhcp/RELNOTES    Tue Mar 30 03:10:46 1999 +0000
+++ b/usr.sbin/dhcp/RELNOTES    Tue Mar 30 03:12:28 1999 +0000
@@ -1,6 +1,6 @@
                     Internet Software Consortium
           Dynamic Host Configuration Protocol Distribution
-                  Version 2, Beta 1, Patchlevel 21
+                  Version 2, Beta 1, Patchlevel 22
                            March 29, 1998
 
                            Release Notes
@@ -53,6 +53,11 @@
 the near future, and is intended for sites that are in a position to
 experiment, or for sites that desperately need the new features.
 
+           CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 21
+
+- Fix a pasto in options.c that will cause a core dump whenever a
+  client sends in a request without a parameter request list.
+
            CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 20
 
 - Actually do the client fix mentioned below - Patchlevel 20 only contained
@@ -77,6 +82,12 @@
 - Add -pf flag to all daemons allowing user to specify PID file name
   on command line.
 
+- Undo a previous change that attempted to be clever about testing
+  interface flags but wound up being stupid instead.
+
+- Enforce access control on DHCPREQUEST messages as well as
+  DHCPDISCOVER messages.
+
            CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 18
 
 - Support added for AIX 4.1.5.0 (and hopefully other versions).
diff -r 9592d60550a9 -r 9c63a5fc8c2f usr.sbin/dhcp/client/dhclient.c
--- a/usr.sbin/dhcp/client/dhclient.c   Tue Mar 30 03:10:46 1999 +0000
+++ b/usr.sbin/dhcp/client/dhclient.c   Tue Mar 30 03:12:28 1999 +0000
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.19 1999/03/30 01:53:57 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.20 1999/03/30 03:12:28 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -95,7 +95,7 @@
 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 V2.0b1pl21";
+static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl22";
 static char contrib [] = "Please contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";;
 
diff -r 9592d60550a9 -r 9c63a5fc8c2f usr.sbin/dhcp/server/dhcpd.c
--- a/usr.sbin/dhcp/server/dhcpd.c      Tue Mar 30 03:10:46 1999 +0000
+++ b/usr.sbin/dhcp/server/dhcpd.c      Tue Mar 30 03:12:28 1999 +0000
@@ -42,13 +42,13 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.10 1999/03/30 01:53:58 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.11 1999/03/30 03:12:28 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 V2.0b1pl21";
+static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl20";
 static char contrib [] = "Please contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";;