r3741: FILE_ATTRIBUTE_DIRECTORY is illegal in open of a file

(This used to be commit ad7815fababe5783df5e8fb4a490921a5af693d6)

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index b07922dcbd3cbf82b506bba4559e966a2f715082..9bb34876793415a9e22203ec948516b0a1b86a08 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -809,6 +809,10 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
                flags |= O_RDONLY;
        }
 
+       if (io->generic.in.file_attr & FILE_ATTRIBUTE_DIRECTORY) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
        /* handle creating a new file separately */
        if (!name->exists) {
                status = pvfs_create_file(pvfs, req, name, io);