2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 263951305..1d00c68cb 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 cdc270827..06bf157ca 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);