diff options
| author | David Hankins <dhankins@isc.org> | 2007-12-13 16:59:59 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2007-12-13 16:59:59 +0000 |
| commit | 19ce0bacecb9fad881400ad8527f71d9b2f2e43c (patch) | |
| tree | c5f22308a24bd2798df6a6df5eb63cba0fad99a1 | |
| parent | afc784d0d67c80e9e951087203648915fc13dc11 (diff) | |
| download | isc-dhcp-19ce0bacecb9fad881400ad8527f71d9b2f2e43c.tar.gz | |
- A cosmetic bug during potential-conflict recovery that caused the peer's
'conflict-done' state message to be logged as 'unknown-state' has been
repaired. It is now logged correctly. [ISC-Bugs #17204]
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | server/failover.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -90,6 +90,10 @@ the README file. - The 'min-secs' configuration parameter's log message has been updated to be more helpful. +- A cosmetic bug during potential-conflict recovery that caused the peer's + 'conflict-done' state message to be logged as 'unknown-state' has been + repaired. It is now logged correctly. + Changes since 3.1.0rc1 - The parse warning that 'deny dyanmic bootp;' must be configured for diff --git a/server/failover.c b/server/failover.c index d0b5b4ee..5c4ce382 100644 --- a/server/failover.c +++ b/server/failover.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: failover.c,v 1.63.56.13 2007/10/09 22:33:18 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; +"$Id: failover.c,v 1.63.56.14 2007/12/13 16:59:59 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -3544,6 +3544,9 @@ const char *dhcp_failover_state_name_print (enum failover_state state) case normal: return "normal"; + case conflict_done: + return "conflict-done"; + case communications_interrupted: return "communications-interrupted"; |