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

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 49115e3ce29dbc046658547b8e0b4984e65fb292..0c674c97fab25532bc721e3a45745536f49682f3 100644 (file)
--- 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 68a8d1075ede410cf1b2cd75c60b99a0bf178bc3..ab8904c86ebc8233fa266d10ecb8be3a02b4be29 100644 (file)
--- 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))) {