svn commit: samba r6417 - in branches/SAMBA_3_0/source/smbd: .

jra at samba.org jra at samba.org
Thu Apr 21 07:57:54 GMT 2005


Author: jra
Date: 2005-04-21 07:57:52 +0000 (Thu, 21 Apr 2005)
New Revision: 6417

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

Log:
Strange old IRIX systems return -1 for telldir() when
end of directory reached. Don't check for that and bail
when reading directory entries as it's a valid value.
Excellent work from Cale Fairchild <cale at brocku.ca>
tracked this down.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/dir.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/dir.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/dir.c	2005-04-21 07:57:41 UTC (rev 6416)
+++ branches/SAMBA_3_0/source/smbd/dir.c	2005-04-21 07:57:52 UTC (rev 6417)
@@ -1038,11 +1038,7 @@
 	while ((n = vfs_readdirname(conn, dirp->dir))) {
 		struct name_cache_entry *e;
 		dirp->offset = SMB_VFS_TELLDIR(conn, dirp->dir);
-		if (dirp->offset == -1) {
-			return NULL;
-		}
 		dirp->name_cache_index = (dirp->name_cache_index+1) % NAME_CACHE_SIZE;
-
 		e = &dirp->name_cache[dirp->name_cache_index];
 		SAFE_FREE(e->name);
 		e->name = SMB_STRDUP(n);



More information about the samba-cvs mailing list