- 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]

diff --git a/RELNOTES b/RELNOTES
index 7a7f214f3e170a8b245b1329cd3420a9430ffd64..bee6dc6edfaa5dee698bbcce3051cdcf1bdfa88b 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -62,6 +62,10 @@ suggested fixes to <dhcp-users@isc.org>.
 - 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 4.0.0b3
 
 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to

diff --git a/server/failover.c b/server/failover.c
index 0621077da8f841a4630cd63d4d4bc5d567e366c1..ced3447cec001b298c526828ecb8d26e5cda4747 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -3522,6 +3522,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";