- stevesk@cvs.openbsd.org 2009/12/25 19:40:21

[openssh.git] / sftp.c

diff --git a/sftp.c b/sftp.c
index 1aa37423cba36932f9fa47e482c197eb3867a1f6..d8728cc25e0c94a9393a7eac32f5ebb682b68d27 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.114 2009/12/06 23:53:54 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.115 2009/12/20 07:28:36 guenther Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1809,7 +1809,8 @@ main(int argc, char **argv)
                                fprintf(stderr, "Missing username\n");
                                usage();
                        }
-                       addargs(&args, "-l%s", userhost);
+                       addargs(&args, "-l");
+                       addargs(&args, "%s", userhost);
                }
 
                if ((cp = colon(host)) != NULL) {
@@ -1829,6 +1830,7 @@ main(int argc, char **argv)
                if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
                        addargs(&args, "-s");
 
+               addargs(&args, "--");
                addargs(&args, "%s", host);
                addargs(&args, "%s", (sftp_server != NULL ?
                    sftp_server : "sftp"));