From: Ralph Boehme <slow@samba.org>
Date: Tue, 6 Dec 2016 14:07:20 +0000 (+0100)
Subject: vfs_fruit: remove base_fsp name translation
X-Git-Tag: tdb-1.3.13~712
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1223520e3d35f59e0f77648e0afdf049e1c9de3;p=thirdparty%2Fsamba.git

vfs_fruit: remove base_fsp name translation

This is now nicely done by vfs_catia for us.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12427

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 5bb1da9254d..15b3da2999d 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3338,9 +3338,6 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
 	struct fruit_config_data *config = NULL;
 	AfpInfo *ai = NULL;
 	ssize_t len = -1;
-	char *name = NULL;
-	char *tmp_base_name = NULL;
-	NTSTATUS status;
 	size_t to_return = n;
 
 	DEBUG(10, ("fruit_pread: offset=%d, size=%d\n", (int)offset, (int)n));
@@ -3352,25 +3349,6 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct fruit_config_data, return -1);
 
-	/* fsp_name is not converted with vfs_catia */
-	tmp_base_name = fsp->base_fsp->fsp_name->base_name;
-	status = SMB_VFS_TRANSLATE_NAME(handle->conn,
-					fsp->base_fsp->fsp_name->base_name,
-					vfs_translate_to_unix,
-					talloc_tos(), &name);
-	if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
-		name = talloc_strdup(talloc_tos(), tmp_base_name);
-		if (name == NULL) {
-			rc = -1;
-			goto exit;
-		}
-	} else if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		rc = -1;
-		goto exit;
-	}
-	fsp->base_fsp->fsp_name->base_name = name;
-
 	if (is_afpinfo_stream(fsp->fsp_name)) {
 		/*
 		 * OS X has a off-by-1 error in the offset calculation, so we're
@@ -3451,8 +3429,6 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
 		}
 	}
 exit:
-	fsp->base_fsp->fsp_name->base_name = tmp_base_name;
-	TALLOC_FREE(name);
 	TALLOC_FREE(ai);
 	if (rc != 0) {
 		len = -1;
@@ -3471,9 +3447,6 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 	struct fruit_config_data *config = NULL;
 	AfpInfo *ai = NULL;
 	ssize_t len;
-	char *name = NULL;
-	char *tmp_base_name = NULL;
-	NTSTATUS status;
 
 	DEBUG(10, ("fruit_pwrite: offset=%d, size=%d\n", (int)offset, (int)n));
 
@@ -3484,24 +3457,6 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct fruit_config_data, return -1);
 
-	tmp_base_name = fsp->base_fsp->fsp_name->base_name;
-	status = SMB_VFS_TRANSLATE_NAME(handle->conn,
-					fsp->base_fsp->fsp_name->base_name,
-					vfs_translate_to_unix,
-					talloc_tos(), &name);
-	if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
-		name = talloc_strdup(talloc_tos(), tmp_base_name);
-		if (name == NULL) {
-			rc = -1;
-			goto exit;
-		}
-	} else if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		rc = -1;
-		goto exit;
-	}
-	fsp->base_fsp->fsp_name->base_name = name;
-
 	if (is_afpinfo_stream(fsp->fsp_name)) {
 		/*
 		 * Writing an all 0 blob to the metadata stream
@@ -3579,7 +3534,7 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 		}
 
 		memcpy(p, &ai->afpi_FinderInfo[0], ADEDLEN_FINDERI);
-		rc = ad_write(ad, name);
+		rc = ad_write(ad, fsp->base_fsp->fsp_name->base_name);
 	} else {
 		len = SMB_VFS_NEXT_PWRITE(handle, fsp, data, n,
                                    offset + ad_getentryoff(ad, ADEID_RFORK));
@@ -3589,7 +3544,7 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 		}
 
 		if (config->rsrc == FRUIT_RSRC_ADFILE) {
-			rc = ad_read(ad, name);
+			rc = ad_read(ad, fsp->base_fsp->fsp_name->base_name);
 			if (rc == -1) {
 				goto exit;
 			}
@@ -3597,14 +3552,12 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 
 			if ((len + offset) > ad_getentrylen(ad, ADEID_RFORK)) {
 				ad_setentrylen(ad, ADEID_RFORK, len + offset);
-				rc = ad_write(ad, name);
+				rc = ad_write(ad, fsp->base_fsp->fsp_name->base_name);
 			}
 		}
 	}
 
 exit:
-	fsp->base_fsp->fsp_name->base_name = tmp_base_name;
-	TALLOC_FREE(name);
 	TALLOC_FREE(ai);
 	if (rc != 0) {
 		return -1;
@@ -3948,38 +3901,12 @@ static int fruit_fstat(vfs_handle_struct *handle, files_struct *fsp,
 		       SMB_STRUCT_STAT *sbuf)
 {
 	int rc;
-	char *name = NULL;
-	char *tmp_base_name = NULL;
-	NTSTATUS status;
 	struct adouble *ad = (struct adouble *)
 		VFS_FETCH_FSP_EXTENSION(handle, fsp);
 
 	DEBUG(10, ("fruit_fstat called for %s\n",
 		   smb_fname_str_dbg(fsp->fsp_name)));
 
-	if (fsp->base_fsp) {
-		tmp_base_name = fsp->base_fsp->fsp_name->base_name;
-		/* fsp_name is not converted with vfs_catia */
-		status = SMB_VFS_TRANSLATE_NAME(
-			handle->conn,
-			fsp->base_fsp->fsp_name->base_name,
-			vfs_translate_to_unix,
-			talloc_tos(), &name);
-
-		if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
-			name = talloc_strdup(talloc_tos(), tmp_base_name);
-			if (name == NULL) {
-				rc = -1;
-				goto exit;
-			}
-		} else if (!NT_STATUS_IS_OK(status)) {
-			errno = map_errno_from_nt_status(status);
-			rc = -1;
-			goto exit;
-		}
-		fsp->base_fsp->fsp_name->base_name = name;
-	}
-
 	if (ad == NULL || fsp->base_fsp == NULL) {
 		rc = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
 		goto exit;
@@ -4014,10 +3941,6 @@ exit:
 	DEBUG(10, ("fruit_fstat %s, size: %zd\n",
 		   smb_fname_str_dbg(fsp->fsp_name),
 		   (ssize_t)sbuf->st_ex_size));
-	if (tmp_base_name) {
-		fsp->base_fsp->fsp_name->base_name = tmp_base_name;
-	}
-	TALLOC_FREE(name);
 	return rc;
 }