Fix bug #5790 samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition.

We were checking that fd != -1 in file_find_di_XXX calls which is no longer
needed due to a change in internal semantics.
Jeremy.

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 17c473f028bdc246de3143d3f48e9fe7bafaa346..777f8e1e236220ab555c7c9e5bfb43e4ae1bb4c2 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -326,8 +326,7 @@ files_struct *file_find_di_first(struct file_id id)
        fsp_fi_cache.id = id;
 
        for (fsp=Files;fsp;fsp=fsp->next) {
-               if ( fsp->fh->fd != -1 &&
-                    file_id_equal(&fsp->file_id, &id)) {
+               if (file_id_equal(&fsp->file_id, &id)) {
                        /* Setup positive cache. */
                        fsp_fi_cache.fsp = fsp;
                        return fsp;
@@ -348,8 +347,7 @@ files_struct *file_find_di_next(files_struct *start_fsp)
        files_struct *fsp;
 
        for (fsp = start_fsp->next;fsp;fsp=fsp->next) {
-               if ( fsp->fh->fd != -1 &&
-                    file_id_equal(&fsp->file_id, &start_fsp->file_id)) {
+               if (file_id_equal(&fsp->file_id, &start_fsp->file_id)) {
                        return fsp;
                }
        }