From: Jean-Marcel Flach <jean-marcel.flach@netways.de>
Date: Tue, 31 Mar 2015 07:28:03 +0000 (+0200)
Subject: Make node wizard only accept y/Y and n/N
X-Git-Tag: v2.3.4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b6465024f84459dcb66203bdddd4ae0e962d6a1;p=icinga2

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

fixes #8917
---

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index 970bd04b5..dde58e0fa 100644
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -193,7 +193,7 @@ wizard_endpoint_loop_start:
 
 		String choice = answer;
 
-		if (choice.Contains("y") || choice.Contains("j"))
+		if (choice.Contains("y"))
 			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";
@@ -341,14 +341,14 @@ wizard_ticket:
 		boost::algorithm::to_lower(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::getline(std::cin, answer);
 		boost::algorithm::to_lower(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 */
 		Log(LogInformation, "cli", "Disabling the Notification feature.");