From: Ted Lemon <source@isc.org>
Date: Tue, 16 Sep 1997 18:14:18 +0000 (+0000)
Subject: Don't exclude dynamic BOOTP from uid test (?)
X-Git-Tag: NetBSD_1_3_Alpha~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae1844c8a82c88614cd148aaa20e8382f7f99051;p=thirdparty%2Fdhcp.git

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

diff --git a/common/memory.c b/common/memory.c
index 66de3ad2a..af8ea6ebe 100644
--- 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 &&