diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:55 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:55 +0100 |
| commit | 8e8104534b90fde188c12732e55bfa3479755861 (patch) | |
| tree | 5380c88fab3d28998d8af940fbfa9491ea9d2b6c | |
| parent | baa6380bbc8bc4736e9dd9c2ac19734da7abd54e (diff) | |
| download | samba-8e8104534b90fde188c12732e55bfa3479755861.tar.gz samba-8e8104534b90fde188c12732e55bfa3479755861.tar.xz samba-8e8104534b90fde188c12732e55bfa3479755861.zip | |
Revert "Fix bug #5790 samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition."
This reverts commit 24348e2e028f8f63c7acad33f2f9a362a3d3fdc0.
| -rw-r--r-- | source/smbd/files.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/smbd/files.c b/source/smbd/files.c index 13e6dd9b288..d6e91c67be1 100644 --- a/source/smbd/files.c +++ b/source/smbd/files.c @@ -326,7 +326,8 @@ files_struct *file_find_di_first(struct file_id id) fsp_fi_cache.id = id; for (fsp=Files;fsp;fsp=fsp->next) { - if (file_id_equal(&fsp->file_id, &id)) { + if ( fsp->fh->fd != -1 && + file_id_equal(&fsp->file_id, &id)) { /* Setup positive cache. */ fsp_fi_cache.fsp = fsp; return fsp; @@ -347,7 +348,8 @@ files_struct *file_find_di_next(files_struct *start_fsp) files_struct *fsp; for (fsp = start_fsp->next;fsp;fsp=fsp->next) { - if (file_id_equal(&fsp->file_id, &start_fsp->file_id)) { + if ( fsp->fh->fd != -1 && + file_id_equal(&fsp->file_id, &start_fsp->file_id)) { return fsp; } } |