From: David Hankins <dhankins@isc.org>
Date: Mon, 17 Jul 2006 15:21:45 +0000 (+0000)
Subject: - A few lines of code that were failover-specific were moved within
X-Git-Tag: DHCPv6_parsing_base~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33e1cb2ba5ee69f8481305311fd48d381a173cb1;p=thirdparty%2Fdhcp.git

- A few lines of code that were failover-specific were moved within
  #if defined() clauses so that compilation without failover could be
  made possible. [ISC-Bugs #15987]
---

diff --git a/RELNOTES b/RELNOTES
index e6247cc6f..409e03d13 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -157,6 +157,10 @@ and for prodding me into improving it.
 - The omapi.1 manpage had some formatting errors repaired thanks to a patch
   from Yoshihiko Sarumaru.
 
+- A few lines of code that were failover-specific were moved within
+  #if defined() clauses so that compilation without failover could be
+  made possible.
+
 			Changes since 3.0.4rc1
 
 - The dhcp-options.5 manpage was updated to correct indentation errors
diff --git a/server/dhcpd.c b/server/dhcpd.c
index 4570cb8ff..6eb66cdf8 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.120 2006/05/11 14:48:59 shane Exp $ Copyright 2004-2006 Internet Systems Consortium.";
+"$Id: dhcpd.c,v 1.121 2006/07/17 15:21:45 dhankins Exp $ Copyright 2004-2006 Internet Systems Consortium.";
 #endif
 
   static char copyright[] =
@@ -1154,7 +1154,10 @@ static isc_result_t dhcp_io_shutdown_countdown (void *vlp)
 	}
 #endif
 	if (shutdown_state == shutdown_dhcp &&
-	    !failover_connection_count) {
+#if defined(FAILOVER_PROTOCOL)
+	    !failover_connection_count &&
+#endif
+	    ISC_TRUE) {
 		shutdown_state = shutdown_done;
 		shutdown_time = cur_time;
 		goto oncemore;