From 6826003be8ed4715bd6ac40decc364a65eb5b036 Mon Sep 17 00:00:00 2001
From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 9 Feb 2018 09:19:54 -0500
Subject: [master] Correct delayed-ack 0 prohibiting active lease updates to
 lease file

    Merges in 47141.
---
 server/dhcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/dhcp.c')

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
-- 
cgit v1.2.1