From: Francis Dupont <fdupont@isc.org>
Date: Thu, 22 Dec 2016 23:55:48 +0000 (+0100)
Subject: [5046] Set set-config command and fixed "be be" typo
X-Git-Tag: trac5030_base~1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f1c5230fd57bc0319196f8292362efcad7203b;p=thirdparty%2Fkea.git

[5046] Set set-config command and fixed "be be" typo
---

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 05879f7235..6f2cfc1391 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -63,7 +63,7 @@ ConstElementPtr
 ControlledDhcpv4Srv::commandConfigReloadHandler(const string&,
                                                 ConstElementPtr args) {
     // Use set-config as it handles logging and server config
-    return (commandSetConfigHandler("", args));
+    return (commandSetConfigHandler("set-config", args));
 }
 
 ConstElementPtr
@@ -100,7 +100,7 @@ ControlledDhcpv4Srv::commandSetConfigHandler(const string&,
     // configuration attempts.
     CfgMgr::instance().rollback();
 
-    // Logging is a sibling element and must be be parsed explicitly.
+    // Logging is a sibling element and must be parsed explicitly.
     // The call to configureLogger parses the given Logging element if
     // not null, into the staging config.  Note this does not alter the
     // current loggers, they remain in effect until we apply the
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index c9ff04d85a..5b03783e47 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -68,7 +68,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
 ConstElementPtr
 ControlledDhcpv6Srv::commandConfigReloadHandler(const string&, ConstElementPtr args) {
     // Use set-config as it handles logging and server config
-    return (commandSetConfigHandler("", args));
+    return (commandSetConfigHandler("set-config", args));
 }
 
 ConstElementPtr
@@ -105,7 +105,7 @@ ControlledDhcpv6Srv::commandSetConfigHandler(const string&,
     // configuration attempts.
     CfgMgr::instance().rollback();
 
-    // Logging is a sibling element and must be be parsed explicitly.
+    // Logging is a sibling element and must be parsed explicitly.
     // The call to configureLogger parses the given Logging element if
     // not null, into the staging config.  Note this does not alter the
     // current loggers, they remain in effect until we apply the