From: David Hankins <dhankins@isc.org>
Date: Thu, 24 Aug 2006 14:55:51 +0000 (+0000)
Subject: - Don't forget to set ATSFP on receiving a BNDACK - bug introduced in 3.1.0
X-Git-Tag: v4_0_0a1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d084a789f51ba4894a70ebe14a63b092cd9bba60;p=thirdparty%2Fdhcp.git

- Don't forget to set ATSFP on receiving a BNDACK - bug introduced in 3.1.0
  work.  [ISC-Bugs #16359]
---

diff --git a/server/failover.c b/server/failover.c
index c93e74903..cc8349b3a 100644
--- a/server/failover.c
+++ b/server/failover.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: failover.c,v 1.63 2006/06/19 15:15:16 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: failover.c,v 1.64 2006/08/24 14:55:51 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -5029,7 +5029,7 @@ isc_result_t dhcp_failover_process_bind_ack (dhcp_failover_state_t *state,
 	    lease->binding_state == FTS_RESET ||
 	    lease->binding_state == FTS_RELEASED)
 	{
-		lease->tsfp = pot_expire;
+		lease->atsfp = lease->tsfp = pot_expire;
 		if ((state->i_am == secondary) &&
 		    (lease->flags & RESERVED_LEASE))
 			lease->next_binding_state = FTS_BACKUP;
@@ -5061,7 +5061,7 @@ isc_result_t dhcp_failover_process_bind_ack (dhcp_failover_state_t *state,
 		if (state->me.state == normal)
 			commit_leases ();
 	} else {
-		lease->tsfp = pot_expire;
+		lease->atsfp = lease->tsfp = pot_expire;
 		if (lease->desired_binding_state != lease->binding_state) {
 			lease->next_binding_state =
 				lease->desired_binding_state;