X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2Fmodules%2Fvfs_media_harmony.c;h=594db83f311ac0a37831d3579a046ae8e52be2de;hp=7f499df37f1dd9d9b7907ae969210fc122b21c40;hb=873df9a8a5508a3a4f51dfe447a5ffcdf18bab09;hpb=4038eb8968c0a0ba2ecadd85ed6b38e430192481

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index 7f499df37f1..594db83f311 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -490,8 +490,8 @@ static int alloc_get_client_smb_fname(struct vfs_handle_struct *handle,
 	DEBUG(MH_INFO_DEBUG, ("Entering with smb_fname->base_name '%s'\n",
 			      smb_fname->base_name));
 
-	clientFname = cp_smb_filename(ctx, smb_fname);
-	if (clientFname == NULL) {
+	*clientFname = cp_smb_filename(ctx, smb_fname);
+	if ((*clientFname) == NULL) {
 		DEBUG(MH_ERR_DEBUG, ("alloc_get_client_smb_fname "
 					"NTERR\n"));
 		errno = ENOMEM;
@@ -762,7 +762,7 @@ err:
 static DIR *mh_opendir(vfs_handle_struct *handle,
 		const char *fname,
 		const char *mask,
-		uint32 attr)
+		uint32_t attr)
 {
 	struct mh_dirinfo_struct *dirInfo;
 
@@ -802,7 +802,7 @@ err:
 static DIR *mh_fdopendir(vfs_handle_struct *handle,
 		files_struct *fsp,
 		const char *mask,
-		uint32 attr)
+		uint32_t attr)
 {
 	struct mh_dirinfo_struct *dirInfo = NULL;
 	DIR *dirstream;
@@ -1033,35 +1033,32 @@ static void mh_rewinddir(vfs_handle_struct *handle,
  * Failure: set errno, return -1
  */
 static int mh_mkdir(vfs_handle_struct *handle,
-		const char *path,
+		const struct smb_filename *smb_fname,
 		mode_t mode)
 {
 	int status;
-	char *clientPath;
-	TALLOC_CTX *ctx;
-
+	struct smb_filename *clientFname = NULL;
+	const char *path = smb_fname->base_name;
 
 	DEBUG(MH_INFO_DEBUG, ("Entering with path '%s'\n", path));
 
 	if (!is_in_media_files(path))
 	{
-		status = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+		status = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
 		goto out;
 	}
 
-	clientPath = NULL;
-	ctx = talloc_tos();
-
-	if ((status = alloc_get_client_path(handle, ctx,
-				path,
-				&clientPath)))
-	{
+	status = alloc_get_client_smb_fname(handle,
+				talloc_tos(),
+				smb_fname,
+				&clientFname);
+	if (status != 0) {
 		goto err;
 	}
 
-	status = SMB_VFS_NEXT_MKDIR(handle, clientPath, mode);
+	status = SMB_VFS_NEXT_MKDIR(handle, clientFname, mode);
 err:
-	TALLOC_FREE(clientPath);
+	TALLOC_FREE(clientFname);
 out:
 	DEBUG(MH_INFO_DEBUG, ("Leaving with path '%s'\n", path));
 	return status;
@@ -1210,7 +1207,9 @@ static NTSTATUS mh_create_file(vfs_handle_struct *handle,
 		struct security_descriptor *sd,
 		struct ea_list *ea_list,
 		files_struct **result_fsp,
-		int *pinfo)
+		int *pinfo,
+		const struct smb2_create_blobs *in_context_blobs,
+		struct smb2_create_blobs *out_context_blobs)
 {
 	NTSTATUS status;
 	struct smb_filename *clientFname;
@@ -1238,7 +1237,9 @@ static NTSTATUS mh_create_file(vfs_handle_struct *handle,
 			sd,
 			ea_list,
 			result_fsp,
-			pinfo);
+			pinfo,
+			in_context_blobs,
+			out_context_blobs);
 		goto out;
 	}
 
@@ -1275,7 +1276,9 @@ static NTSTATUS mh_create_file(vfs_handle_struct *handle,
 		sd,
 		ea_list,
 		result_fsp,
-		pinfo);
+		pinfo,
+		in_context_blobs,
+		out_context_blobs);
 err:
 	TALLOC_FREE(clientFname);
 out:
@@ -2010,19 +2013,20 @@ out:
  * In this case, "name" is a path.
  */
 static NTSTATUS mh_get_nt_acl(vfs_handle_struct *handle,
-			      const char *name,
-			      uint32 security_info,
+			      const struct smb_filename *smb_fname,
+			      uint32_t security_info,
 			      TALLOC_CTX *mem_ctx,
 			      struct security_descriptor **ppdesc)
 {
 	NTSTATUS status;
 	char *clientPath;
+	struct smb_filename *client_smb_fname = NULL;
 	TALLOC_CTX *ctx;
 
 	DEBUG(MH_INFO_DEBUG, ("Entering mh_get_nt_acl\n"));
-	if (!is_in_media_files(name))
+	if (!is_in_media_files(smb_fname->base_name))
 	{
-		status = SMB_VFS_NEXT_GET_NT_ACL(handle, name,
+		status = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname,
 						 security_info,
 						 mem_ctx, ppdesc);
 		goto out;
@@ -2032,18 +2036,28 @@ static NTSTATUS mh_get_nt_acl(vfs_handle_struct *handle,
 	ctx = talloc_tos();
 
 	if (alloc_get_client_path(handle, ctx,
-				name,
+				smb_fname->base_name,
 				&clientPath))
 	{
 		status = map_nt_error_from_unix(errno);
 		goto err;
 	}
 
-	status = SMB_VFS_NEXT_GET_NT_ACL(handle, clientPath,
+	client_smb_fname = synthetic_smb_fname(talloc_tos(),
+					clientPath,
+					NULL,
+					NULL);
+	if (client_smb_fname == NULL) {
+		TALLOC_FREE(clientPath);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	status = SMB_VFS_NEXT_GET_NT_ACL(handle, client_smb_fname,
 					 security_info,
 					 mem_ctx, ppdesc);
 err:
 	TALLOC_FREE(clientPath);
+	TALLOC_FREE(client_smb_fname);
 out:
 	return status;
 }