The branch, v3-2-test has been updated via bd7acd6344022e87495edc124e262eb50ba5ebd8 (commit) from 0a0426650e596453b4b8aa6536f4fe8b1d890451 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit bd7acd6344022e87495edc124e262eb50ba5ebd8 Author: Jeremy Allison <[EMAIL PROTECTED]> Date: Wed Sep 24 14:26:06 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 d6e91c6..13e6dd9 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