diff options
| author | David Hankins <dhankins@isc.org> | 2006-07-17 15:23:44 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2006-07-17 15:23:44 +0000 |
| commit | 4c1b0bcb0d9ad897bc844b71c902e10fdab1559c (patch) | |
| tree | b1dcf42a19dbe4ca4d305863a3022f524fb063a3 | |
| parent | bee5c1bf6c8f59b6792c70594ca2af000876457f (diff) | |
| download | isc-dhcp-4c1b0bcb0d9ad897bc844b71c902e10fdab1559c.tar.gz | |
- 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]
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | server/dhcpd.c | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -116,6 +116,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 f286786f..f79069cb 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -34,7 +34,7 @@ #ifndef lint static char ocopyright[] = -"$Id: dhcpd.c,v 1.115.2.17 2006/04/27 21:38:30 dhankins Exp $ Copyright 2004-2006 Internet Systems Consortium."; +"$Id: dhcpd.c,v 1.115.2.18 2006/07/17 15:23:44 dhankins Exp $ Copyright 2004-2006 Internet Systems Consortium."; #endif static char copyright[] = @@ -1142,7 +1142,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; |