Remove remote-host and port options

Support for remote keychains is removed, so also remove the associated
command-line options.

Signed-off-by: Malfurious <m@lfurio.us>

1 files changed, 0 insertions, 32 deletions

diff --git a/Options.cpp b/Options.cpp
index 34b1e66..acfb803 100644
--- a/Options.cpp
+++ b/Options.cpp
@@ -7,8 +7,6 @@ Options::Options() {
 

 	user = "";

 	pass = "";

-	rh = "";

-	pt = "3041";

 	dr = cwd;

 	cn = -1;

 	ml = DEF_PASSWD_LENGTH;

@@ -39,7 +37,6 @@ void Options::checkString(std::string str) {
 }

 

 void Options::parseArgv(int start, int argc, char* argv[]) {

-	bool setPort = false;

 	bool setGenMod = false;

 

 	std::vector<std::string> args = loadOptionsFile(start, argc, argv);

@@ -71,29 +68,6 @@ void Options::parseArgv(int start, int argc, char* argv[]) {
 			checkString(pass);

 		}

 

-		else if (opt == "-rh") {

-			i++;

-			if (i >= args.size()) {

-				std::cerr << "Warning: remote-host: value is missing." << std::endl;

-				i--;

-				continue;

-			}

-			rh = std::string(args[i]);

-			checkString(rh);

-		}

-

-		else if (opt == "-pt") {

-			i++;

-			if (i >= args.size()) {

-				std::cerr << "Warning: port: value is missing." << std::endl;

-				i--;

-				continue;

-			}

-			pt = std::string(args[i]);

-			checkString(pt);

-			setPort = true;

-		}

-

 		else if (opt == "-dr") {

 			i++;

 			if (i >= args.size()) {

@@ -180,12 +154,6 @@ void Options::parseArgv(int start, int argc, char* argv[]) {
 			std::cerr << "Notice: unrecognized option: " << opt << std::endl;

 	}

 

-	if (rh != "")

-		std::cout << "Notice: using remote-host: " << rh << std::endl;

-

-	if (setPort && rh == "")

-		std::cerr << "Notice: setting remote port without setting remote host." << std::endl;

-

 	if (setGenMod && pass != "")

 		std::cerr << "Notice: setting generator modifiers and explicitly setting a password. Explicit password takes precedence." << std::endl;

 }