From ec69203e45b8f567153a6e55396b048a67276d9b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 27 Jan 2004 21:22:00 +1100 Subject: - djm@cvs.openbsd.org 2004/01/27 10:08:10 [sftp.c] reorder parsing so user:skey@host:file works (bugzilla #777) patch from admorten AT umich.edu; ok markus@ --- ChangeLog | 6 +++++- sftp.c | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index de87d774b..50acfb04e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ [sshconnect.c] reset nonblocking flag after ConnectTimeout > 0 connect; (bugzilla #785) from jclonguet AT free.fr; ok millert@ + - djm@cvs.openbsd.org 2004/01/27 10:08:10 + [sftp.c] + reorder parsing so user:skey@host:file works (bugzilla #777) + patch from admorten AT umich.edu; ok markus@ - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS if libcrypto lacks it @@ -1758,4 +1762,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3196 2004/01/27 10:21:27 djm Exp $ +$Id: ChangeLog,v 1.3197 2004/01/27 10:22:00 djm Exp $ diff --git a/sftp.c b/sftp.c index 0be27887f..fef28c3b7 100644 --- a/sftp.c +++ b/sftp.c @@ -24,7 +24,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.40 2004/01/21 03:07:59 djm Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.41 2004/01/27 10:08:10 djm Exp $"); #include "buffer.h" #include "xmalloc.h" @@ -212,11 +212,6 @@ main(int argc, char **argv) userhost = xstrdup(argv[optind]); file2 = argv[optind+1]; - if ((cp = colon(userhost)) != NULL) { - *cp++ = '\0'; - file1 = cp; - } - if ((host = strrchr(userhost, '@')) == NULL) host = userhost; else { @@ -228,6 +223,11 @@ main(int argc, char **argv) addargs(&args, "-l%s",userhost); } + if ((cp = colon(host)) != NULL) { + *cp++ = '\0'; + file1 = cp; + } + host = cleanhostname(host); if (!*host) { fprintf(stderr, "Missing hostname\n"); -- cgit v1.2.3