mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 00:05:30 +00:00
Code Issues Releases Wiki Activity

- A few lines of code that were failover-specific were moved within

Browse Source 
#if defined() clauses so that compilation without failover could be
  made possible. [ISC-Bugs #15987]
This commit is contained in:
David Hankins
2006-07-17 15:21:45 +00:00
parent 334bf4910f
commit 33e1cb2ba5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@@ -157,6 +157,10 @@ and for prodding me into improving it.
- The omapi.1 manpage had some formatting errors repaired thanks to a patch - The omapi.1 manpage had some formatting errors repaired thanks to a patch
from Yoshihiko Sarumaru. 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 Changes since 3.0.4rc1
- The dhcp-options.5 manpage was updated to correct indentation errors - The dhcp-options.5 manpage was updated to correct indentation errors

7
server/dhcpd.c
View File

@@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = 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 #endif
static char copyright[] = static char copyright[] =
@@ -1154,7 +1154,10 @@ static isc_result_t dhcp_io_shutdown_countdown (void *vlp)
} }
#endif #endif
if (shutdown_state == shutdown_dhcp && if (shutdown_state == shutdown_dhcp &&
!failover_connection_count) { #if defined(FAILOVER_PROTOCOL)
!failover_connection_count &&
#endif
ISC_TRUE) {
shutdown_state = shutdown_done; shutdown_state = shutdown_done;
shutdown_time = cur_time; shutdown_time = cur_time;
goto oncemore; goto oncemore;