diff --git a/ChangeLog b/ChangeLog index da9306531..60622d969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,10 @@ - markus@cvs.openbsd.org 2011/09/12 08:46:15 [sftp-client.c] fix leak in do_lsreaddir(); ok djm + - djm@cvs.openbsd.org 2011/09/22 06:29:03 + [sftp.c] + don't let remote_glob() implicitly sort its results in do_globbed_ls() - + in all likelihood, they will be resorted anyway 20110909 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From diff --git a/sftp.c b/sftp.c index ab667f5a5..5c03f89d7 100644 --- a/sftp.c +++ b/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.133 2011/09/22 06:29:03 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -793,7 +793,8 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, memset(&g, 0, sizeof(g)); if (remote_glob(conn, path, - GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT, NULL, &g) || + GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT|GLOB_NOSORT, + NULL, &g) || (g.gl_pathc && !g.gl_matchc)) { if (g.gl_pathc) globfree(&g);