From 3004bebf47f6b6422545d68bea780ab11ae29bbd Mon Sep 17 00:00:00 2001 From: David Hankins Date: Wed, 19 Jul 2006 17:14:55 +0000 Subject: - A new DDNS related server option, update-conflict-detection, has been added. If this option is enabled, dhcpd will perform normal DHCID conflict resolution (the default). If this option is disabled, it will instead trust the assigned name implicitly (removing any other bindings on that name). This option has not been made available in dhclient. [ISC-Bugs #16165] --- server/stables.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'server/stables.c') diff --git a/server/stables.c b/server/stables.c index 7c7df5ca..4bfbaf25 100644 --- a/server/stables.c +++ b/server/stables.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: stables.c,v 1.31 2006/07/17 15:16:43 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; +"$Id: stables.c,v 1.32 2006/07/19 17:14:55 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -233,6 +233,7 @@ static struct option server_options[] = { { "do-forward-updates", "f", &server_universe, 45, 1 }, { "ping-timeout", "T", &server_universe, 46, 1 }, { "infinite-is-reserved", "f", &server_universe, 47, 1 }, + { "update-conflict-detection", "f", &server_universe, 48, 1 }, { NULL, NULL, NULL, 0, 0 } }; -- cgit v1.2.1