Don't throw away a lease because the requestor didn't give a UID and the lease has...

diff --git a/common/memory.c b/common/memory.c
index 9e9ef6f947effcccaf46c260948093ed3c7a7d8f..507cd385c6318cbc8809b9aefe1620558de4ebd3 100644 (file)
--- a/common/memory.c
+++ b/common/memory.c
@@ -385,9 +385,15 @@ int supersede_lease (comp, lease, commit)
        /* If the existing lease hasn't expired and has a different
           unique identifier or, if it doesn't have a unique
           identifier, a different hardware address, then the two
-          leases are in conflict. */
+          leases are in conflict.  If the existing lease has a uid
+          and the new one doesn't, but they both have the same
+          hardware address, and dynamic bootp is allowed on this
+          lease, then we allow that, in case a dynamic BOOTP lease is
+          requested *after* a DHCP lease has been assigned. */
+
        if (comp -> ends > cur_time &&
-           ((comp -> uid &&
+           ((comp -> uid && (lease -> uid ||
+                             !(lease -> flags & DYNAMIC_BOOTP_OK)) &&
              (comp -> uid_len != lease -> uid_len ||
               memcmp (comp -> uid, lease -> uid, comp -> uid_len))) ||
             (!comp -> uid &&

diff --git a/memory.c b/memory.c
index 9e9ef6f947effcccaf46c260948093ed3c7a7d8f..507cd385c6318cbc8809b9aefe1620558de4ebd3 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -385,9 +385,15 @@ int supersede_lease (comp, lease, commit)
        /* If the existing lease hasn't expired and has a different
           unique identifier or, if it doesn't have a unique
           identifier, a different hardware address, then the two
-          leases are in conflict. */
+          leases are in conflict.  If the existing lease has a uid
+          and the new one doesn't, but they both have the same
+          hardware address, and dynamic bootp is allowed on this
+          lease, then we allow that, in case a dynamic BOOTP lease is
+          requested *after* a DHCP lease has been assigned. */
+
        if (comp -> ends > cur_time &&
-           ((comp -> uid &&
+           ((comp -> uid && (lease -> uid ||
+                             !(lease -> flags & DYNAMIC_BOOTP_OK)) &&
              (comp -> uid_len != lease -> uid_len ||
               memcmp (comp -> uid, lease -> uid, comp -> uid_len))) ||
             (!comp -> uid &&