[#1166] Addressed comments

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 2b0ac875c6b6bc3cc321dc8b65e53a1e6eb8bf9e..35cc66ec637472464aa1ccc34146d7afab61b38a 100644 (file)
--- 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 56da30e7e307e41e3f1fc15672d17bcd97fa94bb..5035c4b090237cec3f60f8b0ee080b82538cd697 100644 (file)
--- 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 5c04107235a98803fcc79d6fe7c200f24a383e89..c26c12f6ed2e692d53f0cd40706a0deb796ebecb 100644 (file)
--- 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 d824406ebbc83b1c7cd548a9231c1ef147e49c98..615d835a907800113b7f45f57dacb18e9a3cf43b 100644 (file)
--- 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 002b915d5d9845091707b74e5e44c8da1c26df9f..da243c0120bbe2ce5210dd65dbf4353e07448539 100644 (file)
--- 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 ebbc90cb5bcbf0339b612a54c6b55a4050d82f01..dd495fbc8030dcdbd310f67e98e97f7150ded6a5 100644 (file)
--- 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 215871ed3c67c296ea591d1bb646954188917a63..acd61759e6c713053e72602bcebee56fd72ac2bb 100644 (file)
--- 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