4 files changed, 12 insertions, 3 deletions
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index bf34c4082a..593c526edb 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -27,7 +27,7 @@ PRIVATE_DEPENDENCIES = \
 # End MODULE ntvfs_smb2
 ################################################
 
-ntvfs_smb2_OBJ_FILES = ntvfs/smb2/vfs_smb2.o
+ntvfs_smb2_OBJ_FILES = $(ntvfssrcdir)/smb2/vfs_smb2.o
 
 
 ################################################
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index 6e3092b744..c663466985 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -178,6 +178,15 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
 	case RAW_FILEINFO_ALL_EAS:
 		return pvfs_query_all_eas(pvfs, req, name, fd, &info->all_eas.out);
 
+	case RAW_FILEINFO_SMB2_ALL_EAS: {
+		NTSTATUS status = pvfs_query_all_eas(pvfs, req, name, fd, &info->all_eas.out);
+		if (NT_STATUS_IS_OK(status) &&
+		    info->all_eas.out.num_eas == 0) {
+			return NT_STATUS_NO_EAS_ON_FILE;
+		}
+		return status;
+	}
+
 	case RAW_FILEINFO_IS_NAME_VALID:
 		return NT_STATUS_OK;
 
diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index a01a8a57e3..8e1a59473f 100644
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -46,7 +46,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
 	}
 
 	if (f->handle->fd == -1) {
-		return NT_STATUS_FILE_IS_A_DIRECTORY;
+		return NT_STATUS_INVALID_DEVICE_REQUEST;
 	}
 
 	mask = SEC_FILE_READ_DATA;
diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index dda8c83407..1f662f13fc 100644
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -45,7 +45,7 @@ NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs,
 	}
 
 	if (f->handle->fd == -1) {
-		return NT_STATUS_FILE_IS_A_DIRECTORY;
+		return NT_STATUS_INVALID_DEVICE_REQUEST;
 	}
 
 	if (!(f->access_mask & (SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA))) {