svn commit: samba r5925 - in branches/SAMBA_3_0_RELEASE/source: . smbd

[jerry at samba.org]

Author: jerry
Date: 2005-03-21 19:06:13 +0000 (Mon, 21 Mar 2005)
New Revision: 5925

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5925

Log:
adding FindNext() fix from 3.0; setting version to 3.0.13
Modified:
   branches/SAMBA_3_0_RELEASE/source/VERSION
   branches/SAMBA_3_0_RELEASE/source/smbd/dir.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/VERSION
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/VERSION	2005-03-21 18:42:32 UTC (rev 5924)
+++ branches/SAMBA_3_0_RELEASE/source/VERSION	2005-03-21 19:06:13 UTC (rev 5925)
@@ -19,7 +19,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=12
+SAMBA_VERSION_RELEASE=13
 
 ########################################################
 # For 'pre' releases the version will be               #
@@ -51,7 +51,7 @@
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
 #  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_SVN_SNAPSHOT=
+SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
 
 ########################################################
 # This can be set by vendors if they want...           #

Modified: branches/SAMBA_3_0_RELEASE/source/smbd/dir.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/dir.c	2005-03-21 18:42:32 UTC (rev 5924)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/dir.c	2005-03-21 19:06:13 UTC (rev 5925)
@@ -595,6 +595,13 @@
 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;