[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4163-g276c839

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  276c8395f15bc18f10d455848f7038e3465f0d52 (commit)
      from  417071214370e1d87417556af9e1410ef06403c7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 276c8395f15bc18f10d455848f7038e3465f0d52
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Wed Sep 24 14:25:00 2008 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/files.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/files.c b/source/smbd/files.c
index 17c473f..777f8e1 100644
--- a/source/smbd/files.c
+++ b/source/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;
                }
        }


-- 
Samba Shared Repository