Don't exclude dynamic BOOTP from uid test (?)

diff --git a/common/memory.c b/common/memory.c
index 66de3ad2a774a7e74cb001f474395371a9a51dba..af8ea6ebe27a7a77e34ee6b0b6a5b1183dcf1340 100644 (file)
--- a/common/memory.c
+++ b/common/memory.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: memory.c,v 1.34 1997/06/08 04:25:35 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: memory.c,v 1.35 1997/09/16 18:14:18 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -460,8 +460,7 @@ int supersede_lease (comp, lease, commit)
 
        if (!(lease -> flags & ABANDONED_LEASE) &&
            comp -> ends > cur_time &&
-           ((comp -> uid && (lease -> uid ||
-                             !(lease -> flags & DYNAMIC_BOOTP_OK)) &&
+           (((comp -> uid && lease -> uid) &&
              (comp -> uid_len != lease -> uid_len ||
               memcmp (comp -> uid, lease -> uid, comp -> uid_len))) ||
             (!comp -> uid &&