diff options
| author | Thomas Markwalder <tmark@isc.org> | 2018-02-09 09:19:54 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2018-02-09 09:19:54 -0500 |
| commit | 6826003be8ed4715bd6ac40decc364a65eb5b036 (patch) | |
| tree | 36e942db80a75935c01290ceb6e4e9a841098ed9 /server | |
| parent | de964f22713b36dcac313fe6ff03b95210fd7297 (diff) | |
| download | isc-dhcp-6826003be8ed4715bd6ac40decc364a65eb5b036.tar.gz | |
[master] Correct delayed-ack 0 prohibiting active lease updates to lease file
Merges in 47141.
Diffstat (limited to 'server')
| -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 f302d6e6..6f3a91f0 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -3,7 +3,7 @@ DHCP Protocol engine. */ /* - * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-2003 by Internet Software Consortium * * This Source Code Form is subject to the terms of the Mozilla Public @@ -3610,7 +3610,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) } else { lease->cltt = cur_time; #if defined(DELAYED_ACK) - if (enqueue && max_outstanding_acks != 0) + if (enqueue) delayed_ack_enqueue(lease); else #endif |