Updated dhcpd.conf.5 manpage in regard to ddns-domainname option, pursuant

to discussion on dhcp-users.

diff --git a/RELNOTES b/RELNOTES
index 0f358ca71a174f070df2f89510c628c2854f4aa8..13d813c3a409c0ac146debeed2d110e697cdbdd8 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -140,6 +140,10 @@ and for prodding me into improving it.
   (classes with lease limitations) was fixed.  Non-active leases OFFERed
   to clients are no longer billed (but billing is checked before offering).
 
+- The dhcpd.conf.5 manpage was updated in regard to the ddns-domainname
+  configuration option - the default configuration and results should be
+  more clear now.
+
                        Changes since 3.0.4rc1
 
 - The dhcp-options.5 manpage was updated to correct indentation errors

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 5118ffd36ab0fb3faaa15b243470dd54b38e363f..2119a600aed260ba93b5fd45c782aa9f1663c863 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -28,7 +28,7 @@
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
 .\"
-.\" $Id: dhcpd.conf.5,v 1.74 2006/06/19 20:42:11 shane Exp $
+.\" $Id: dhcpd.conf.5,v 1.75 2006/07/09 15:01:19 dhankins Exp $
 .\"
 .TH dhcpd.conf 5
 .SH NAME
@@ -1036,12 +1036,18 @@ to the client, the name from that declaration will be used.  If none
 of these applies, the server will not have a hostname for the client,
 and will not be able to do a DNS update.
 .PP
-The domain name is determined based strictly on the server
-configuration, not on what the client sends.   First, if there is a 
+The domain name is determined from the
 .I ddns-domainname
-configuration option, it is used.   Second, if there is a
-\fIdomain-name\fR option configured, that is used.  Otherwise, the
-server will not do the DNS update.
+configuration option.  The default configuration for this option is:
+.nf
+.sp 1
+  option server.ddns-domainname = config-option domain-name;
+
+.fi
+So if this configuration option is not configured to a different
+value (over-riding the above default), or if a domain-name option
+has not been configured for the client's scope, then the server will
+not attempt to perform a DNS update.
 .PP
 The client's fully-qualified domain name, derived as we have
 described, is used as the name on which an "A" record will be stored.