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

Fix: Common name in node wizard isn't case sensitive 

fixes #11159
This commit is contained in:
Michael Friedrich 2016-03-11 14:22:24 +01:00
parent 3e050bd0cd
commit 4746b214d6
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cli/nodewizardcommand.cpp
View File

@ -127,7 +127,6 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
<< " [" << Utility::GetFQDN() << "]: "; << " [" << Utility::GetFQDN() << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty()) if (answer.empty())
answer = Utility::GetFQDN(); answer = Utility::GetFQDN();
@ -151,7 +150,6 @@ wizard_endpoint_loop_start:
<< " (CN from your master setup): "; << " (CN from your master setup): ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty()) { if (answer.empty()) {
Log(LogWarning, "cli", "Master CN is required! Please retry."); Log(LogWarning, "cli", "Master CN is required! Please retry.");
@ -182,7 +180,6 @@ wizard_endpoint_loop_start:
<< ConsoleColorTag(Console_Normal) << " (Your master's IP address or FQDN): "; << ConsoleColorTag(Console_Normal) << " (Your master's IP address or FQDN): ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty()) { if (answer.empty()) {
Log(LogWarning, "cli", "Please enter the master's endpoint connection information."); Log(LogWarning, "cli", "Please enter the master's endpoint connection information.");
@ -200,7 +197,6 @@ wizard_endpoint_loop_start:
<< " [" << tmpPort << "]: "; << " [" << tmpPort << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (!answer.empty()) if (!answer.empty())
tmpPort = answer; tmpPort = answer;
@ -230,7 +226,6 @@ wizard_master_host:
<< ConsoleColorTag(Console_Normal) << " [" << master_endpoint_name << "]: "; << ConsoleColorTag(Console_Normal) << " [" << master_endpoint_name << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty() && !master_endpoint_name.IsEmpty()) if (answer.empty() && !master_endpoint_name.IsEmpty())
answer = master_endpoint_name; answer = master_endpoint_name;
@ -245,7 +240,6 @@ wizard_master_host:
<< ConsoleColorTag(Console_Normal) << " [" << tmpPort << "]: "; << ConsoleColorTag(Console_Normal) << " [" << tmpPort << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (!answer.empty()) if (!answer.empty())
tmpPort = answer; tmpPort = answer;
@ -322,7 +316,6 @@ wizard_ticket:
<< " (Hint: # icinga2 pki ticket --cn '" << cn << "'): "; << " (Hint: # icinga2 pki ticket --cn '" << cn << "'): ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty()) if (answer.empty())
goto wizard_ticket; goto wizard_ticket;
@ -365,7 +358,6 @@ wizard_ticket:
<< ConsoleColorTag(Console_Normal) << " []: "; << ConsoleColorTag(Console_Normal) << " []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
String bind_host = answer; String bind_host = answer;
bind_host = bind_host.Trim(); bind_host = bind_host.Trim();
@ -373,7 +365,6 @@ wizard_ticket:
std::cout << "Bind Port []: "; std::cout << "Bind Port []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
String bind_port = answer; String bind_port = answer;
bind_port = bind_port.Trim(); bind_port = bind_port.Trim();
@ -477,7 +468,6 @@ wizard_ticket:
<< " (CN) [" << Utility::GetFQDN() << "]: "; << " (CN) [" << Utility::GetFQDN() << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty()) if (answer.empty())
answer = Utility::GetFQDN(); answer = Utility::GetFQDN();
@ -518,7 +508,6 @@ wizard_ticket:
<< "Bind Host" << ConsoleColorTag(Console_Normal) << " []: "; << "Bind Host" << ConsoleColorTag(Console_Normal) << " []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
String bind_host = answer; String bind_host = answer;
bind_host = bind_host.Trim(); bind_host = bind_host.Trim();
@ -527,7 +516,6 @@ wizard_ticket:
<< "Bind Port" << ConsoleColorTag(Console_Normal) << " []: "; << "Bind Port" << ConsoleColorTag(Console_Normal) << " []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
String bind_port = answer; String bind_port = answer;
bind_port = bind_port.Trim(); bind_port = bind_port.Trim();