summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-12 09:02:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:21 -0500
commitbbe03283475d4374f51af2e37ca2464f01885f91 (patch)
tree38cd203d1c0017393d004e1940cf1d7c40319cce
parent1960714669d03ce6c2f1fda34e9798cda555c962 (diff)
downloadsamba-bbe03283475d4374f51af2e37ca2464f01885f91.tar.gz
samba-bbe03283475d4374f51af2e37ca2464f01885f91.tar.bz2
samba-bbe03283475d4374f51af2e37ca2464f01885f91.zip
r4162: this should fix the delete/findnext problem from OS/2 clients. Thanks
again to kukks for the excellent and detailed bug report (This used to be commit 7dfffe4ac0d6858ae6848708df1baa11a6819680)
-rw-r--r--source4/ntvfs/posix/pvfs_dirlist.c4
-rw-r--r--source4/ntvfs/posix/pvfs_search.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c
index 613de08087..b29c776cba 100644
--- a/source4/ntvfs/posix/pvfs_dirlist.c
+++ b/source4/ntvfs/posix/pvfs_dirlist.c
@@ -282,5 +282,7 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
pvfs_list_hibernate(dir);
- return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+ /* it is not an error to give a bad name (it may have been deleted). Instead
+ just continue from end of directory */
+ return NT_STATUS_OK;
}
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 4ee81503c0..1c49701f04 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -562,6 +562,10 @@ 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;
}