From: Jeremy Allison <jra@samba.org>
Date: Wed, 24 Sep 2008 21:28:18 +0000 (-0700)
Subject: Fix bug #5790 samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition.
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e10643c998e64c0ec432553ac9193d978e43f4;p=thirdparty%2Fsamba.git

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 17c473f028b..777f8e1e236 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;
 		}
 	}