Pull up changes from 3.0 branch.

diff --git a/Makefile.conf b/Makefile.conf
index 96020a491198efbab18a7a199b211844e24202fa..4cc480d65b4f844b7f0099b52f41b738066b238e 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -1,6 +1,6 @@
 # Makefile.conf
 #
-# Copyright (c) 1996-1999 Internet Software Consortium.
+# Copyright (c) 1996-2000 Internet Software Consortium.
 # Use is subject to license terms which appear in the file named
 # ISC-LICENSE that should have accompanied this file when you
 # received it.   If a file named ISC-LICENSE did not accompany this
@@ -190,7 +190,7 @@ MINORVERSION=MinorVersion
 #CF = cf/rhapsody.h
 #COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
 #        -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF)
-#SCRIPT=rhapsody
+##SCRIPT=rhapsody
 ##--rhapsody--
 
 ## NetBSD

diff --git a/README b/README
index 911842803ba60681602acb13f2c1e53dfeb18cce..6f84fa669ee27ff31c34a7d99ec719a1c4d98e76 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                     Internet Software Consortium
           Dynamic Host Configuration Protocol Distribution
-                  Version 3, Beta 1, Patchlevel 0
-                            July 7, 1999
+                  Version 3, Beta 2, Patchlevel 0
+                          January 21, 2000
 
                             README FILE
 
@@ -135,14 +135,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.0b1pl0.tar.gz |tar xvf -
+       zcat dhcp-3.0b2pl0.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.0b1pl0 subdirectory that you've just
+Now, cd to the dhcp-3.0b2pl0 subdirectory that you've just
 created and configure the source tree by typing:
 
                ./configure
@@ -160,13 +160,14 @@ release.  This implementation is not built by default.  To use this
 implementation, you must have installed the latest version of bind 8.2
 (see http://www.isc.org for more information about BIND).  The
 configuration utility assumes that the BIND 8.2 distribution libraries
-and includes are under the /usr/local/bind directory, so if you have
+and includes are under the /usr/local/bind directory, except on
+FreeBSD, where it assumes they are in /usr/local.   If you have
 installed them elsewhere, you should set the BINDLIB and BINDINC
 variables in site.conf to override the values that will be set by the
 configure script from Makefile.conf.
 
-Assuming that you have BIND 8.2 installed, you can build dynamic DNS
-update support using:
+Assuming that you have BIND 8.2.2-P3 or later installed, you can build
+dynamic DNS update support using:
 
                     ./configure --with-nsupdate
 
@@ -264,6 +265,8 @@ Linux 2.2.x kernels.
 
                           LINUX: BROADCAST
 
+On older versions of Linux (versions prior to 2.2), there is a
+potential problem with the broadcast address being sent incorrectly.
 In order for dhcpd to work correctly with picky DHCP clients (e.g.,
 Windows 95), it must be able to send packets with an IP destination
 address of 255.255.255.255.  Unfortunately, Linux changes an IP