From: Jeremy Allison <jra@samba.org>
Date: Fri, 1 Apr 2005 19:57:22 +0000 (+0000)
Subject: r6169: Fix bug #2563. Infinite loop on non-existant file with findnext.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~4993
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=065ab9182dc39557b8c26d3d110abe9963ad9568;p=thirdparty%2Fsamba.git

r6169: Fix bug #2563. Infinite loop on non-existant file with findnext.
Jeremy
---

diff --git a/source/smbd/dir.c b/source/smbd/dir.c
index 55f15238652..27ec003fb8f 100644
--- a/source/smbd/dir.c
+++ b/source/smbd/dir.c
@@ -573,8 +573,6 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
 		}
 	}
 
-	dptr->has_wild = True;
-
 	/* In case sensitive mode we don't search - we know if it doesn't exist 
 	   with a stat we will fail. */
 
@@ -584,6 +582,7 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
 		dptr->dir_hnd->offset = *poffset = -1;
 		return NULL;
 	} else {
+		dptr->has_wild = True;
 		return dptr_normal_ReadDirName(dptr, poffset, pst);
 	}
 }
@@ -602,7 +601,7 @@ BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, S
 		return False;
 	}
 
-	while (SearchDir(dptr->dir_hnd, name, poffset) == True) {
+	if (SearchDir(dptr->dir_hnd, name, poffset)) {
 		if (is_visible_file(dptr->conn, dptr->path, name, pst, True)) {
 			return True;
 		}