nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-20 20:45:02 -05:00
Code Issues Projects Releases Wiki Activity

Plink and PSCP were failing to load the `Default Settings' options

Browse Source 
when connecting to an arbitrary hostname. In particular, setting a
default user name didn't work. Now it does.

[originally from svn r747]
This commit is contained in:
Simon Tatham 2000-10-23 12:20:53 +00:00
parent 5d27e5775c
commit d0635e9d39
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plink.c
View File

@ -370,13 +370,15 @@ int main(int argc, char **argv) {
/* /*
* One string. * One string.
*/ */
do_defaults (p, &cfg); Config cfg2;
if (cfg.host[0] == '\0') { do_defaults (p, &cfg2);
if (cfg2.host[0] == '\0') {
/* No settings for this host; use defaults */ /* No settings for this host; use defaults */
strncpy(cfg.host, p, sizeof(cfg.host)-1); strncpy(cfg.host, p, sizeof(cfg.host)-1);
cfg.host[sizeof(cfg.host)-1] = '\0'; cfg.host[sizeof(cfg.host)-1] = '\0';
cfg.port = 22; cfg.port = 22;
} } else
cfg = cfg2;
} else { } else {
*r++ = '\0'; *r++ = '\0';
strncpy(cfg.username, p, sizeof(cfg.username)-1); strncpy(cfg.username, p, sizeof(cfg.username)-1);

1
scp.c
View File

@ -444,6 +444,7 @@ static void do_cmd(char *host, char *user, char *cmd)
do_defaults(host, &cfg); do_defaults(host, &cfg);
if (cfg.host[0] == '\0') { if (cfg.host[0] == '\0') {
/* No settings for this host; use defaults */ /* No settings for this host; use defaults */
do_defaults(NULL, &cfg);
strncpy(cfg.host, host, sizeof(cfg.host)-1); strncpy(cfg.host, host, sizeof(cfg.host)-1);
cfg.host[sizeof(cfg.host)-1] = '\0'; cfg.host[sizeof(cfg.host)-1] = '\0';
cfg.port = 22; cfg.port = 22;