sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3: smbd: Reformatting callers of rename_internals_fsp() to make it easer to see changed parameters.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-03-25 13:42:34 -07:00 committed by Ralph Boehme
parent 500037f218
commit 614b300301
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/smbd/reply.c
View File

@ -8061,8 +8061,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
goto out;
}
status = rename_internals_fsp(conn, fsp, smb_fname_dst,
attrs, replace_if_exists);
status = rename_internals_fsp(conn,
fsp,
smb_fname_dst,
attrs,
replace_if_exists);
close_file(req, fsp, NORMAL_CLOSE);
@ -8229,8 +8232,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
goto out;
}
status = rename_internals_fsp(conn, fsp, smb_fname_dst,
attrs, replace_if_exists);
status = rename_internals_fsp(conn,
fsp,
smb_fname_dst,
attrs,
replace_if_exists);
close_file(req, fsp, NORMAL_CLOSE);
@ -8379,9 +8385,16 @@ void reply_mv(struct smb_request *req)
DEBUG(3,("reply_mv : %s -> %s\n", smb_fname_str_dbg(smb_fname_src),
smb_fname_str_dbg(smb_fname_dst)));
status = rename_internals(ctx, conn, req, smb_fname_src, smb_fname_dst,
attrs, False, src_has_wcard, dest_has_wcard,
DELETE_ACCESS);
status = rename_internals(ctx,
conn,
req,
smb_fname_src,
smb_fname_dst,
attrs,
false,
src_has_wcard,
dest_has_wcard,
DELETE_ACCESS);
if (!NT_STATUS_IS_OK(status)) {
if (open_was_deferred(req->xconn, req->mid)) {
/* We have re-scheduled this call. */

25
source3/smbd/trans2.c
View File

@ -7174,7 +7174,9 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
smb_fname_str_dbg(smb_fname_dst)));
status = rename_internals_fsp(conn, fsp, smb_fname_dst,
status = rename_internals_fsp(conn,
fsp,
smb_fname_dst,
(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
overwrite);
@ -7444,17 +7446,26 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
smb_fname_str_dbg(smb_fname_dst)));
status = rename_internals_fsp(conn, fsp, smb_fname_dst, 0,
overwrite);
status = rename_internals_fsp(conn,
fsp,
smb_fname_dst,
0,
overwrite);
} else {
DEBUG(10,("smb_file_rename_information: "
"SMB_FILE_RENAME_INFORMATION %s -> %s\n",
smb_fname_str_dbg(smb_fname_src),
smb_fname_str_dbg(smb_fname_dst)));
status = rename_internals(ctx, conn, req, smb_fname_src,
smb_fname_dst, 0, overwrite, false,
dest_has_wcard,
FILE_WRITE_ATTRIBUTES);
status = rename_internals(ctx,
conn,
req,
smb_fname_src,
smb_fname_dst,
0,
overwrite,
false,
dest_has_wcard,
FILE_WRITE_ATTRIBUTES);
}
out:
TALLOC_FREE(smb_fname_dst);