- 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 e6247cc6f009f01a19dbbc6ba462b97c3a799220..409e03d13fc4576c885999db3c6af29371aec581 100644 (file)
--- 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 4570cb8ffe33fd60a0bfc631e46f80bb04896734..6eb66cdf804ec5faa4c04ee233a88a5eda189d07 100644 (file)
--- 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;