From 01ccff1bf84e2f507e7c144f97413b0b4add5b35 Mon Sep 17 00:00:00 2001 From: jacob Date: Sun, 25 Feb 2007 00:51:38 +0000 Subject: [PATCH] Delay evaluating the "-pw" option, so we can criticise the user's choice of backend, bailing out if anything other than SSH is in use. git-svn-id: svn://svn.tartarus.org/sgt/putty@7322 cda61777-01e9-0310-a592-d414129be87e --- cmdline.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmdline.c b/cmdline.c index 3e890b78..bdfa1aa2 100644 --- a/cmdline.c +++ b/cmdline.c @@ -315,7 +315,14 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg) if (!strcmp(p, "-pw")) { RETURN(2); UNAVAILABLE_IN(TOOLTYPE_NONNETWORK); - cmdline_password = value; + SAVEABLE(1); + /* We delay evaluating this until after the protocol is decided, + * so that we can warn if it's of no use with the selected protocol */ + if (cfg->protocol != PROT_SSH) + cmdline_error("The -pw option can only be used with the " + "SSH protocol"); + else + cmdline_password = value; } if (!strcmp(p, "-agent") || !strcmp(p, "-pagent") || -- 2.11.0