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

Make node wizard only accept y/Y and n/N 

fixes #8917
This commit is contained in:
Jean-Marcel Flach 2015-03-31 09:28:03 +02:00 committed by Gunnar Beutner
parent 66dd494cd1
commit 3b6465024f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cli/nodewizardcommand.cpp
View File

@ -193,7 +193,7 @@ wizard_endpoint_loop_start:
String choice = answer; String choice = answer;
if (choice.Contains("y") || choice.Contains("j")) if (choice.Contains("y"))
goto wizard_endpoint_loop_start; goto wizard_endpoint_loop_start;
std::cout << ConsoleColorTag(Console_Bold) << "Please specify the master connection for CSR auto-signing" << ConsoleColorTag(Console_Normal) << " (defaults to master endpoint host):\n"; std::cout << ConsoleColorTag(Console_Bold) << "Please specify the master connection for CSR auto-signing" << ConsoleColorTag(Console_Normal) << " (defaults to master endpoint host):\n";
@ -341,14 +341,14 @@ wizard_ticket:
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
choice = answer; choice = answer;
String accept_config = (choice.Contains("y") || choice.Contains("j")) ? "true" : "false"; String accept_config = choice.Contains("y") ? "true" : "false";
std::cout << ConsoleColorTag(Console_Bold) << "Accept commands from master?" << ConsoleColorTag(Console_Normal) << " [y/N]: "; std::cout << ConsoleColorTag(Console_Bold) << "Accept commands from master?" << ConsoleColorTag(Console_Normal) << " [y/N]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
choice = answer; choice = answer;
String accept_commands = (choice.Contains("y") || choice.Contains("j")) ? "true" : "false"; String accept_commands = choice.Contains("y") ? "true" : "false";
/* disable the notifications feature on client nodes */ /* disable the notifications feature on client nodes */
Log(LogInformation, "cli", "Disabling the Notification feature."); Log(LogInformation, "cli", "Disabling the Notification feature.");