1 files changed, 45 insertions, 53 deletions

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 64ad3e1a78..ce84bd0e3a 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -272,27 +272,24 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
 {
 	uint8 id_buf[16];
 	struct file_id id;
-	SMB_STRUCT_STAT sbuf;
 	TDB_DATA data;
 	struct db_context *db;
 	struct db_record *rec;
 	int ret = -1;
 
 	DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n",
-			(unsigned int)pblob->length, fsp->fsp_name));
+		  (unsigned int)pblob->length, fsp_str_dbg(fsp)));
 
 	SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
 		return NT_STATUS_INTERNAL_DB_CORRUPTION);
 
 	if (fsp->fh->fd != -1) {
-		ret = SMB_VFS_FSTAT(fsp, &sbuf);
+		ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
 	} else {
 		if (fsp->posix_open) {
-			ret = vfs_lstat_smb_fname(handle->conn, fsp->fsp_name,
-						  &sbuf);
+			ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name);
 		} else {
-			ret = vfs_stat_smb_fname(handle->conn, fsp->fsp_name,
-						 &sbuf);
+			ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name);
 		}
 	}
 
@@ -300,7 +297,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
 		return map_nt_error_from_unix(errno);
 	}
 
-	id = vfs_file_id_from_sbuf(handle->conn, &sbuf);
+	id = vfs_file_id_from_sbuf(handle->conn, &fsp->fsp_name->st);
 
 	/* For backwards compatibility only store the dev/inode. */
 	push_file_id_16((char *)id_buf, &id);
@@ -381,7 +378,7 @@ static NTSTATUS get_nt_acl_tdb_internal(vfs_handle_struct *handle,
 	NTSTATUS status;
 
 	if (fsp && name == NULL) {
-		name = fsp->fsp_name;
+		name = fsp->fsp_name->base_name;
 	}
 
 	DEBUG(10, ("get_nt_acl_tdb_internal: name=%s\n", name));
@@ -450,7 +447,7 @@ static struct security_descriptor *default_file_sd(TALLOC_CTX *mem_ctx,
 *********************************************************************/
 
 static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
-					const char *fname,
+					struct smb_filename *smb_fname,
 					files_struct *fsp,
 					bool container)
 {
@@ -462,7 +459,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
 	size_t size;
 	char *parent_name;
 
-	if (!parent_dirname(ctx, fname, &parent_name, NULL)) {
+	if (!parent_dirname(ctx, smb_fname->base_name, &parent_name, NULL)) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -508,25 +505,22 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
 	}
 
 	if (!psd || psd->dacl == NULL) {
-		SMB_STRUCT_STAT sbuf;
 		int ret;
 
 		TALLOC_FREE(psd);
 		if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
-			ret = SMB_VFS_FSTAT(fsp, &sbuf);
+			ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
 		} else {
 			if (fsp && fsp->posix_open) {
-				ret = vfs_lstat_smb_fname(handle->conn,fname,
-							  &sbuf);
+				ret = SMB_VFS_LSTAT(handle->conn, smb_fname);
 			} else {
-				ret = vfs_stat_smb_fname(handle->conn,fname,
-							 &sbuf);
+				ret = SMB_VFS_STAT(handle->conn, smb_fname);
 			}
 		}
 		if (ret == -1) {
 			return map_nt_error_from_unix(errno);
 		}
-		psd = default_file_sd(ctx, &sbuf);
+		psd = default_file_sd(ctx, &smb_fname->st);
 		if (!psd) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -544,7 +538,8 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
 	if (fsp) {
 		return store_acl_blob_fsp(handle, fsp, &blob);
 	} else {
-		return store_acl_blob_pathname(handle, fname, &blob);
+		return store_acl_blob_pathname(handle, smb_fname->base_name,
+					       &blob);
 	}
 }
 
@@ -561,19 +556,11 @@ static int open_acl_tdb(vfs_handle_struct *handle,
 	uint32_t access_granted = 0;
 	struct security_descriptor *pdesc = NULL;
 	bool file_existed = true;
-	char *fname = NULL;
 	NTSTATUS status;
 
-	status = get_full_smb_filename(talloc_tos(), smb_fname,
-				       &fname);
-	if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		return -1;
-	}
-
 	status = get_nt_acl_tdb_internal(handle,
 					NULL,
-					fname,
+					smb_fname->base_name,
 					(OWNER_SECURITY_INFORMATION |
 					 GROUP_SECURITY_INFORMATION |
 					 DACL_SECURITY_INFORMATION),
@@ -605,10 +592,13 @@ static int open_acl_tdb(vfs_handle_struct *handle,
 
 	if (!file_existed && fsp->fh->fd != -1) {
 		/* File was created. Inherit from parent directory. */
-		string_set(&fsp->fsp_name, fname);
-		inherit_new_acl(handle, fname, fsp, false);
+		status = fsp_set_smb_fname(fsp, smb_fname);
+		if (!NT_STATUS_IS_OK(status)) {
+			errno = map_errno_from_nt_status(status);
+			return -1;
+		}
+		inherit_new_acl(handle, smb_fname, fsp, false);
 	}
-
 	return fsp->fh->fd;
 }
 
@@ -659,13 +649,24 @@ static int unlink_acl_tdb(vfs_handle_struct *handle,
 
 static int mkdir_acl_tdb(vfs_handle_struct *handle, const char *path, mode_t mode)
 {
+	struct smb_filename *smb_fname = NULL;
 	int ret = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+	NTSTATUS status;
 
 	if (ret == -1) {
 		return ret;
 	}
+
+	status = create_synthetic_smb_fname(talloc_tos(), path, NULL, NULL,
+					    &smb_fname);
+	if (!NT_STATUS_IS_OK(status)) {
+		errno = map_errno_from_nt_status(status);
+		return -1;
+	}
+
 	/* New directory - inherit from parent. */
-	inherit_new_acl(handle, path, NULL, true);
+	inherit_new_acl(handle, smb_fname, NULL, true);
+	TALLOC_FREE(smb_fname);
 	return ret;
 }
 
@@ -713,15 +714,14 @@ static NTSTATUS fget_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
 	if (NT_STATUS_IS_OK(status)) {
 		if (DEBUGLEVEL >= 10) {
 			DEBUG(10,("fget_nt_acl_tdb: returning tdb sd for file %s\n",
-				fsp->fsp_name));
+				  fsp_str_dbg(fsp)));
 			NDR_PRINT_DEBUG(security_descriptor, *ppdesc);
 		}
 		return NT_STATUS_OK;
 	}
 
 	DEBUG(10,("fget_nt_acl_tdb: failed to get tdb sd for file %s, Error %s\n",
-			fsp->fsp_name,
-			nt_errstr(status) ));
+		  fsp_str_dbg(fsp), nt_errstr(status)));
 
 	return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp,
 			security_info, ppdesc);
@@ -765,7 +765,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
 
 	if (DEBUGLEVEL >= 10) {
 		DEBUG(10,("fset_nt_acl_tdb: incoming sd for file %s\n",
-			fsp->fsp_name));
+			  fsp_str_dbg(fsp)));
 		NDR_PRINT_DEBUG(security_descriptor,
 			CONST_DISCARD(struct security_descriptor *,psd));
 	}
@@ -778,7 +778,6 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
 	/* Ensure owner and group are set. */
 	if (!psd->owner_sid || !psd->group_sid) {
 		int ret;
-		SMB_STRUCT_STAT sbuf;
 		DOM_SID owner_sid, group_sid;
 		struct security_descriptor *nc_psd = dup_sec_desc(talloc_tos(), psd);
 
@@ -787,23 +786,19 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
 		}
 		if (fsp->is_directory || fsp->fh->fd == -1) {
 			if (fsp->posix_open) {
-				ret = vfs_lstat_smb_fname(fsp->conn,
-							  fsp->fsp_name,
-							  &sbuf);
+				ret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name);
 			} else {
-				ret = vfs_stat_smb_fname(fsp->conn,
-							 fsp->fsp_name,
-							 &sbuf);
+				ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);
 			}
 		} else {
-			ret = SMB_VFS_FSTAT(fsp, &sbuf);
+			ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
 		}
 		if (ret == -1) {
 			/* Lower level acl set succeeded,
 			 * so still return OK. */
 			return NT_STATUS_OK;
 		}
-		create_file_sids(&sbuf, &owner_sid, &group_sid);
+		create_file_sids(&fsp->fsp_name->st, &owner_sid, &group_sid);
 		/* This is safe as nc_psd is discarded at fn exit. */
 		nc_psd->owner_sid = &owner_sid;
 		nc_psd->group_sid = &group_sid;
@@ -831,7 +826,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
 
 	if (DEBUGLEVEL >= 10) {
 		DEBUG(10,("fset_nt_acl_tdb: storing tdb sd for file %s\n",
-			fsp->fsp_name));
+			  fsp_str_dbg(fsp)));
 		NDR_PRINT_DEBUG(security_descriptor,
 			CONST_DISCARD(struct security_descriptor *,psd));
 	}
@@ -913,7 +908,6 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle,
                             files_struct *fsp,
                             SMB_ACL_T theacl)
 {
-	SMB_STRUCT_STAT sbuf;
 	struct db_context *db;
 	int ret;
 
@@ -921,14 +915,12 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle,
 
 	if (fsp->is_directory || fsp->fh->fd == -1) {
 		if (fsp->posix_open) {
-			ret = vfs_lstat_smb_fname(fsp->conn,fsp->fsp_name,
-						  &sbuf);
+			ret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name);
 		} else {
-			ret = vfs_stat_smb_fname(fsp->conn,fsp->fsp_name,
-						 &sbuf);
+			ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);
 		}
 	} else {
-		ret = SMB_VFS_FSTAT(fsp, &sbuf);
+		ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
 	}
 	if (ret == -1) {
 		return -1;
@@ -941,7 +933,7 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle,
 		return -1;
 	}
 
-	acl_tdb_delete(handle, db, &sbuf);
+	acl_tdb_delete(handle, db, &fsp->fsp_name->st);
 	return 0;
 }