summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2011-10-18 05:04:57 +0000
committerdjm <djm>2011-10-18 05:04:57 +0000
commitea86090d9062240e37cb8bb1efc3c1de8e4d6928 (patch)
treea8bb78ac74d17d808498b5ebb4fb6eda9cf767af
parent7b3e2febbb39ae10f8716b3b77916bddef9343c7 (diff)
downloadopenssh-ea86090d9062240e37cb8bb1efc3c1de8e4d6928.tar.gz
- djm@cvs.openbsd.org 2011/10/04 14:17:32
[sftp-glob.c] silence error spam for "ls */foo" in directory with files; bz#1683
-rw-r--r--ChangeLog8
-rw-r--r--sftp-glob.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 26395130..1d00c68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2011101
+20111018
+ - (djm) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2011/10/04 14:17:32
+ [sftp-glob.c]
+ silence error spam for "ls */foo" in directory with files; bz#1683
+
+20111001
- (dtucker) [openbsd-compat/mktemp.c] Fix compiler warning. ok djm
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2011/09/23 00:22:04
diff --git a/sftp-glob.c b/sftp-glob.c
index cdc27082..06bf157c 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.22 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.23 2011/10/04 14:17:32 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -111,7 +111,7 @@ fudge_lstat(const char *path, struct stat *st)
{
Attrib *a;
- if (!(a = do_lstat(cur.conn, (char *)path, 0)))
+ if (!(a = do_lstat(cur.conn, (char *)path, 1)))
return(-1);
attrib_to_stat(a, st);
@@ -124,7 +124,7 @@ fudge_stat(const char *path, struct stat *st)
{
Attrib *a;
- if (!(a = do_stat(cur.conn, (char *)path, 0)))
+ if (!(a = do_stat(cur.conn, (char *)path, 1)))
return(-1);
attrib_to_stat(a, st);