From: David Hankins <dhankins@isc.org>
Date: Mon, 9 Oct 2006 17:47:43 +0000 (+0000)
Subject: Silencing compiler warnings in ths run of development. [ISC-Bugs #16425]
X-Git-Tag: v4_0_0a1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c7ffd58fcee2ebf7d831cc0a1883bc3af13d7fd;p=thirdparty%2Fdhcp.git

Silencing compiler warnings in ths run of development. [ISC-Bugs #16425]
---

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 49115e3ce..0c674c97f 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -384,6 +384,7 @@ struct lease {
 #	define MS_NULL_TERMINATION	8
 #	define ON_UPDATE_QUEUE		16
 #	define ON_ACK_QUEUE		32
+#	define ON_QUEUE			(ON_UPDATE_QUEUE | ON_ACK_QUEUE)
 #	define UNICAST_BROADCAST_HACK	64
 #	define ON_DEFERRED_QUEUE	128
 
diff --git a/server/failover.c b/server/failover.c
index 68a8d1075..ab8904c86 100644
--- a/server/failover.c
+++ b/server/failover.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: failover.c,v 1.66 2006/09/27 18:27:27 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: failover.c,v 1.67 2006/10/09 17:47:43 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -5185,7 +5185,7 @@ isc_result_t dhcp_failover_generate_update_queue (dhcp_failover_state_t *state,
 
 		for (i = FREE_LEASES; i <= RESERVED_LEASES; i++) {
 		    for (l = *(lptr [i]); l; l = l -> next) {
-			if (l->flags & (ON_UPDATE_QUEUE | ON_ACK_QUEUE) == 0 &&
+			if ((l->flags & ON_QUEUE) == 0 &&
 			    (everythingp ||
 			     (l->tstp > l->atsfp) ||
 			     (i == EXPIRED_LEASES))) {