diff options
author | Jeremy Allison <jra@samba.org> | 2005-04-21 07:57:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:41 -0500 |
commit | d0a0930485508da9d3bd2ee2e37c3cc15896940e (patch) | |
tree | d52502b334408fc7e31084c614b1f073b2d4cec1 | |
parent | 6b705097d4d9062369eb3d337dce4d892a5c8fee (diff) | |
download | samba-d0a0930485508da9d3bd2ee2e37c3cc15896940e.tar.gz samba-d0a0930485508da9d3bd2ee2e37c3cc15896940e.tar.bz2 samba-d0a0930485508da9d3bd2ee2e37c3cc15896940e.zip |
r6417: 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@brocku.ca>
tracked this down.
Jeremy.
(This used to be commit a60fe9aba16eac4f195a2359d8b7672d8c8aa240)
-rw-r--r-- | source3/smbd/dir.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 0f32dddd2d..054588b25e 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1038,11 +1038,7 @@ const char *ReadDirName(struct smb_Dir *dirp, long *poffset) 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); |