[sftp.c]
     make passing of zero-length arguments to ssh safe by
     passing "-<switch>" "<value>" rather than "-<switch><value>"
     ok dtucker@, guenther@, djm@
This commit is contained in:
Darren Tucker 2010-01-08 18:50:04 +11:00
parent 70d87693f4
commit c4dc4f5bac
2 changed files with 8 additions and 2 deletions

View File

@ -87,6 +87,11 @@
to expand EXPAND_MAX_KEYS, allowing only EXPAND_MAX_KEYS-1 to actually to expand EXPAND_MAX_KEYS, allowing only EXPAND_MAX_KEYS-1 to actually
work. Note that nothing in OpenSSH actually uses close to this limit at work. Note that nothing in OpenSSH actually uses close to this limit at
present. bz#1607 from Jan.Pechanec AT Sun.COM present. bz#1607 from Jan.Pechanec AT Sun.COM
- halex@cvs.openbsd.org 2009/11/22 13:18:00
[sftp.c]
make passing of zero-length arguments to ssh safe by
passing "-<switch>" "<value>" rather than "-<switch><value>"
ok dtucker@, guenther@, djm@
20091226 20091226
- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

5
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.112 2009/11/20 00:54:01 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.113 2009/11/22 13:18:00 halex Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1719,7 +1719,8 @@ main(int argc, char **argv)
case 'c': case 'c':
case 'i': case 'i':
case 'o': case 'o':
addargs(&args, "-%c%s", ch, optarg); addargs(&args, "-%c", ch);
addargs(&args, "%s", optarg);
break; break;
case 'q': case 'q':
showprogress = 0; showprogress = 0;