From: Francis Dupont <fdupont@isc.org>
Date: Thu, 23 Jul 2020 19:32:49 +0000 (+0200)
Subject: [#1166] Addressed comments
X-Git-Tag: Kea-1.7.10~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f566188ea53d19a88677bd8504f697a41517f9f;p=thirdparty%2Fkea.git

[#1166] Addressed comments
---

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 2b0ac875c6..35cc66ec63 100644
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -294,8 +294,8 @@ invocation looks like this:
    }
 
 If the configuration file is incorrect reloading it can raise an error
-which cannot be recovered. Look at :ref:`command-config-set` what to do
-to recover a working server.
+which leaves the server in unusable state.. Look at :ref:`command-config-set`
+what to do to recover a working server.
 
 .. _command-config-test:
 
diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc
index 56da30e7e3..5035c4b090 100644
--- a/src/bin/dhcp4/dhcp4_messages.cc
+++ b/src/bin/dhcp4/dhcp4_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Tue Jul 21 2020 17:10
+// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Thu Jul 23 2020 21:31
 
 #include <cstddef>
 #include <log/message_types.h>
diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h
index 5c04107235..c26c12f6ed 100644
--- a/src/bin/dhcp4/dhcp4_messages.h
+++ b/src/bin/dhcp4/dhcp4_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Tue Jul 21 2020 17:10
+// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Thu Jul 23 2020 21:31
 
 #ifndef DHCP4_MESSAGES_H
 #define DHCP4_MESSAGES_H
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index d824406ebb..615d835a90 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -183,6 +183,11 @@ change is committed by the administrator.
 This fatal error message is issued when a new configuration raised an error
 which cannot be recovered. A correct configuration must be applied as soon
 as possible as the server is no longer working.
+The configuration can be fixed in several ways. If the control channel
+is open, config-set with a valid configuration can be
+used. Alternatively, the original config file on disk could be fixed
+and SIGHUP signal could be sent (or the config-reload command
+issued). Finally, the server could be restarted completely.
 
 % DHCP4_CONFIG_UNSUPPORTED_OBJECT DHCPv4 server configuration includes an unsupported object: %1
 This error message is issued when the configuration includes an unsupported
diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index 002b915d5d..da243c0120 100644
--- a/src/bin/dhcp6/dhcp6_messages.cc
+++ b/src/bin/dhcp6/dhcp6_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Tue Jul 21 2020 17:17
+// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Thu Jul 23 2020 21:32
 
 #include <cstddef>
 #include <log/message_types.h>
diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h
index ebbc90cb5b..dd495fbc80 100644
--- a/src/bin/dhcp6/dhcp6_messages.h
+++ b/src/bin/dhcp6/dhcp6_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Tue Jul 21 2020 17:17
+// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Thu Jul 23 2020 21:32
 
 #ifndef DHCP6_MESSAGES_H
 #define DHCP6_MESSAGES_H
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 215871ed3c..acd61759e6 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -128,6 +128,11 @@ change is committed by the administrator.
 This fatal error message is issued when a new configuration raised an error
 which cannot be recovered. A correct configuration must be applied as soon
 as possible as the server is no longer working.
+The configuration can be fixed in several ways. If the control channel
+is open, config-set with a valid configuration can be
+used. Alternatively, the original config file on disk could be fixed
+and SIGHUP signal could be sent (or the config-reload command
+issued). Finally, the server could be restarted completely.
 
 % DHCP6_CONFIG_UNSUPPORTED_OBJECT DHCPv6 server configuration includes an unsupported object: %1
 This error message is issued when the configuration includes an unsupported