From 884a458f80ca973b83ccfb7022a019c8a8d0981c Mon Sep 17 00:00:00 2001
From: Shane Kerr <shane@isc.org>
Date: Mon, 17 Sep 2007 10:13:07 +0000
Subject: [PATCH] Remove ddns-update-style warning by changing default to
 "none".

See RT ticket #17103 for more.
---
 RELNOTES            |  3 +++
 server/dhcpd.c      | 10 +---------
 server/dhcpd.conf.5 |  5 +++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index 76a7485f..047aab82 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -55,6 +55,9 @@ suggested fixes to <dhcp-users@isc.org>.
 
 			Changes since 4.0.0a2
 
+- The DHCP server no longer requires a "ddns-update-style" statement, 
+  and now defaults to "none", which means DNS updates are disabled.
+
 - Fix for startup where there are no IPv4 addresses on an interface.
   Thanks to Marcus Goller for reporting the bug.
 
diff --git a/server/dhcpd.c b/server/dhcpd.c
index bd134b29..744bbef1 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -870,15 +870,7 @@ void postconf_initialization (int quiet)
 			data_string_forget (&db, MDL);
 		}
 	} else {
-		log_info ("%s", "");
-		log_error ("** You must add a global ddns-update-style %s%s.",
-			   "statement to ", path_dhcpd_conf);
-		log_error ("   To get the same behaviour as in 3.0b2pl11 %s",
-			   "and previous");
-		log_error ("   versions, add a line that says \"%s\"",
-			   "ddns-update-style ad-hoc;");
-		log_fatal ("   Please read the dhcpd.conf manual page %s",
-			   "for more information. **");
+		ddns_update_style = DDNS_UPDATE_STYLE_NONE;
 	}
 
 	oc = lookup_option (&server_universe, options, SV_LOG_FACILITY);
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 1244076a..de7e8ab2 100644
--- 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.87 2007/07/20 19:18:24 dhankins Exp $
+.\" $Id: dhcpd.conf.5,v 1.88 2007/09/17 10:13:07 shane Exp $
 .\"
 .TH dhcpd.conf 5
 .SH NAME
@@ -1997,7 +1997,8 @@ parameter must be one of \fBad-hoc\fR, \fBinterim\fR or \fBnone\fR.
 The \fIddns-update-style\fR statement is only meaningful in the outer
 scope - it is evaluated once after reading the dhcpd.conf file, rather
 than each time a client is assigned an IP address, so there is no way
-to use different DNS update styles for different clients.
+to use different DNS update styles for different clients. The default
+is \fBnone\fR.
 .RE
 .PP
 .B The