1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00

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.

[originally from svn r7322]
This commit is contained in:
Jacob Nevins 2007-02-25 00:51:38 +00:00
parent befd797f97
commit 917b32dd8b

View File

@ -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") ||