sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

smbd: Remove the smb_fname parameter from set_ea().

Browse Source 
We know we must have a valid fsp.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Dec 16 10:15:11 UTC 2020 on sn-devel-184
This commit is contained in:
Jeremy Allison 2020-12-14 12:15:48 -08:00 committed by Ralph Boehme
parent 898c537a43
commit 874c5fcf6d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/open.c
View File

@ -5981,7 +5981,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
if ((ea_list != NULL) &&
((info == FILE_WAS_CREATED) || (info == FILE_WAS_OVERWRITTEN))) {
status = set_ea(conn, fsp, fsp->fsp_name, ea_list);
status = set_ea(conn, fsp, ea_list);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}

2
source3/smbd/proto.h
View File

@ -1198,7 +1198,7 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx,
char ***pnames,
size_t *pnum_names);
NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
const struct smb_filename *smb_fname, struct ea_list *ea_list);
struct ea_list *ea_list);
struct ea_list *read_ea_list_entry(TALLOC_CTX *ctx, const char *pdata, size_t data_size, size_t *pbytes_used);
void send_trans2_replies(connection_struct *conn,
struct smb_request *req,

8
source3/smbd/trans2.c
View File

@ -776,7 +776,7 @@ static void canonicalize_ea_name(connection_struct *conn,
****************************************************************************/
NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
const struct smb_filename *smb_fname, struct ea_list *ea_list)
struct ea_list *ea_list)
{
NTSTATUS status;
bool posix_pathnames = false;
@ -6834,7 +6834,7 @@ static NTSTATUS smb_info_set_ea(connection_struct *conn,
return NT_STATUS_ACCESS_DENIED;
}
status = set_ea(conn, fsp, smb_fname, ea_list);
status = set_ea(conn, fsp, ea_list);
return status;
}
@ -6877,7 +6877,7 @@ static NTSTATUS smb_set_file_full_ea_info(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
status = set_ea(conn, fsp, fsp->fsp_name, ea_list);
status = set_ea(conn, fsp, ea_list);
DEBUG(10, ("smb_set_file_full_ea_info on file %s returned %s\n",
smb_fname_str_dbg(fsp->fsp_name),
@ -9702,7 +9702,7 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
/* Try and set any given EA. */
if (ea_list) {
status = set_ea(conn, fsp, smb_dname, ea_list);
status = set_ea(conn, fsp, ea_list);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);
goto out;