Don't nix updates on lease conflict

diff --git a/RELNOTES b/RELNOTES
index f5f80ebb966403e9d7b929c9f2a34b629fcdf7d7..07c17803776abd98b8a204357448b21167b773cc 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -73,6 +73,10 @@ and for prodding me into improving it.
   after the peer lost contact and regained contact about how many updates
   were pending.
 
+- Don't nix a lease update because of a lease conflict.   This test has
+  never (as far as I know) prevented a mistake, and it appears to cause
+  problems with failover.
+
 - Add support in rc history code for keeping a selective history, rather
   than a history of all references and dereferences.   This code is only used
   when extensive additional debugging is enabled.

diff --git a/server/mdb.c b/server/mdb.c
index 9611aa38d3b9538d05b032a8e11e17e5d7c0d237..19b9643d2ca23e7c2a4f5b14becdbdd9340639c2 100644 (file)
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: mdb.c,v 1.67.2.11 2001/10/17 03:31:38 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: mdb.c,v 1.67.2.12 2001/10/30 06:42:00 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -836,7 +836,6 @@ int supersede_lease (comp, lease, commit, propogate, pimmediate)
                       comp -> hardware_addr.hlen))))) {
                log_error ("Lease conflict at %s",
                      piaddr (comp -> ip_addr));
-               return 0;
        }
 
        /* If there's a Unique ID, dissociate it from the hash