[#3831] Checkpoint: fixes

src/bin/agent/tests/ca_controller_unittests.cc

@@ -828,6 +828,9 @@ TEST_F(CtrlAgentControllerTest, configWrite) {
     // Now clean up after ourselves.
     ctrl->registerCommands();
 
+    // Add a config file.
+    ctrl->setConfigFile(string(TEST_DATA_BUILDDIR) + string("/config.json"));
+
     // First, build the command:
     string file = string(TEST_DATA_BUILDDIR) + string("/config-write.json");
     string cmd_txt = "{ \"command\": \"config-write\" }";

src/bin/dhcp4/ctrl_dhcp4_srv.cc

@@ -298,9 +298,10 @@ ControlledDhcpv4Srv::commandConfigWriteHandler(const string&,
         try {
             checkWriteConfigFile(filename);
         } catch (const isc::Exception& ex) {
-            return (createAnswer(CONTROL_RESULT_ERROR,
+            std::ostringstream msg;
-                                 string("not allowed to write config into ") +
+            msg << "not allowed to write config into " << filename
-                                 filename));
+                << ": " << ex.what();
+            return (createAnswer(CONTROL_RESULT_ERROR, msg.str()));
         }
     }
 

src/bin/dhcp6/ctrl_dhcp6_srv.cc

@@ -301,9 +301,10 @@ ControlledDhcpv6Srv::commandConfigWriteHandler(const string&,
         try {
             checkWriteConfigFile(filename);
         } catch (const isc::Exception& ex) {
-            return (createAnswer(CONTROL_RESULT_ERROR,
+            std::ostringstream msg;
-                                 string("not allowed to write config into ") +
+            msg << "not allowed to write config into " << filename
-                                 filename));
+                << ": " << ex.what();
+            return (createAnswer(CONTROL_RESULT_ERROR, msg.str()));
         }
     }
 

src/lib/process/d_controller.cc

@@ -512,9 +512,10 @@ DControllerBase::configWriteHandler(const std::string&,
         try {
             checkWriteConfigFile(filename);
         } catch (const isc::Exception& ex) {
-            return (createAnswer(CONTROL_RESULT_ERROR,
+            std::ostringstream msg;
-                                 std::string("not allowed to write config into ") +
+            msg << "not allowed to write config into " << filename
-                                 filename));
+                << ": " << ex.what();
+            return (createAnswer(CONTROL_RESULT_ERROR, msg.str()));
         }
     }
 

src/lib/process/daemon.cc

@@ -144,7 +144,7 @@ Daemon::checkWriteConfigFile(std::string& file) {
         return;
     }
     isc_throw(isc::BadValue, "file " << file << " must be in the same "
-              << "directory as the config file (" << config_file_ << "'");
+              << "directory as the config file (" << config_file_ << ")");
 }
 
 std::string