s3: Fix fcb_or_dos_open after logic change

With the new behaviour, we call fcb_or_dos_open after open_file(). It
is open_file() that sets up the fsp so that fcb_or_dos_open can find it
in the list of fsps. Avoid finding the fsp we are just setting up.

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3f47657dbf303e3c7c641e926e57c08cd0dcb935..9c9eff5a46c3040b9d9251757b65aaef0e502de7 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1571,7 +1571,8 @@ static NTSTATUS fcb_or_dos_open(struct smb_request *req,
                          (unsigned int)fsp->fh->private_options,
                          (unsigned int)fsp->access_mask ));
 
-               if (fsp->fh->fd != -1 &&
+               if (fsp != fsp_to_dup_into &&
+                   fsp->fh->fd != -1 &&
                    fsp->vuid == vuid &&
                    fsp->file_pid == file_pid &&
                    (fsp->fh->private_options & (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS |