diff options
| author | Shawn Routhier <sar@isc.org> | 2014-12-10 19:08:05 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-12-10 19:08:05 -0800 |
| commit | 491bf4a27f8db37afec66bfac9e53b5b566351b7 (patch) | |
| tree | 7dec277c4d57260fa8356eb5f02e2e5cb405e508 /server/dhcp.c | |
| parent | 433927d38e2fa7b467fc0637b81933c48f186419 (diff) | |
| download | isc-dhcp-491bf4a27f8db37afec66bfac9e53b5b566351b7.tar.gz | |
[master] Don't call pool_timer recusively
Add a flag to avoid supersede_lease calling pool_timer
recursively when pool_timer can't handle that.
rt38002
Diffstat (limited to 'server/dhcp.c')
| -rw-r--r-- | server/dhcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/dhcp.c b/server/dhcp.c index b87b9535..7c5b7c77 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -2963,7 +2963,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) */ if ((use_old_lease == 0) && !supersede_lease(lease, lt, commit, - offer == DHCPACK, offer == DHCPACK)) { + offer == DHCPACK, offer == DHCPACK, 0)) { #else /* defined(DELAYED_ACK) */ /* * If there already isn't a need for a lease commit, and we @@ -2983,7 +2983,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) */ if ((use_old_lease == 0) && !supersede_lease(lease, lt, 0, - !offer || offer == DHCPACK, 0)) { + !offer || offer == DHCPACK, 0, 0)) { #endif log_info ("%s: database update failed", msg); free_lease_state (state, MDL); |