[5151] Minor corrections after review:

 - remove missed debug printout
 - using pretty print to write the file
 - correctly grammar in the guide

diff --git a/doc/guide/ctrl-channel.xml b/doc/guide/ctrl-channel.xml
index 94d527ddd80e6194ef1848951ed6c6e221469569..95a61f279471071efccb1b7e4c93e15d4877a2df 100644 (file)
--- a/doc/guide/ctrl-channel.xml
+++ b/doc/guide/ctrl-channel.xml
@@ -150,7 +150,7 @@ will be sent to Kea and the responses received from Kea printed to standard outp
         name used when starting Kea (passed as -c argument) will be used. Note
         that the filename specified must not contain .. or backslashes. Kea
         should be able to write its files only in the directory it is running
-        and any attempts to step out of that directory is rejected.</para>
+        and any attempts to step out of that directory will be rejected.</para>
         <para>
           An example command invocation looks like this:
 <screen>

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 368422fb61d62c705d0198212559e12140df2c68..7bad1859ab4c23a259d52eaef8b31a554bc63974 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -237,8 +237,6 @@ public:
     void checkConfigWrite(const std::string& response_txt, int exp_status,
                           const std::string& exp_txt = "") {
 
-        // cout << "#### response=" << response_txt << endl;
-
         ConstElementPtr rsp;
         EXPECT_NO_THROW(rsp = Element::fromJSON(response_txt));
         ASSERT_TRUE(rsp);

diff --git a/src/lib/dhcpsrv/daemon.cc b/src/lib/dhcpsrv/daemon.cc
index cbb8b7adf387464e51f0921c886f6d6090cbfe50..796054e52d4019f8217273a16a48cd03ef4795f0 100644 (file)
--- a/src/lib/dhcpsrv/daemon.cc
+++ b/src/lib/dhcpsrv/daemon.cc
@@ -218,7 +218,8 @@ Daemon::writeConfigFile(const std::string& config_file) const {
         isc_throw(Unexpected, "Unable to open file " + config_file + " for writing");
     }
 
-    out << cfg->str();
+    // Write the actual content using pretty printing.
+    isc::data::prettyPrint(cfg, out);
 
     size_t bytes = static_cast<size_t>(out.tellp());