r8059: fixed handling of delete on close fir directories

(This used to be commit 14f51a99bccffac0ca284d1315ab6d4b10f3711f)

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 8dd9689863b4d58ae407f9bb1420395dcae1b1d6..f58cc60f9ace6f847bc384fcedc13154cceba9bc 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -1243,6 +1243,11 @@ NTSTATUS pvfs_change_create_options(struct pvfs_state *pvfs,
                return NT_STATUS_CANNOT_DELETE;
        }
 
+       if (f->handle->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) {
+               f->handle->create_options = create_options;
+               return NT_STATUS_OK;
+       }
+
        lck = odb_lock(req, pvfs->odb_context, &f->handle->odb_locking_key);
        if (lck == NULL) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;