mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-04-10 15:48:06 -05:00
Joris van Rantwijk's fix for pscp -P
[originally from svn r375]
This commit is contained in:
parent
6e7131412e
commit
c793ad69f7
7
scp.c
7
scp.c
@ -120,14 +120,10 @@ static void do_cmd(char *host, char *user, char *cmd)
|
||||
cfg.port = 22;
|
||||
}
|
||||
|
||||
if (portnumber)
|
||||
cfg.port = portnumber;
|
||||
|
||||
/* Set username */
|
||||
if (user != NULL && user[0] != '\0') {
|
||||
strncpy(cfg.username, user, sizeof(cfg.username)-1);
|
||||
cfg.username[sizeof(cfg.username)-1] = '\0';
|
||||
cfg.port = 22;
|
||||
} else if (cfg.username[0] == '\0') {
|
||||
bump("Empty user name");
|
||||
}
|
||||
@ -135,6 +131,9 @@ static void do_cmd(char *host, char *user, char *cmd)
|
||||
if (cfg.protocol != PROT_SSH)
|
||||
cfg.port = 22;
|
||||
|
||||
if (portnumber)
|
||||
cfg.port = portnumber;
|
||||
|
||||
err = ssh_init(cfg.host, cfg.port, cmd, &realhost);
|
||||
if (err != NULL)
|
||||
bump("ssh_init: %s", err);
|
||||
|
Loading…
x
Reference in New Issue
Block a user