summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/pvfs_search.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-12 11:30:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:21 -0500
commitfe01af9fb278a320820b41b7970a1f04b3b696a5 (patch)
tree1b1416a46983ee4881a0e76d817c3c604785bc21 /source4/ntvfs/posix/pvfs_search.c
parente60bf04d4f03bf255cd5bb1b761c98fc7779408e (diff)
downloadsamba-fe01af9fb278a320820b41b7970a1f04b3b696a5.tar.gz
samba-fe01af9fb278a320820b41b7970a1f04b3b696a5.tar.bz2
samba-fe01af9fb278a320820b41b7970a1f04b3b696a5.zip
r4165: added a 100 element name cache to cope with some amount of seeking
back to filenames that have been deleted. This fixes the new os/2 delete test. (This used to be commit 6d471db13ab132655a07e11533a559446e56fc00)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_search.c')
-rw-r--r--source4/ntvfs/posix/pvfs_search.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 1c49701f04..c336035218 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -533,7 +533,11 @@ NTSTATUS pvfs_search_next(struct ntvfs_module_context *ntvfs,
if (io->t2fnext.in.last_name && *io->t2fnext.in.last_name) {
status = pvfs_list_seek(dir, io->t2fnext.in.last_name, &search->current_index);
if (!NT_STATUS_IS_OK(status)) {
- return status;
+ if (io->t2fnext.in.resume_key) {
+ search->current_index = io->t2fnext.in.resume_key;
+ } else {
+ return status;
+ }
}
} else if (io->t2fnext.in.flags & FLAG_TRANS2_FIND_CONTINUE) {
/* plain continue - nothing to do */
@@ -562,10 +566,6 @@ NTSTATUS pvfs_search_next(struct ntvfs_module_context *ntvfs,
talloc_free(search);
}
- if (reply_count == 0) {
- return NT_STATUS_NO_SUCH_FILE;
- }
-
return NT_STATUS_OK;
}