mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 16:25:21 +00:00
Code Issues Releases Wiki Activity

Make sure we are responding to a DHCPREQUEST before dissoociating a lease.

Browse Source
This commit is contained in:
Ted Lemon
1999-11-07 20:32:03 +00:00
parent 96359f83fd
commit a1e9fabd8e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/dhcp.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: dhcp.c,v 1.125 1999/10/24 19:38:53 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: dhcp.c,v 1.126 1999/11/07 20:32:03 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -2263,7 +2263,8 @@ struct lease *find_lease (packet, share, ours)
if (uid_lease && if (uid_lease &&
!packet -> raw -> ciaddr.s_addr && !packet -> raw -> ciaddr.s_addr &&
(share == (share ==
uid_lease -> subnet -> shared_network)) uid_lease -> subnet -> shared_network) &&
packet -> packet_type == DHCPREQUEST)
dissociate_lease (uid_lease); dissociate_lease (uid_lease);
} }
uid_lease = ip_lease; uid_lease = ip_lease;
@@ -2381,7 +2382,8 @@ struct lease *find_lease (packet, share, ours)
the lease that matched the client identifier. */ the lease that matched the client identifier. */
if (uid_lease) { if (uid_lease) {
if (lease) { if (lease) {
if (!packet -> raw -> ciaddr.s_addr) if (!packet -> raw -> ciaddr.s_addr &&
packet -> packet_type == DHCPREQUEST)
dissociate_lease (uid_lease); dissociate_lease (uid_lease);
#if defined (DEBUG_FIND_LEASE) #if defined (DEBUG_FIND_LEASE)
log_info ("not choosing uid lease."); log_info ("not choosing uid lease.");
@@ -2398,7 +2400,8 @@ struct lease *find_lease (packet, share, ours)
/* The lease that matched the hardware address is treated likewise. */ /* The lease that matched the hardware address is treated likewise. */
if (hw_lease) { if (hw_lease) {
if (lease) { if (lease) {
if (!packet -> raw -> ciaddr.s_addr) if (!packet -> raw -> ciaddr.s_addr &&
packet -> packet_type == DHCPREQUEST)
dissociate_lease (hw_lease); dissociate_lease (hw_lease);
#if defined (DEBUG_FIND_LEASE) #if defined (DEBUG_FIND_LEASE)
log_info ("not choosing hardware lease."); log_info ("not choosing hardware lease.");