mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 18:08:16 +00:00
Code Issues Releases Wiki Activity

[#3831] Checkpoint: fixes

Browse Source
This commit is contained in:
Francis Dupont 2025-05-15 21:01:23 +02:00
parent 01dc6e538c
commit e8d9560f43
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/agent/tests/ca_controller_unittests.cc
View File

@ -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\" }";

7
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

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

7
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

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

7
src/lib/process/d_controller.cc
View File

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

2
src/lib/process/daemon.cc
View File

@ -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