tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6179 from Icinga/fix/api-user-crash-2.8.2 

Fix crash in api user command
This commit is contained in:
Michael Friedrich 2018-03-23 12:31:19 +01:00 committed by GitHub
parent ada573dcf0 08eb3ef991
commit 857842d7f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cli/apiusercommand.cpp
View File

@ -56,19 +56,18 @@ void ApiUserCommand::InitParameters(boost::program_options::options_description&
*/
int ApiUserCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
{
String user, passwd, salt;
String passwd, salt;
if (!vm.count("user") && !vm.count("oneline")) {
Log(LogCritical, "cli", "Username (--user) must be specified.");
return 1;
} else
user = vm["user"].as<std::string>();
}
if (!vm.count("password")) {
Log(LogCritical, "cli", "Password (--password) must be specified.");
return 1;
}
passwd = vm["passwd"].as<std::string>();
passwd = vm["password"].as<std::string>();
salt = vm.count("salt") ? String(vm["salt"].as<std::string>()) : RandomString(8);
if (salt.FindFirstOf('$') != String::NPos) {
@ -83,11 +82,11 @@ int ApiUserCommand::Run(const boost::program_options::variables_map& vm, const s
}
if (vm.count("oneline"))
std::cout << '"' << hashedPassword << "\"\n";
std::cout << hashedPassword << std::endl;
else {
std::cout << "object ApiUser ";
ConfigWriter::EmitString(std::cout, user);
ConfigWriter::EmitString(std::cout, vm["user"].as<std::string>());
std::cout << "{\n"
<< " password_hash = ";