From ff107a93cdf4ab75be44097897ecc42ea46580e2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 21 Mar 2005 18:10:21 +0000 Subject: r5922: Fix for NASTY NASTY bug #2501. All my fault :-(. Brown paper bag time. Stops Win98 from looping doing findnext on a singleton directory. More testing very welcome. Jeremy. (This used to be commit e32a58742e618a49934e19b72cd5222c9666cf95) --- source3/smbd/dir.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3') diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index db16b8a6e0..1ec35d839c 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -595,6 +595,13 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst) { ZERO_STRUCTP(pst); + + if (!dptr->has_wild && (dptr->dir_hnd->offset == -1)) { + /* This is a singleton directory and we're already at the end. */ + *poffset = -1; + return False; + } + while (SearchDir(dptr->dir_hnd, name, poffset) == True) { if (is_visible_file(dptr->conn, dptr->path, name, pst, True)) { return True; -- cgit