summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-26 09:36:58 +1000
committerDamien Miller <djm@mindrot.org>2010-06-26 09:36:58 +1000
commit99ac4e9546b2eafc43e104d676a3b10866be98e9 (patch)
tree387c2fa8d90936f085d1554e36aff6743c32c8e6
parentc094d1e4812e6560f2e9c9790a5866ee3a4654ec (diff)
- djm@cvs.openbsd.org 2010/06/18 00:58:39
[sftp.c] unbreak ls in working directories that contains globbing characters in their pathnames. bz#1655 reported by vgiffin AT apple.com
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b052a202c..57ddea6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
13 sizeof(state) with sizeof(*state). This worked by accident since 13 sizeof(state) with sizeof(*state). This worked by accident since
14 the struct contained a single int at present, but could have broken 14 the struct contained a single int at present, but could have broken
15 in the future. patch from hyc AT symas.com 15 in the future. patch from hyc AT symas.com
16 - djm@cvs.openbsd.org 2010/06/18 00:58:39
17 [sftp.c]
18 unbreak ls in working directories that contains globbing characters in
19 their pathnames. bz#1655 reported by vgiffin AT apple.com
16 20
1720100622 2120100622
18 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 22 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/sftp.c b/sftp.c
index 5366c075f..229f12987 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker Exp $ */ 1/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1368,7 +1368,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
1368 break; 1368 break;
1369 case I_LS: 1369 case I_LS:
1370 if (!path1) { 1370 if (!path1) {
1371 do_globbed_ls(conn, *pwd, *pwd, lflag); 1371 do_ls_dir(conn, *pwd, *pwd, lflag);
1372 break; 1372 break;
1373 } 1373 }
1374 1374