diff options
| author | Jeremy Allison <jra@samba.org> | 2008-09-24 14:28:18 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-09-24 14:28:18 -0700 |
| commit | 31e10643c998e64c0ec432553ac9193d978e43f4 (patch) | |
| tree | f818f99c556109b03e1aa1c24ef8025017b89ff4 | |
| parent | 943387edc12a276d358add404e4fecd6c3aec303 (diff) | |
| download | samba-31e10643c998e64c0ec432553ac9193d978e43f4.tar.gz samba-31e10643c998e64c0ec432553ac9193d978e43f4.tar.bz2 samba-31e10643c998e64c0ec432553ac9193d978e43f4.zip | |
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.
| -rw-r--r-- | source3/smbd/files.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c index 17c473f028..777f8e1e23 100644 --- 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; } } |